Changeset 13683 for trunk/ippScripts/scripts/detrend_reject_imfile.pl

Timestamp:

Jun 6, 2007, 1:42:40 PM (19 years ago)

Author:

eugene

Message:

unifying, cleaning logfile output names

File:

• trunk/ippScripts/scripts/detrend_reject_imfile.pl (modified) (2 diffs)

trunk/ippScripts/scripts/detrend_reject_imfile.pl

@@ -138 +138 @@
 # Output products
 $workdir = caturi( $workdir, "$camera.$det_type.$det_id" ) if defined $workdir;
-my $outputRoot = $ipprc->file_prepare( "$exp_tag.detresid.$det_id.$iter", $workdir, ${$files}[0]->{path_base} );
-my $jpeg1Name = $ipprc->filename("PPIMAGE.JPEG1", $outputRoot); # Binned JPEG #1
-my $jpeg2Name = $ipprc->filename("PPIMAGE.JPEG2", $outputRoot); # Binned JPEG #2
+my $outputRoot = $ipprc->file_prepare( "$exp_tag/$exp_tag.detresid.$det_id.$iter", $workdir, ${$files}[0]->{path_base} );
+my $jpeg1Name  = $ipprc->filename("PPIMAGE.JPEG1", $outputRoot); # Binned JPEG #1
+my $jpeg2Name  = $ipprc->filename("PPIMAGE.JPEG2", $outputRoot); # Binned JPEG #2
+my $logName    = $ipprc->filename("LOG.EXP", $outputRoot); # Name for log
+
+my $logFile;
+unless ($no_op) {
+    # XXX this will fail if the file exists (because of Nebulous rules)
+    $logFile = $ipprc->file_create_open( $logName );
+}
 
 # Recipes to use in processing
@@ -189 +196 @@
 my $reject_exp_bin_sn       = rejection_limit( 'EXP.BIN.SN',       $det_type, $filter );
 
-my $logName = caturi( $workdir, "$exp_tag.detreject.$det_id.$iter.log" ); # Name for log
-my $logFile;
-unless ($no_op) {
-    # XXX this will fail if the file exists (because of Nebulous rules)
-    $logFile = $ipprc->file_create_open( $logName );
-}
-
 # Reject based on the stats of the imfiles
 # it is VALID to reject on more than one criterion