Changeset 19621 for trunk/ippTasks

Timestamp:

Sep 19, 2008, 2:11:37 PM (18 years ago)

Author:

eugene

Message:

changing detrend verify mode to behave just like master mode in terms of processing and residual generation; adding ref_det_id, ref_iter to detRun and detResidImfile, modifying the foreign constraint; adding a simtest suite to test the detrend verify mode

Location:

trunk/ippTasks

Files:

• Makefile.am (modified) (1 diff)
• automate.pro (modified) (2 diffs)
• detrend.resid.pro (modified) (2 diffs)
• simtest.detverify.auto (added)
• simtest.detverify.config (added)
• simtest.pro (modified) (3 diffs)

trunk/ippTasks/Makefile.am

@@ -28 +28 @@
         simtest.basic.config \
         simtest.basic.auto \
+        simtest.detverify.config \
+        simtest.detverify.auto \
         simtest.flatcorr.config \
         simtest.flatcorr.auto

trunk/ippTasks/automate.pro

@@ -264 +264 @@
       end
       book setword automate $pageName pantaskState INIT.LAUNCH
+
+      if ($Ncheck == 1) 
+        # XXX this is a somewhat hackish way to carry information from the 'check' to the 'launch'
+        book getword tmpCheck page.000 det_id -var DET_ID
+        book getword tmpCheck page.000 iteration -var ITERATION
+        book setword automate $pageName det_id $DET_ID
+        book setword automate $pageName iteration $ITERATION
+      end
     end
 
@@ -326 +334 @@
     end
 
+    # modify the launch command to replace certain elements from the page
+    book getword automate $pageName det_id -var DET_ID
+    if ("$DET_ID" != "NULL") 
+      echo '$launchCommand'
+      strsub "$launchCommand" @det_id@ $DET_ID -var launchCommand
+    end
+
+    book getword automate $pageName iteration -var ITERATION
+    if ("$ITERATION" != "NULL") 
+      echo '$launchCommand'
+      strsub "$launchCommand" @iteration@ $ITERATION -var launchCommand
+    end
+
+    echo '$launchCommand'
+
     book setword automate $pageName pantaskState RUN.LAUNCH
 

trunk/ippTasks/detrend.resid.pro

@@ -153 +153 @@
 
     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 
-    book getword detPendingResidImfile $pageName mode      -var MODE     
-    book getword detPendingResidImfile $pageName exp_tag   -var EXP_TAG  
-    book getword detPendingResidImfile $pageName class_id  -var CLASS_ID 
-    book getword detPendingResidImfile $pageName uri       -var URI      
-    book getword detPendingResidImfile $pageName det_uri   -var DET_URI  
-    book getword detPendingResidImfile $pageName camera    -var CAMERA   
-    book getword detPendingResidImfile $pageName workdir   -var WORKDIR_TEMPLATE
-    book getword detPendingResidImfile $pageName dbname    -var DBNAME
-    book getword detPendingResidImfile $pageName reduction -var REDUCTION
+    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 
+    book getword detPendingResidImfile $pageName mode       -var MODE     
+    book getword detPendingResidImfile $pageName exp_tag    -var EXP_TAG  
+    book getword detPendingResidImfile $pageName class_id   -var CLASS_ID 
+    book getword detPendingResidImfile $pageName uri        -var URI      
+    book getword detPendingResidImfile $pageName det_uri    -var DET_URI  
+    book getword detPendingResidImfile $pageName ref_det_id -var REF_DET_ID   
+    book getword detPendingResidImfile $pageName ref_iter   -var REF_ITER
+    book getword detPendingResidImfile $pageName camera     -var CAMERA   
+    book getword detPendingResidImfile $pageName workdir    -var WORKDIR_TEMPLATE
+    book getword detPendingResidImfile $pageName dbname     -var DBNAME
+    book getword detPendingResidImfile $pageName reduction  -var REDUCTION
 
     # specify choice of local or remote host based on camera and chip (class_id)
@@ -179 +181 @@
     stderr $LOGDIR/detrend.resid.imfile.log
 
-    $run = detrend_resid_imfile.pl --threads @MAX_THREADS@ --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 --outroot $outroot --redirect-output --verbose
+    $run = detrend_resid_imfile.pl --threads @MAX_THREADS@ --det_id $DET_ID --iteration $ITERATION --ref_det_id $REF_DET_ID --ref_iter $REF_ITER --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 --outroot $outroot --redirect-output --verbose
 
     if ("$REDUCTION" != "NULL")

trunk/ippTasks/simtest.pro

@@ -40 +40 @@
     echo "  SIMTEST_AUTO     : define the analysis steps to perform (simtest.auto)"
     echo "  SIMTEST_THREADS  : set the number of threads for the processing node (0)"
+    echo ""
+    echo "the following macros can be used to set up specific simtest suites:"
+    echo "  simtest.setup.basic : run standard simtest suite"
+    echo "  simtest.setup.detverify : run detrend creation and detrend verification"
+    echo "  simtest.setup.flatcorr : run a flat-field correction demonstration"
     break
   end
@@ -109 +114 @@
 # auto: simtest.basic.auto, simtest.flatcorr.auto
 
+macro simtest.setup.basic
+  $PPSIM_RECIPE = default
+  $SIMTEST_SEQUENCE = simtest.basic.config
+  $SIMTEST_AUTO = simtest.basic.auto
+end
+
+macro simtest.setup.detverify
+  $PPSIM_RECIPE = default
+  $SIMTEST_SEQUENCE = simtest.detverify.config
+  $SIMTEST_AUTO = simtest.detverify.auto
+end
+
 macro simtest.setup.flatcorr
   $PPSIM_RECIPE = FLATCORR
@@ -114 +131 @@
   $SIMTEST_AUTO = simtest.flatcorr.auto
 end
+