Index: trunk/ippTasks/simtest.flatcorr.auto
===================================================================
--- trunk/ippTasks/simtest.flatcorr.auto	(revision 19330)
+++ trunk/ippTasks/simtest.flatcorr.auto	(revision 19381)
@@ -5,4 +5,7 @@
 # success on CHECK -> LAUNCH
 # failure on BLOCK -> CHECK
+
+# this is a simplified automate script which only models BIAS and FLAT.  
+# generate appropriate simulated data with the FLATCORR recipe
 
 # wait until 20 bias frames are registered, then define a new bias run
@@ -22,5 +25,5 @@
   block      STR "dettool -runs -active -det_type DARK -dbname @DBNAME@"
 END
- 
+
 # wait until the master dark frame is registered, then define a new shutter run
 automate METADATA
@@ -31,43 +34,44 @@
 END
 
-# wait until the master shutter frame is registered, then define a new flat-r run
+# wait until the master bias frame is registered, then define a new flat-r run
 automate METADATA
-  name       STR FLAT-r
+  name       STR RAWFLAT-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 FLAT -select_filter r -dbname @DBNAME@"
-  block      STR "dettool -runs -active -det_type FLAT -filter r -dbname @DBNAME@"
+  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type FLAT_RAW -filter r -select_exp_type FLAT -select_filter r -dbname @DBNAME@"
+  block      STR "dettool -runs -active -det_type FLAT_RAW -filter r -dbname @DBNAME@"
 END
 
-# wait until the master shutter frame is registered, then define a new flat-i run
+# wait until the master bias frame is registered, then define a new flat-i run
 automate METADATA
-  name       STR FLAT-i
+  name       STR RAWFLAT-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 FLAT -select_filter i -dbname @DBNAME@"
-  block      STR "dettool -runs -active -det_type FLAT -filter i -dbname @DBNAME@"
+  launch     STR "dettool -definebyquery -workdir file://@CWD@/detwork -inst @CAMERA@ -det_type FLAT_RAW -filter i -select_exp_type FLAT -select_filter i -dbname @DBNAME@"
+  block      STR "dettool -runs -active -det_type FLAT_RAW -filter i -dbname @DBNAME@"
 END
 
-# wait until the master flat-r frame is registered, then unblock the r-band data for chip-level processing
-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"
-  block      STR NONE
-END
+## # wait until the master flat-r frame is registered, then unblock the r-band data for chip-level processing
+## 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"
+##   block      STR NONE
+## END
+## 
+## # wait until the master flat-i frame is registered, then unblock the i-band data for chip-level processing
+## 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"
+##   block      STR NONE
+## END
+## 
+## # wait until the r-band is done with camera, then define a new flat-correction run
+## automate METADATA
+##   name       STR FLATCORR-i
+##   check      STR "camtool -dbname @DBNAME@ -search -inst @CAMERA@ -filter r"
+##   ncheck     S32 8
+##   launch     STR "chiptool  -dbname @DBNAME@ -updaterun -inst @CAMERA@ -filter i -label wait -set_label proc"
+##   block      STR NONE
+## END
 
-# wait until the master flat-i frame is registered, then unblock the i-band data for chip-level processing
-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"
-  block      STR NONE
-END
-
-# wait until the r-band is done with camera, then define a new flat-correction run
-automate METADATA
-  name       STR FLATCORR-i
-  check      STR "camtool -dbname @DBNAME@ -search -inst @CAMERA@ -filter r"
-  ncheck     S32 8
-  launch     STR "chiptool  -dbname @DBNAME@ -updaterun -inst @CAMERA@ -filter i -label wait -set_label proc"
-  block      STR NONE
-END
-
+## flatcorr -definebyquery -dbname eamtest -filter r -set_workdir /data/alala.0/eugene/swtests/simtest/test.f1/work -set_reduction FLATCORR -set_dvodb /data/alala.0/eugene/swtests/simtest/test.f1/catdir.flatcorr -set_region 270.6,270.9:-23.8,-23.5 -set_filter r