Changeset 16518

Timestamp:

Feb 15, 2008, 12:30:48 PM (18 years ago)

Author:

Paul Price

Message:

Get log file names from the file rules.

File:

• trunk/ippTasks/detrend.norm.pro (modified) (3 diffs)

trunk/ippTasks/detrend.norm.pro

@@ -152 +152 @@
 
     ## generate outroot specific to this exposure (& chip)
-    sprintf outroot "%s/%s.%s.%s/%s.%s.norm.%s.%s" $WORKDIR $CAMERA $DET_TYPE $DET_ID $CAMERA $DET_TYPE $DET_ID $ITERATION
-
-    ## generate output log (NOT based on filerule?)
-    $logfile = "$outroot.log"
-    $logfile = `ipp_datapath.pl $logfile`
+    sprintf outroot "%s/%s.%s.%s/%s.%s.normstat.%s.%s" $WORKDIR $CAMERA $DET_TYPE $DET_ID $CAMERA $DET_TYPE $DET_ID $ITERATION
+
+    ## generate output log
+    $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --basename $outroot`
 
     stdout $logfile
@@ -273 +272 @@
     sprintf outroot "%s/%s.%s.%s/%s.%s.norm.%s.%s" $WORKDIR $CAMERA $DET_TYPE $DET_ID $CAMERA $DET_TYPE $DET_ID $ITERATION
 
-    ## generate output log (NOT based on filerule?)
-    $logfile = "$outroot.log"
-    $logfile = `ipp_datapath.pl $logfile`
+    ## generate output log
+    $logfile = `ipp_filename.pl --filerule LOG.IMFILE --camera $CAMERA --class_id $CLASS_ID --basename $outroot`
 
     stdout $logfile
@@ -387 +385 @@
 
     ## generate outroot specific to this exposure (& chip)
-    sprintf outroot "%s/%s.%s.%s/%s.%s.norm.%s.%s" $WORKDIR $CAMERA $DET_TYPE $DET_ID $CAMERA $DET_TYPE $DET_ID $ITERATION
+    sprintf outroot "%s/%s.%s.%s/%s.%s.normexp.%s.%s" $WORKDIR $CAMERA $DET_TYPE $DET_ID $CAMERA $DET_TYPE $DET_ID $ITERATION
 
     ## generate output log (NOT based on filerule?)
-    $logfile = "$outroot.log"
-    $logfile = `ipp_datapath.pl $logfile`
+    $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --basename $outroot`
 
     stdout $logfile