Changeset 27517 for branches/eam_branches/20100225/ippScripts/scripts/detrend_process_imfile.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/detrend_process_imfile.pl (modified) (2 diffs)

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

@@ -91 +91 @@
                   'DOMEFLAT_RAW'     => 'PPIMAGE.OUTPUT.DETREND',
                   'SKYFLAT_RAW'      => 'PPIMAGE.OUTPUT.DETREND',
-                  'SKYFLATTEST_RAW'  => 'PPIMAGE.OUTPUT.DETREND',
+                  'SKYFLATTEST_RAW'  => 'PPIMAGE.OUTPUT.DETREND',
                   'FLAT'             => 'PPIMAGE.OUTPUT.DETREND',
                   'DOMEFLAT'         => 'PPIMAGE.OUTPUT.DETREND',
@@ -139 +139 @@
     }
 
-    &my_die("Couldn't find expected output file: $outputImage", $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputImage);
-    &my_die("Couldn't find expected output file: $outputBin1",  $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputBin1);
-    &my_die("Couldn't find expected output file: $outputBin2",  $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputBin2);
+    &my_die("Couldn't find expected output file: $outputImage", $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputImage);
+    &my_die("Couldn't find expected output file: $outputBin1",  $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin1);
+    &my_die("Couldn't find expected output file: $outputBin2",  $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin2);
 
     my $outputStatsReal = $ipprc->file_resolve($outputStats);
-    &my_die("Couldn't find expected output file: $outputStats", $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
+    &my_die("Couldn't find expected output file: $outputStats", $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal);
 
     # parse stats from metadata