Index: trunk/ippTasks/simtest.auto
===================================================================
--- trunk/ippTasks/simtest.auto	(revision 17578)
+++ trunk/ippTasks/simtest.auto	(revision 17580)
@@ -2,52 +2,73 @@
 automate MULTI
 
+# we run in the sequence BLOCK -> CHECK -> LAUNCH -> BLOCK -> CHECK
+# success on CHECK -> LAUNCH
+# failure on BLOCK -> CHECK
+
+# XXX these steps all refer to "@DBNAME@"; they need to be more generic, even for the basic simtest analysis
+
 automate METADATA
   name       STR BIAS
-  block      STR "dettool -runs -active -det_type BIAS -dbname eamtest"
-  check      STR NONE
-  launch     STR "dettool -definebyquery -workdir path://EAMWORK -inst SIMTEST -det_type BIAS -select_exp_type BIAS -dbname eamtest"
+  check      STR "regtool -processedexp -exp_type BIAS -inst SIMTEST -dbname @DBNAME@"
+  ncheck     S32 20
+  launch     STR "dettool -definebyquery -workdir path://EAMWORK -inst SIMTEST -det_type BIAS -select_exp_type BIAS -dbname @DBNAME@"
+  block      STR "dettool -runs -active -det_type BIAS -dbname @DBNAME@"
 END
 
 automate METADATA
   name       STR DARK
-  block      STR "dettool -runs -active -det_type DARK -dbname eamtest"
-  check      STR "detselect -search -inst SIMTEST -det_type BIAS -dbname eamtest"
-  launch     STR "dettool -definebyquery -workdir path://EAMWORK -inst SIMTEST -det_type DARK -select_exp_type DARK -dbname eamtest"
+  check      STR "detselect -search -inst SIMTEST -det_type BIAS -dbname @DBNAME@"
+  launch     STR "dettool -definebyquery -workdir path://EAMWORK -inst SIMTEST -det_type DARK -select_exp_type DARK -dbname @DBNAME@"
+  block      STR "dettool -runs -active -det_type DARK -dbname @DBNAME@"
 END
  
 automate METADATA
   name       STR SHUTTER
-  block      STR "dettool -runs -active -det_type SHUTTER -dbname eamtest"
-  check      STR "detselect -search -inst SIMTEST -det_type DARK -dbname eamtest"
-  launch     STR "dettool -definebyquery -workdir path://EAMWORK -inst SIMTEST -det_type SHUTTER -filter r -select_exp_type FLAT -select_filter r -dbname eamtest"
+  check      STR "detselect -search -inst SIMTEST -det_type DARK -dbname @DBNAME@"
+  launch     STR "dettool -definebyquery -workdir path://EAMWORK -inst SIMTEST -det_type SHUTTER -filter r -select_exp_type FLAT -select_filter r -dbname @DBNAME@"
+  block      STR "dettool -runs -active -det_type SHUTTER -dbname @DBNAME@"
 END
 
 automate METADATA
   name       STR FLAT-r
-  block      STR "dettool -runs -active -det_type FLAT -filter r -dbname eamtest"
-  check      STR "detselect -search -inst SIMTEST -det_type SHUTTER -dbname eamtest"
-  launch     STR "dettool -definebyquery -workdir path://EAMWORK -inst SIMTEST -det_type FLAT -filter r -select_exp_type FLAT -select_filter r -dbname eamtest"
+  check      STR "detselect -search -inst SIMTEST -det_type SHUTTER -dbname @DBNAME@"
+  launch     STR "dettool -definebyquery -workdir path://EAMWORK -inst SIMTEST -det_type FLAT -filter r -select_exp_type FLAT -select_filter r -dbname @DBNAME@"
+  block      STR "dettool -runs -active -det_type FLAT -filter r -dbname @DBNAME@"
 END
 
 automate METADATA
   name       STR FLAT-i
-  block      STR "dettool -runs -active -det_type FLAT -filter i -dbname eamtest"
-  check      STR "detselect -search -inst SIMTEST -det_type SHUTTER -dbname eamtest"
-  launch     STR "dettool -definebyquery -workdir path://EAMWORK -inst SIMTEST -det_type FLAT -filter i -select_exp_type FLAT -select_filter i -dbname eamtest"
+  check      STR "detselect -search -inst SIMTEST -det_type SHUTTER -dbname @DBNAME@"
+  launch     STR "dettool -definebyquery -workdir path://EAMWORK -inst SIMTEST -det_type FLAT -filter i -select_exp_type FLAT -select_filter i -dbname @DBNAME@"
+  block      STR "dettool -runs -active -det_type FLAT -filter i -dbname @DBNAME@"
+END
+
+automate METADATA
+  name       STR OBJECT-i
+  check      STR "detselect -dbname @DBNAME@ -search    -inst SIMTEST -filter i -det_type FLAT"
+  launch     STR "chiptool  -dbname @DBNAME@ -updaterun -inst SIMTEST -filter i -label wait -set_label proc"
+  block      STR NONE
 END
 
 automate METADATA
   name       STR OBJECT-r
-  block      STR "chiptool -unmasked -label simtest-r -dbname eamtest"
-  check      STR "detselect -search -inst SIMTEST -det_type FLAT -dbname eamtest -filter r"
-  launch     STR "chiptool -unblock -label simtest-r -dbname eamtest"
+  check      STR "detselect -dbname @DBNAME@ -search    -inst SIMTEST -filter r -det_type FLAT"
+  launch     STR "chiptool  -dbname @DBNAME@ -updaterun -inst SIMTEST -filter r -label wait -set_label proc"
+  block      STR NONE
 END
 
-automate METADATA
-  name       STR OBJECT-i
-  block      STR "chiptool -unmasked -label simtest-i -dbname eamtest"
-  check      STR "detselect -search -inst SIMTEST -det_type FLAT -dbname eamtest -filter i"
-  launch     STR "chiptool -unblock -label simtest-i -dbname eamtest"
-END
+### automate METADATA
+###   name       STR OBJECT-r
+###   check      STR "detselect -search -inst SIMTEST -det_type FLAT -dbname @DBNAME@ -filter r"
+###   launch     STR "chiptool -unblock -label simtest-r -dbname @DBNAME@"
+###   block      STR "chiptool -unmasked -label simtest-r -dbname @DBNAME@"
+### END
+
+### automate METADATA
+###   name       STR OBJECT-i
+###   check      STR "detselect -search -inst SIMTEST -det_type FLAT -dbname @DBNAME@ -filter i"
+###   launch     STR "chiptool -unblock -label simtest-i -dbname @DBNAME@"
+###   block      STR "chiptool -unmasked -label simtest-i -dbname @DBNAME@"
+### END
 
 ### there is a weakness in the label / block business: the labels are
@@ -68,7 +89,7 @@
 ### automate METADATA
 ###   name       STR OBJECT-i
-###   block      STR "chiptool -dbname eamtest -unmasked -label wait -filter i -time_begin 2008/1/1 -time_end 2008/1/2"
-###   check      STR "detselect -dbname eamtest -search -inst SIMTEST -det_type FLAT -dbname eamtest -filter i -time_begin 2008/1/1 -time_end 2008/1/2" 
-###   launch     STR "chiptool -dbname eamtest -set_label proc -label wait -dbname eamtest -time_begin 2008/1/1 -time_end 2008/1/2"
+###   block      STR "chiptool -dbname @DBNAME@ -unmasked -label wait -filter i -time_begin 2008/1/1 -time_end 2008/1/2"
+###   check      STR "detselect -dbname @DBNAME@ -search -inst SIMTEST -det_type FLAT -dbname @DBNAME@ -filter i -time_begin 2008/1/1 -time_end 2008/1/2" 
+###   launch     STR "chiptool -dbname @DBNAME@ -set_label proc -label wait -dbname @DBNAME@ -time_begin 2008/1/1 -time_end 2008/1/2"
 ### END