Changeset 27840 for branches/simtest_nebulous_branches/ippTasks/flatcorr.pro

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippTasks/flatcorr.pro (modified) (7 diffs)

branches/simtest_nebulous_branches/ippTasks/flatcorr.pro

@@ -2 +2 @@
 ## this file contains the tasks for running the flatcorr stage
 ## these tasks use the book 'flatcorrBook'
-
-# test for required global variables
-check.globals
-
-book init flatcorrBook
-
-macro flatcorr.reset
-  book init flatcorrBook
-end
-
-macro flatcorr.status
-  book listbook flatcorrBook
-end
-
-macro flatcorr.on
-  task flatcorr.addcamera
-    active true
-  end
-  task flatcorr.load
-    active true
-  end
-  task flatcorr.run
-    active true
-  end
-end
-
-macro flatcorr.off
-  task flatcorr.addcamera
-    active false
-  end
-  task flatcorr.load
-    active false
-  end
-  task flatcorr.run
-    active false
-  end
-end
-
-# these variables will cycle through the known ippdb database names
-$flatcorr_addcamera_DB = 0
-$flatcorr_pendingprocess_DB = 0
 
 # a flat-field correction run is initiated (manually) with a command like:
@@ -55 +14 @@
 # as the chip analysis progresses, we need to occasionally migrate the
 # completed chips to the camera stage by calling:
-# flatcorr -addcamera 
-
-# we wait for the completed chip and camera analysis and search for
+# flatcorr -advancecamera 
+
+# as the camera analysis progresses, we need to occasionally migrate the
+# completed exposures to the addstar stage by calling:
+# flatcorr -advanceaddstar 
+
+# we wait for the completed addstar jobs and search for
 # completed processing analysis with:
 # flatcorr -pendingprocess
@@ -67 +30 @@
 # flatcorr -addprocess -fault N
 
+# test for required global variables
+check.globals
+
+book init flatcorrBook
+
+macro flatcorr.reset
+  book init flatcorrBook
+end
+
+macro flatcorr.status
+  book listbook flatcorrBook
+end
+
+macro flatcorr.on
+  task flatcorr.advancecamera
+    active true
+  end
+  task flatcorr.advanceaddstar
+    active true
+  end
+  task flatcorr.load
+    active true
+  end
+  task flatcorr.run
+    active true
+  end
+end
+
+macro flatcorr.off
+  task flatcorr.advancecamera
+    active false
+  end
+  task flatcorr.advanceaddstar
+    active false
+  end
+  task flatcorr.load
+    active false
+  end
+  task flatcorr.run
+    active false
+  end
+end
+
+macro flatcorr.proc.on
+  task flatcorr.load
+    active true
+  end
+  task flatcorr.run
+    active true
+  end
+end
+
+macro flatcorr.proc.off
+  task flatcorr.load
+    active false
+  end
+  task flatcorr.run
+    active false
+  end
+end
+
+# these variables will cycle through the known ippdb database names
+$flatcorr_advancecamera_DB = 0
+$flatcorr_advanceaddstar_DB = 0
+$flatcorr_pendingprocess_DB = 0
+
 # migrate complete flatcorr chips to the camera stage analysis
-task           flatcorr.addcamera
+task           flatcorr.advancecamera
   host         local
 
@@ -80 +109 @@
     # define the command (does not depend on previous queries)
     if ($DB:n == 0)
-      command flatcorr -addcamera
+      command flatcorr -advancecamera
     else
       # save the DB name for the exit tasks
       # note that this DB name refers to the ippdb, not the dvodb
-      option $DB:$flatcorr_addcamera_DB
-      command flatcorr -addcamera -dbname $DB:$flatcorr_addcamera_DB
-      $flatcorr_addcamera_DB ++
-      if ($flatcorr_addcamera_DB >= $DB:n) set flatcorr_addcamera_DB = 0
+      option $DB:$flatcorr_advancecamera_DB
+      command flatcorr -advancecamera -dbname $DB:$flatcorr_advancecamera_DB
+      $flatcorr_advancecamera_DB ++
+      if ($flatcorr_advancecamera_DB >= $DB:n) set flatcorr_advancecamera_DB = 0
+    end
+  end
+
+  # silently drop stdout
+  stdout NULL
+  stderr $LOGDIR/flatcorr.log
+
+  # success (no action required)
+  task.exit $EXIT_SUCCESS
+  end
+
+  # locked list
+  task.exit    default
+    showcommand failure
+  end
+
+  task.exit    crash
+    showcommand crash
+  end
+
+  # operation times out?
+  task.exit    timeout
+    showcommand timeout
+  end
+end
+
+# migrate complete flatcorr exposures to the addstar process
+task           flatcorr.advanceaddstar
+  host         local
+
+  # check the list of pending flatcorr runs
+  periods      -poll 5
+  periods      -exec 30
+  periods      -timeout 60
+  npending 1
+
+  task.exec
+    # define the command (does not depend on previous queries)
+    if ($DB:n == 0)
+      command flatcorr -advanceaddstar
+    else
+      # save the DB name for the exit tasks
+      # note that this DB name refers to the ippdb, not the dvodb
+      option $DB:$flatcorr_advanceaddstar_DB
+      command flatcorr -advanceaddstar -dbname $DB:$flatcorr_advanceaddstar_DB
+      $flatcorr_advanceaddstar_DB ++
+      if ($flatcorr_advanceaddstar_DB >= $DB:n) set flatcorr_advanceaddstar_DB = 0
     end
   end
@@ -175 +251 @@
 task           flatcorr.run
   host         local
+  npending     1
 
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC
-  periods      -timeout 60
+  periods      -timeout 3600
 
   # silently drop stdout
@@ -202 +279 @@
     book getword flatcorrBook $pageName region      -var REGION
     book getword flatcorrBook $pageName filter      -var FILTER
+    book getword flatcorrBook $pageName make_corr   -var MAKE_CORRECTION
     book getword flatcorrBook $pageName dbname      -var DBNAME
     book getword flatcorrBook $pageName workdir     -var WORKDIR_TEMPLATE
 
-    # specify choice of remote host
-    # set a specific DVO host here 
-    if ($PARALLEL)
-      host anyhost
-    else
-      host local
-    end
-
     # save the pageName for future reference below
     options $pageName
@@ -224 +294 @@
     # XXX get these arguments right
     $run = flatcorr_proc.pl --corr_id $CORR_ID --det_type $DET_TYPE --dvodb $DVODB --camera $CAMERA --region $REGION --filter $FILTER --workdir $outroot
+    if ("$MAKE_CORRECTION" == "T")
+      $run = $run --make_correction
+    end
     add_standard_args run