Changeset 14050

Timestamp:

Jul 6, 2007, 3:45:22 PM (19 years ago)

Author:

eugene

Message:

updated for changes to ippTools

Location:

trunk/ippTasks

Files:

• detrend.process.pro (modified) (6 diffs)
• detrend.resid.pro (modified) (6 diffs)

trunk/ippTasks/detrend.process.pro

@@ -100 +100 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout detPendingProcessedImfile -key det_id:exp_tag:class_id -uniq -setword dbname $options:0
+    ipptool2book stdout detPendingProcessedImfile -key det_id:exp_id:class_id -uniq -setword dbname $options:0
     if ($VERBOSE > 2)
       book listbook detPendingProcessedImfile
@@ -138 +138 @@
     book getword detPendingProcessedImfile $pageName det_id   -var DET_ID   
     book getword detPendingProcessedImfile $pageName det_type -var DET_TYPE 
+    book getword detPendingProcessedImfile $pageName exp_id   -var EXP_ID  
+    book getword detPendingProcessedImfile $pageName class_id -var CLASS_ID 
     book getword detPendingProcessedImfile $pageName exp_tag  -var EXP_TAG  
-    book getword detPendingProcessedImfile $pageName class_id -var CLASS_ID 
     book getword detPendingProcessedImfile $pageName uri      -var URI      
     book getword detPendingProcessedImfile $pageName camera   -var CAMERA   
@@ -170 +171 @@
     exec mkdir -p $outpath
 
-    $run = detrend_process_imfile.pl --det_id $DET_ID --det_type $DET_TYPE --exp_tag $EXP_TAG --class_id $CLASS_ID --input_uri $URI --camera $CAMERA
+    $run = detrend_process_imfile.pl --det_id $DET_ID --exp_id $EXP_ID --det_type $DET_TYPE --class_id $CLASS_ID --exp_tag $EXP_TAG --input_uri $URI --camera $CAMERA
     if ("$WORKDIR" != "NULL")
       $run = $run --workdir $WORKDIR
@@ -231 +232 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout detPendingProcessedExp -key det_id:exp_tag -uniq -setword dbname $options:0
+    ipptool2book stdout detPendingProcessedExp -key det_id:exp_id -uniq -setword dbname $options:0
     if ($VERBOSE > 2)
       book listbook detPendingProcessedExp
@@ -268 +269 @@
     book setword detPendingProcessedExp $pageName pantaskState RUN
     book getword detPendingProcessedExp $pageName det_id    -var DET_ID
+    book getword detPendingProcessedExp $pageName exp_id    -var EXP_ID
     book getword detPendingProcessedExp $pageName det_type  -var DET_TYPE
+    book getword detPendingProcessedExp $pageName camera    -var CAMERA  
     book getword detPendingProcessedExp $pageName exp_tag   -var EXP_TAG
-    book getword detPendingProcessedExp $pageName camera    -var CAMERA  
     book getword detPendingProcessedExp $pageName workdir   -var WORKDIR
     book getword detPendingProcessedExp $pageName dbname    -var DBNAME
@@ -298 +300 @@
     exec mkdir -p $outpath
 
-    $run = detrend_process_exp.pl --det_id $DET_ID --exp_tag $EXP_TAG --det_type $DET_TYPE --camera $CAMERA
+    $run = detrend_process_exp.pl --det_id $DET_ID --exp_id $EXP_ID --exp_tag $EXP_TAG --det_type $DET_TYPE --camera $CAMERA
     if ("$WORKDIR" != "NULL")
       $run = $run --workdir $WORKDIR

trunk/ippTasks/detrend.resid.pro

@@ -97 +97 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout detPendingResidImfile -key det_id:iteration:exp_tag:class_id -uniq -setword dbname $options:0
+    ipptool2book stdout detPendingResidImfile -key det_id:iteration:exp_id:class_id -uniq -setword dbname $options:0
     if ($VERBOSE > 2)
       book listbook detPendingResidImfile
@@ -134 +134 @@
     book setword detPendingResidImfile $pageName pantaskState RUN
     book getword detPendingResidImfile $pageName det_id    -var DET_ID   
+    book getword detPendingResidImfile $pageName exp_id    -var EXP_ID  
     book getword detPendingResidImfile $pageName iteration -var ITERATION     
     book getword detPendingResidImfile $pageName det_type  -var DET_TYPE 
@@ -170 +171 @@
     exec mkdir -p $outpath
 
-    $run = detrend_resid.pl --det_id $DET_ID --iteration $ITERATION --exp_tag $EXP_TAG --class_id $CLASS_ID --det_type $DET_TYPE --detrend $DET_URI --input_uri $URI --camera $CAMERA --mode $MODE
+    $run = detrend_resid.pl --det_id $DET_ID --iteration $ITERATION --exp_id $EXP_ID --exp_tag $EXP_TAG --class_id $CLASS_ID --det_type $DET_TYPE --detrend $DET_URI --input_uri $URI --camera $CAMERA --mode $MODE
     if ("$WORKDIR" != "NULL")
       $run = $run --workdir $WORKDIR
@@ -231 +232 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout detPendingResidExp -key det_id:iteration:exp_tag -uniq -setword dbname $options:0
+    ipptool2book stdout detPendingResidExp -key det_id:iteration:exp_id -uniq -setword dbname $options:0
     if ($VERBOSE > 2)
       book listbook detPendingResidExp
@@ -268 +269 @@
     book setword detPendingResidExp $pageName pantaskState RUN
     book getword detPendingResidExp $pageName det_id    -var DET_ID  
+    book getword detPendingResidExp $pageName exp_id    -var EXP_ID 
     book getword detPendingResidExp $pageName iteration -var ITERATION    
     book getword detPendingResidExp $pageName det_type  -var DET_TYPE
@@ -298 +300 @@
     exec mkdir -p $outpath
 
-    $run = detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITERATION --exp_tag $EXP_TAG --det_type $DET_TYPE --camera $CAMERA
+    $run = detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITERATION --exp_id $EXP_ID --exp_tag $EXP_TAG --det_type $DET_TYPE --camera $CAMERA
     if ("$WORKDIR" != "NULL")
       $run = $run --workdir $WORKDIR