Changeset 19619

Timestamp:

Sep 19, 2008, 12:39:42 PM (18 years ago)

Author:

eugene

Message:

adding simtest.detverify, fixing some bugs

Location:

branches/eam_branch_20080918/ippTasks

Files:

• Makefile.am (modified) (1 diff)
• automate.pro (modified) (2 diffs)
• simtest.detverify.auto (modified) (5 diffs)
• simtest.pro (modified) (3 diffs)

branches/eam_branch_20080918/ippTasks/Makefile.am

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

branches/eam_branch_20080918/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
 

branches/eam_branch_20080918/ippTasks/simtest.detverify.auto

@@ -17 +17 @@
   name       STR BIAS_VERIFY
   check      STR "detselect -search -inst @CAMERA@ -det_type BIAS -dbname @DBNAME@"
-  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type BIAS -select_exp_type BIAS -mode verify -dbname @DBNAME@" 
+  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type BIAS -select_exp_type BIAS -mode verify -ref_det_id @det_id@ -ref_iter @iteration@ -dbname @DBNAME@" 
   block      STR "dettool -runs -active -det_type BIAS -mode verify -dbname @DBNAME@"
 END
@@ -31 +31 @@
   name       STR DARK_VERIFY
   check      STR "detselect -search -inst @CAMERA@ -det_type DARK -dbname @DBNAME@"
-  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type DARK -select_exp_type DARK -mode verify -dbname @DBNAME@"
+  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type DARK -select_exp_type DARK -mode verify -ref_det_id @det_id@ -ref_iter @iteration@ -dbname @DBNAME@"
   block      STR "dettool -runs -active -det_type DARK -mode verify -dbname @DBNAME@"
 END
@@ -45 +45 @@
   name       STR SHUTTER_VERIFY
   check      STR "detselect -search -inst @CAMERA@ -det_type SHUTTER -dbname @DBNAME@"
-  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type SHUTTER -filter r -select_exp_type FLAT -select_filter r -mode verify -dbname @DBNAME@"
+  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type SHUTTER -filter r -select_exp_type FLAT -select_filter r -mode verify -ref_det_id @det_id@ -ref_iter @iteration@ -dbname @DBNAME@"
   block      STR "dettool -runs -active -det_type FLAT -filter r -mode verify -dbname @DBNAME@"
 END
@@ -66 +66 @@
   name       STR FLAT_VERIFY-r
   check      STR "detselect -search -inst @CAMERA@ -det_type FLAT -filter r -dbname @DBNAME@"
-  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type FLAT -filter r -select_exp_type FLAT -select_filter r -mode verify -dbname @DBNAME@"
+  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type FLAT -filter r -select_exp_type FLAT -select_filter r -mode verify -ref_det_id @det_id@ -ref_iter @iteration@ -dbname @DBNAME@"
   block      STR "dettool -runs -active -det_type FLAT -filter r -mode verify -dbname @DBNAME@"
 END
@@ -73 +73 @@
   name       STR FLAT_VERIFY-i
   check      STR "detselect -search -inst @CAMERA@ -det_type FLAT -filter i -dbname @DBNAME@"
-  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type FLAT -filter i -select_exp_type FLAT -select_filter i -mode verify -dbname @DBNAME@"
+  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type FLAT -filter i -select_exp_type FLAT -select_filter i -mode verify -ref_det_id @det_id@ -ref_iter @iteration@ -dbname @DBNAME@"
   block      STR "dettool -runs -active -det_type FLAT -filter i -mode verify -dbname @DBNAME@"
 END

branches/eam_branch_20080918/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
+