Changeset 27840 for branches/simtest_nebulous_branches/ippScripts/scripts/detrend_process_imfile.pl

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippScripts/scripts/detrend_process_imfile.pl (modified) (3 diffs)

branches/simtest_nebulous_branches/ippScripts/scripts/detrend_process_imfile.pl

@@ -8 +8 @@
 use Sys::Hostname;
 my $host = hostname();
+my $date = `date`;
 print "\n\n";
-print "Starting script $0 on $host\n\n";
+print "Starting script $0 on $host at $date\n\n";
 
 use vars qw( $VERSION );
@@ -91 +92 @@
                   'DOMEFLAT_RAW'     => 'PPIMAGE.OUTPUT.DETREND',
                   'SKYFLAT_RAW'      => 'PPIMAGE.OUTPUT.DETREND',
+                  'SKYFLATTEST_RAW'  => 'PPIMAGE.OUTPUT.DETREND',
                   'FLAT'             => 'PPIMAGE.OUTPUT.DETREND',
                   'DOMEFLAT'         => 'PPIMAGE.OUTPUT.DETREND',
                   'SKYFLAT'          => 'PPIMAGE.OUTPUT.DETREND',
-                  'FRINGE'           => undef,
+                  'FRINGE'           => 'PPIMAGE.OUTPUT.DETREND',
               };
 
@@ -138 +140 @@
     }
 
-    &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