Changeset 42486

Timestamp:

Aug 5, 2023, 9:29:58 AM (3 years ago)

Author:

eugene

Message:

improve the simtest tasks

Location:

trunk/ippTasks

Files:

• simtest.images.auto (modified) (2 diffs)
• simtest.images.config (modified) (1 diff)
• simtest.pro (modified) (2 diffs)

trunk/ippTasks/simtest.images.auto

@@ -11 +11 @@
   name       STR OBJECT-i
   check      STR "regtool -processedexp -exp_type OBJECT -filter i -inst @CAMERA@ -dbname @DBNAME@"
-  launch     STR "chiptool  -dbname @DBNAME@ -definebyquery -inst @CAMERA@ -filter i -set_label simtest -set_data_group simtest_i -set_dist_group simtest -set_reduction PROCESSED -set_workdir @CWD@/work -set_end_stage fake"
+  launch     STR "chiptool  -dbname @DBNAME@ -updaterun -inst @CAMERA@ -filter i -label wait -set_label proc -set_data_group simtest_i -set_dist_group simtest"
   block      STR NONE
 END
@@ -18 +18 @@
   name       STR OBJECT-r
   check      STR "regtool -processedexp -exp_type OBJECT -filter r -inst @CAMERA@ -dbname @DBNAME@"
-  launch     STR "chiptool  -dbname @DBNAME@ -definebyquery -inst @CAMERA@ -filter r -set_label simtest -set_data_group simtest_r -set_dist_group simtest -set_reduction PROCESSED -set_workdir @CWD@/work -set_end_stage fake"
+  launch     STR "chiptool  -dbname @DBNAME@ -updaterun -inst @CAMERA@ -filter r -label wait -set_label proc -set_data_group simtest_r -set_dist_group simtest"
   block      STR NONE
 END

trunk/ippTasks/simtest.images.config

@@ -40 +40 @@
 
 
-## SEQUENCE METADATA
-##   OBSTYPE    STR OBJECT
-##   CAMERA     STR SIMTEST
-## 
-## ### Carina
-##   CENTER.RA  F32 270.75
-##   CENTER.DEC F32 -23.7
-## ### COSMOS field
-## #  CENTER.RA  F32 150.119167 
-## #  CENTER.DEC F32   2.205833
-## 
-##   OFFSET.RA  F32 3600.0 # linear offset in arcsec (do not include cos(DEC) correction)
-##   OFFSET.DEC F32 3600.0 # linear offset in arcsec (do not include cos(DEC) correction)
-##   OFFSET.NR  S32 1
-##   OFFSET.ND  S32 1
-## 
-##   DITHER.RA  F32 30.0   # linear offset in arcsec (do not include cos(DEC) correction)
-##   DITHER.DEC F32 30.0   # linear offset in arcsec (do not include cos(DEC) correction)
-##   DITHER.NR  S32 1
-##   DITHER.ND  S32 1
-## 
-##   DVODB      STR /data/alala.0/ipp/ippRefs/catdir.synth.simtest 
-##   FILTERS    STR r,r,i,i
-##   @EXPTIMES  F32 5.0, 240.0, 5.0, 240.0
-##   @SKYMAGS   F32 20.86,20.86,20.15,20.15
-## 
-##   # XXX use a more realistic IQ distribution...
-##   IQ_MIN     F32 0.55
-##   IQ_MAX     F32 1.25
-##   
-##   # rotation sequence
-##   POS_MIN    F32 0.0
-##   POS_MAX    F32 0.0
-##   POS_DELTA  F32 1.0
-## END
+SEQUENCE METADATA
+  OBSTYPE    STR OBJECT
+  CAMERA     STR SIMTEST
 
+### Carina
+  CENTER.RA  F32 270.75
+  CENTER.DEC F32 -23.7
+### COSMOS field
+#  CENTER.RA  F32 150.119167 
+#  CENTER.DEC F32   2.205833
+
+  OFFSET.RA  F32 3600.0 # linear offset in arcsec (do not include cos(DEC) correction)
+  OFFSET.DEC F32 3600.0 # linear offset in arcsec (do not include cos(DEC) correction)
+  OFFSET.NR  S32 1
+  OFFSET.ND  S32 1
+
+  DITHER.RA  F32 30.0   # linear offset in arcsec (do not include cos(DEC) correction)
+  DITHER.DEC F32 30.0   # linear offset in arcsec (do not include cos(DEC) correction)
+  DITHER.NR  S32 1
+  DITHER.ND  S32 1
+
+  DVODB      STR /data/alala.0/ipp/ippRefs/catdir.synth.simtest 
+  FILTERS    STR r,r,i,i
+  @EXPTIMES  F32 5.0, 240.0, 5.0, 240.0
+  @SKYMAGS   F32 20.86,20.86,20.15,20.15
+
+  # XXX use a more realistic IQ distribution...
+  IQ_MIN     F32 0.55
+  IQ_MAX     F32 1.25
+  
+  # rotation sequence
+  POS_MIN    F32 0.0
+  POS_MAX    F32 0.0
+  POS_DELTA  F32 1.0
+END
+

trunk/ippTasks/simtest.pro

@@ -106 +106 @@
   module automate.pro
 
-  module chip.pro
-  module camera.pro
-  module register.pro
-  # module.tasks
-
-  # XXX consolidate design of label / state / ?? for processing sequences
-  add.label simtest
+  module.tasks
+
+  add.label proc
 
   if ($SIMTEST_THREADS == 0) 
@@ -124 +120 @@
   automate.load $SIMTEST_AUTO $SIMTEST_CAMERA $dbname
 
-  # tasks.revert.off
+  tasks.revert.off
 
   run