Index: /branches/eam_branches/ipp-pstamp-20260421/simtest/Makefile.am
===================================================================
--- /branches/eam_branches/ipp-pstamp-20260421/simtest/Makefile.am	(revision 43109)
+++ /branches/eam_branches/ipp-pstamp-20260421/simtest/Makefile.am	(revision 43110)
@@ -1,6 +1,12 @@
 
 install_files = \
-	sim.pro \
-	images.pro
+	simtest.pro \
+	simtest.server.pro \
+	simtest.pstamp.pro \
+	simtest.quickmos.auto \
+	simtest.quickmos.config
+
+# sim.pro
+# images.pro
 
 installdir = $(datadir)/pantasks/modules
Index: /branches/eam_branches/ipp-pstamp-20260421/simtest/simtest.pro
===================================================================
--- /branches/eam_branches/ipp-pstamp-20260421/simtest/simtest.pro	(revision 43109)
+++ /branches/eam_branches/ipp-pstamp-20260421/simtest/simtest.pro	(revision 43110)
@@ -1,9 +1,10 @@
+#!/usr/bin/env dvo
 ## simtest.pro : automatic full-suite simulated IPP test : -*- sh -*-
 
 ## there are four features which define a simtest run:
-## the camera : any camera can be used, the sim... cameras are defined to be quick tests
+## the camera   : any camera can be used, the sim... cameras are defined to be quick tests
 ## the sequence : this file defines the set of observations generated
-## the auto : the automation file defines the sequence of analysis performed
-## the recipe : the ppsim recipe defines the features which are included in the generate data
+## the auto     : the automation file defines the sequence of analysis performed
+## the recipe   : the ppsim recipe defines the features which are included in the generate data
 
 ## these are not completely independent: a certain sequence may be
@@ -49,8 +50,9 @@
     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.quickmos  : run mosaic simtest suite : use for pstamp"
+    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"
-    echo "  simtest.setup.ctemask : run a ctemask demonstration"
+    echo "  simtest.setup.flatcorr  : run a flat-field correction demonstration"
+    echo "  simtest.setup.ctemask   : run a ctemask demonstration"
     break
   end
@@ -59,4 +61,5 @@
   $hostname = $2
   $init = $3
+
   if (("$init" != "run") && ("$init" != "inject") && ("$init" != "new"))
     echo "USAGE: simtest (dbname) (hostname) (init)"
@@ -133,52 +136,9 @@
     end
 
-    exec chiptool -dbname $dbname -block -label wait
+    ## exec chiptool -dbname $dbname -block -label wait
     exec source simtest.inject
   end
 
-  module pantasks.pro
-  module automate.pro
-
-  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 chip.pro
-    module camera.pro
-    module fake.pro
-    module warp.pro
-    module diff.pro
-    module stack.pro
-  end
-
-  add.label proc
-
-  if ($SIMTEST_THREADS == 0) 
-    controller host add $hostname
-  else
-    controller host add $hostname -threads $SIMTEST_THREADS
-  end
-
-  add.database $dbname
-
   automate.load $SIMTEST_AUTO $SIMTEST_CAMERA $dbname
-
-  # module.tasks loads these
-  if (1) 
-    register.revert.off
-    detrend.revert.off
-    chip.revert.off
-    camera.revert.off
-    fake.revert.off
-    warp.revert.off
-    diff.revert.off
-    stack.revert.off
-  end
-
-  run
 end
 
@@ -194,4 +154,13 @@
   $SIMTEST_SEQUENCE = simtest.basic.config
   $SIMTEST_AUTO = simtest.basic.auto
+end
+
+macro simtest.setup.quickmos
+  $SIMTEST_CAMERA   = SIMMOSAIC
+  $SIMTEST_SEQUENCE = simtest.quickmos.config
+  $SIMTEST_AUTO     = simtest.quickmos.auto
+
+  $CENTER_RA  = 270.0
+  $CENTER_DEC =  30.0
 end
 
@@ -287,3 +256,2 @@
   output stdout
 end
-
Index: /branches/eam_branches/ipp-pstamp-20260421/simtest/simtest.pstamp.pro
===================================================================
--- /branches/eam_branches/ipp-pstamp-20260421/simtest/simtest.pstamp.pro	(revision 43110)
+++ /branches/eam_branches/ipp-pstamp-20260421/simtest/simtest.pstamp.pro	(revision 43110)
@@ -0,0 +1,27 @@
+
+macro setup
+
+  # global pantasks macros and tasks
+  module pantasks.pro
+
+  ### postage-stamp server stuff
+  module pstamp.pro
+
+  # pstamp may use a different database machine from stdscience
+  $PS_DBSERVER = -dbserver localhost
+
+  ### NOTE: pstamp must be setup with the correct database,
+  ### possibly different from stdscience
+  
+  add.database pstamp
+
+  # pstamp labels:
+  add.label WEB.UP
+  add.label TEST
+
+  ### add hosts as desired
+  control host add localhost
+
+  # XXX how to specify threads?  
+  ## controller host add $hostname -threads $SIMTEST_THREADS
+end
Index: /branches/eam_branches/ipp-pstamp-20260421/simtest/simtest.server.pro
===================================================================
--- /branches/eam_branches/ipp-pstamp-20260421/simtest/simtest.server.pro	(revision 43110)
+++ /branches/eam_branches/ipp-pstamp-20260421/simtest/simtest.server.pro	(revision 43110)
@@ -0,0 +1,59 @@
+
+macro setup
+
+  # global pantasks macros and tasks
+  module pantasks.pro
+
+  ### simtest stuff
+  module automate.pro
+
+  ### science processing stuff
+
+  # detrend create tasks:
+  module detrend.process.pro
+  module detrend.stack.pro
+  module detrend.norm.pro
+  module detrend.resid.pro
+  module detrend.reject.pro
+  module detrend.correct.pro
+
+  # standard science processing tasks:
+  module register.pro
+  module chip.pro
+  module camera.pro
+  module fake.pro
+  module warp.pro
+  module stack.pro
+  module diff.pro
+
+  add.database simtest
+
+  # basic science simtest processing
+  add.label proc
+
+  # science label for pstamp updates
+  add.label ps_ud_WEB
+
+  ### cleanup stuff
+  module science.cleanup.pro
+
+  # run cleanup on these stages:
+  chip.cleanup.on
+  warp.cleanup.on
+  diff.cleanup.on
+
+  stack.cleanup.off
+  chip.bg.cleanup.off
+  warp.bg.cleanup.off
+  camera.cleanup.off
+
+  # label for cleanup processing
+  add.label goto_cleaned
+
+  ### add hosts as desired
+  control host add localhost
+
+  # XXX how to specify threads?  
+  ## controller host add $hostname -threads $SIMTEST_THREADS
+end
+