Index: /branches/eam_branch_20080918/ippTasks/Makefile.am
===================================================================
--- /branches/eam_branch_20080918/ippTasks/Makefile.am	(revision 19618)
+++ /branches/eam_branch_20080918/ippTasks/Makefile.am	(revision 19619)
@@ -28,4 +28,6 @@
 	simtest.basic.config \
 	simtest.basic.auto \
+	simtest.detverify.config \
+	simtest.detverify.auto \
 	simtest.flatcorr.config \
 	simtest.flatcorr.auto
Index: /branches/eam_branch_20080918/ippTasks/automate.pro
===================================================================
--- /branches/eam_branch_20080918/ippTasks/automate.pro	(revision 19618)
+++ /branches/eam_branch_20080918/ippTasks/automate.pro	(revision 19619)
@@ -264,4 +264,12 @@
       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,4 +334,19 @@
     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
 
Index: /branches/eam_branch_20080918/ippTasks/simtest.detverify.auto
===================================================================
--- /branches/eam_branch_20080918/ippTasks/simtest.detverify.auto	(revision 19618)
+++ /branches/eam_branch_20080918/ippTasks/simtest.detverify.auto	(revision 19619)
@@ -17,5 +17,5 @@
   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,5 +31,5 @@
   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,5 +45,5 @@
   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,5 +66,5 @@
   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,5 +73,5 @@
   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
Index: /branches/eam_branch_20080918/ippTasks/simtest.pro
===================================================================
--- /branches/eam_branch_20080918/ippTasks/simtest.pro	(revision 19618)
+++ /branches/eam_branch_20080918/ippTasks/simtest.pro	(revision 19619)
@@ -40,4 +40,9 @@
     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,4 +114,16 @@
 # 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,2 +131,3 @@
   $SIMTEST_AUTO = simtest.flatcorr.auto
 end
+