Changeset 27517 for branches/eam_branches/20100225/ippScripts/scripts/stack_skycell.pl

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ippScripts/scripts/stack_skycell.pl (modified) (5 diffs)

branches/eam_branches/20100225/ippScripts/scripts/stack_skycell.pl

@@ -107 +107 @@
 }
 
-&my_die("Stack list contains less than two elements", $stack_id, $PS_EXIT_SYS_ERROR) unless
+&my_die("Stack list contains less than two elements", $stack_id, $PS_EXIT_DATA_ERROR) unless
     scalar @$files >= 2;
 
@@ -120 +120 @@
     if ($file->{ignored}) { next; }
     if (defined $tess_id) {
-        &my_die("Tesselation identifiers don't match", $stack_id, $PS_EXIT_SYS_ERROR) unless
+        &my_die("Tesselation identifiers don't match", $stack_id, $PS_EXIT_DATA_ERROR) unless
             $file->{tess_id} eq $tess_id;
     } else {
@@ -126 +126 @@
     }
     if (defined $skycell_id) {
-        &my_die("Skycell identifiers don't match", $stack_id, $PS_EXIT_SYS_ERROR) unless
+        &my_die("Skycell identifiers don't match", $stack_id, $PS_EXIT_DATA_ERROR) unless
             $file->{skycell_id} eq $skycell_id;
     } else {
@@ -132 +132 @@
     }
     if (defined $camera) {
-        &my_die("Cameras don't match", $stack_id, $PS_EXIT_SYS_ERROR) unless $file->{camera} eq $camera;
+        &my_die("Cameras don't match", $stack_id, $PS_EXIT_DATA_ERROR) unless $file->{camera} eq $camera;
     } else {
         $camera = $file->{camera};
@@ -261 +261 @@
     if ($do_stats) {
         my $outputStatsReal = $ipprc->file_resolve($outputStats);
-        &my_die("Couldn't find expected output file: $outputStats", $stack_id, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
+        &my_die("Couldn't find expected output file: $outputStats", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal);
 
         # measure stats