Index: /branches/eam_branches/ipp-pstamp-20260421/ippTasks/automate.pro
===================================================================
--- /branches/eam_branches/ipp-pstamp-20260421/ippTasks/automate.pro	(revision 43015)
+++ /branches/eam_branches/ipp-pstamp-20260421/ippTasks/automate.pro	(revision 43016)
@@ -1,3 +1,3 @@
-## automate.pro : autorun the detrend analysis : -*- sh -*-
+# automate.pro : autorun the detrend analysis : -*- sh -*-
 
 # example automation stage
Index: /branches/eam_branches/ipp-pstamp-20260421/ippTasks/simtest.basic.auto
===================================================================
--- /branches/eam_branches/ipp-pstamp-20260421/ippTasks/simtest.basic.auto	(revision 43015)
+++ /branches/eam_branches/ipp-pstamp-20260421/ippTasks/simtest.basic.auto	(revision 43016)
@@ -6,46 +6,62 @@
 # failure on BLOCK -> CHECK
 
+# a stage starts in state INIT.BLOCK.
+
+# the "automate.block" task runs the 'block' command regularly.  if it
+# returns a valid result, the block is set and the state remains in
+# block.  if there is no result (ie, no matching BIAS, etc), the stage
+# is put to state INIT.CHECK.
+
+# the "automate.check" tasks runs the 'check' command regularly.  if
+# it returns ncheck valid entries (default ncheck = 1), the state goes
+# to INIT.LAUNCH.
+
+# the "automate.launch" tasks runs the 'launch' command once.  if it returns
+# ncheck valid entries (default ncheck = 1), the state goes to
+# INIT.LAUNCH.
+
 # XXX these steps all refer to "@DBNAME@"; they need to be more generic, even for the basic simtest analysis
 
 automate METADATA
   name       STR BIAS
-  check      STR "regtool -processedexp -exp_type BIAS -inst @CAMERA@ -dbname @DBNAME@"
+  check      STR "regtool -dbname @DBNAME@ -processedexp -exp_type BIAS -inst @CAMERA@"
   ncheck     S32 20
-  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type BIAS -select_exp_type BIAS -dbname @DBNAME@"
-  block      STR "dettool -runs -active -det_type BIAS -dbname @DBNAME@"
+  launch     STR "dettool -dbname @DBNAME@ -definebyquery -time_begin 2010/01/01 -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type BIAS -select_exp_type BIAS"
+  block      STR "dettool -dbname @DBNAME@ -runs -active -det_type BIAS"
 END
 
 automate METADATA
   name       STR DARK
-  check      STR "detselect -search -inst @CAMERA@ -det_type BIAS -dbname @DBNAME@"
-  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type DARK -select_exp_type DARK -dbname @DBNAME@"
-  block      STR "dettool -runs -active -det_type DARK -dbname @DBNAME@"
+  check      STR "detselect -dbname @DBNAME@ -search -inst @CAMERA@ -det_type BIAS -time 2010/01/01"
+  launch     STR "dettool -dbname @DBNAME@ -definebyquery -time_begin 2010/01/01  -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type DARK -select_exp_type DARK"
+  block      STR "dettool -dbname @DBNAME@ -runs -active -det_type DARK"
 END
  
 automate METADATA
   name       STR SHUTTER
-  check      STR "detselect -search -inst @CAMERA@ -det_type DARK -dbname @DBNAME@"
-  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type SHUTTER -filter r -select_exp_type SKYFLAT -select_filter r -dbname @DBNAME@"
-  block      STR "dettool -runs -active -det_type SHUTTER -dbname @DBNAME@"
+  check      STR "detselect -dbname @DBNAME@ -search -inst @CAMERA@ -det_type DARK -time 2010/01/01"
+  launch     STR "dettool -dbname @DBNAME@ -definebyquery -time_begin 2010/01/01  -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type SHUTTER -filter r -select_exp_type SKYFLAT -select_filter r"
+  block      STR "dettool -dbname @DBNAME@ -runs -active -det_type SHUTTER"
 END
 
 automate METADATA
   name       STR FLAT-r
-  check      STR "detselect -search -inst @CAMERA@ -det_type SHUTTER -dbname @DBNAME@"
-  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type FLAT -filter r -select_exp_type SKYFLAT -select_filter r -dbname @DBNAME@"
-  block      STR "dettool -runs -active -det_type FLAT -filter r -dbname @DBNAME@"
+  check      STR "detselect -dbname @DBNAME@ -search -inst @CAMERA@ -det_type SHUTTER -time 2010/01/01"
+  launch     STR "dettool -dbname @DBNAME@ -definebyquery -time_begin 2010/01/01  -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type FLAT -filter r -select_exp_type SKYFLAT -select_filter r"
+  block      STR "dettool -dbname @DBNAME@ -runs -active -det_type FLAT -filter r"
 END
 
 automate METADATA
   name       STR FLAT-i
-  check      STR "detselect -search -inst @CAMERA@ -det_type SHUTTER -dbname @DBNAME@"
-  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type FLAT -filter i -select_exp_type SKYFLAT -select_filter i -dbname @DBNAME@"
-  block      STR "dettool -runs -active -det_type FLAT -filter i -dbname @DBNAME@"
+  check      STR "detselect -dbname @DBNAME@ -search -inst @CAMERA@ -det_type SHUTTER -time 2010/01/01"
+  launch     STR "dettool -dbname @DBNAME@ -definebyquery -time_begin 2010/01/01  -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type FLAT -filter i -select_exp_type SKYFLAT -select_filter i"
+  block      STR "dettool -dbname @DBNAME@ -runs -active -det_type FLAT -filter i"
 END
 
+## the lines below assume the simtest suite injects the chips with an end state of chip, but currently they only go to 'reg'
 automate METADATA
   name       STR OBJECT-i
-  check      STR "detselect -dbname @DBNAME@ -search    -inst @CAMERA@ -filter i -det_type FLAT"
-  launch     STR "chiptool  -dbname @DBNAME@ -updaterun -inst @CAMERA@ -filter i -label wait -set_label proc -set_data_group simtest_i -set_dist_group simtest"
+  check      STR "detselect -dbname @DBNAME@ -search -inst @CAMERA@ -det_type FLAT -filter i -time 2010/01/01"
+  launch     STR "chiptool  -dbname @DBNAME@ -updaterun -inst @CAMERA@ -label wait    -filter i -set_label proc -set_data_group simtest_i -set_dist_group simtest"
   block      STR NONE
 END
@@ -53,39 +69,33 @@
 automate METADATA
   name       STR OBJECT-r
-  check      STR "detselect -dbname @DBNAME@ -search    -inst @CAMERA@ -filter r -det_type FLAT"
-  launch     STR "chiptool  -dbname @DBNAME@ -updaterun -inst @CAMERA@ -filter r -label wait -set_label proc -set_data_group simtest_r -set_dist_group simtest"
+  check      STR "detselect -dbname @DBNAME@ -search -inst @CAMERA@ -det_type FLAT -filter r -time 2010/01/01"
+  launch     STR "chiptool  -dbname @DBNAME@ -updaterun -inst @CAMERA@ -label wait    -filter r -set_label proc -set_data_group simtest_r -set_dist_group simtest"
   block      STR NONE
 END
 
-### Stack automation
-automate METADATA
-  name       STR STACK
-  regular    STR "stacktool -definebyquery -set_label proc -set_data_group simtest_r -set_dist_group simtest -set_workdir file://@CWD@/stack -min_new 4 -min_frac 2 -select_good_frac_min 0.2 -min_num 4 -dbname @DBNAME@"
-END
-
-### Diff automation
-automate METADATA
-  name       STR DIFF
-  regular    STR "difftool -definewarpstack -set_label proc -set_workdir file://@CWD@/diff -good_frac 0.2 -dbname @DBNAME@"
-END
-
-#### Magic automation???
-#automate METADATA
-#  name       STR MAGIC
-#  regular    STR "magictool -definebyquery -workdir file://@CWD@/magic -good_frac 0.2 -dbname @DBNAME@"
-#END
+### ### Stack automation
+### automate METADATA
+###   name       STR STACK
+###   regular    STR "stacktool -dbname @DBNAME@ -definebyquery  -set_label proc -set_data_group simtest_r -set_dist_group simtest -set_workdir file://@CWD@/stack -min_new 4 -min_frac 2 -select_good_frac_min 0.2 -min_num 4"
+### END
+### 
+### ### Diff automation
+### automate METADATA
+###   name       STR DIFF
+###   regular    STR "difftool -dbname @DBNAME@ -definewarpstack -set_label proc -set_workdir file://@CWD@/diff -good_frac 0.2"
+### END
 
 ### automate METADATA
 ###   name       STR OBJECT-r
-###   check      STR "detselect -search -inst @CAMERA@ -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@"
+###   check      STR "detselect -dbname @DBNAME@ -search -inst @CAMERA@ -det_type FLAT -filter r"
+###   launch     STR "chiptool -dbname @DBNAME@ -unblock -label simtest-r"
+###   block      STR "chiptool -dbname @DBNAME@ -unmasked -label simtest-r"
 ### END
 
 ### automate METADATA
 ###   name       STR OBJECT-i
-###   check      STR "detselect -search -inst @CAMERA@ -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@"
+###   check      STR "detselect -dbname @DBNAME@ -search -inst @CAMERA@ -det_type FLAT -filter i"
+###   launch     STR "chiptool -dbname @DBNAME@ -unblock -label simtest-i"
+###   block      STR "chiptool -dbname @DBNAME@ -unmasked -label simtest-i"
 ### END
 
@@ -108,6 +118,6 @@
 ###   name       STR OBJECT-i
 ###   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 @CAMERA@ -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"
+###   check      STR "detselect -dbname @DBNAME@ -search -inst @CAMERA@ -det_type FLAT -filter i -time_begin 2008/1/1 -time_end 2008/1/2" 
+###   launch     STR "chiptool -dbname @DBNAME@ -set_label proc -label wait -time_begin 2008/1/1 -time_end 2008/1/2"
 ### END
 
Index: /branches/eam_branches/ipp-pstamp-20260421/ippTasks/simtest.pro
===================================================================
--- /branches/eam_branches/ipp-pstamp-20260421/ippTasks/simtest.pro	(revision 43015)
+++ /branches/eam_branches/ipp-pstamp-20260421/ippTasks/simtest.pro	(revision 43016)
@@ -76,8 +76,21 @@
       # the labels "wait" and "proc" are special names used in automate.pro
     
-      # make a reference database
+      # make a reference database using refcat.fits
+      #
       mkref refcat 10
 
-      $ppsim = "ppSimSequence $SIMTEST_SEQUENCE simtest.mkimages simtest.inject -path $SIMTEST_RAWDIR -workdir $SIMTEST_WORKDIR -dbname $dbname -label wait -dvodb DVO -tess_id TESS -refcat refcat.catdir"
+      local mySeq
+      $mySeq = $SIMTEST_SEQUENCE
+      file $mySeq isFound
+      if (not($isFound))
+        $mySeq = $MODULES:0/$SIMTEST_SEQUENCE
+        file $mySeq isFound
+        if (not($isFound))
+          echo "cannot find the SIMTEST_SEQUENCE file $SIMTEST_SEQUENCE"
+	  break
+	end
+      end
+
+      $ppsim = "ppSimSequence $mySeq simtest.mkimages simtest.inject -path $SIMTEST_RAWDIR -workdir $SIMTEST_WORKDIR -dbname $dbname -label wait -dvodb DVO -tess_id TESS -refcat refcat.catdir"
       if ("$PPSIM_RECIPE" != "default") 
          $ppsim = $ppsim -ppsim_recipe $PPSIM_RECIPE
@@ -85,4 +98,5 @@
       $ppsim = $ppsim -camera $SIMTEST_CAMERA
 
+      echo $ppsim
       exec $ppsim
 
@@ -106,5 +120,23 @@
   module automate.pro
 
-  module.tasks
+  if (1)
+    module register.pro
+    module detrend.process.pro
+    module detrend.stack.pro
+    module detrend.norm.pro
+    module detrend.resid.pro
+    module detrend.reject.pro
+    module detrend.correct.pro
+#   module flatcorr.pro
+    module chip.pro
+    module camera.pro
+#   module addstar.pro
+    module fake.pro
+    module warp.pro
+    module diff.pro
+    module stack.pro
+  else
+    module.tasks
+  end
 
   add.label proc
@@ -120,5 +152,17 @@
   automate.load $SIMTEST_AUTO $SIMTEST_CAMERA $dbname
 
-  tasks.revert.off
+  # module.tasks loads these
+  if (1) 
+    register.revert.off
+    detrend.revert.off
+  # flatcorr.revert.off
+    chip.revert.off
+    camera.revert.off
+  # addstar.revert.off
+    fake.revert.off
+    warp.revert.off
+    diff.revert.off
+    stack.revert.off
+  end
 
   run