Changeset 31376

Timestamp:

Apr 25, 2011, 3:00:33 PM (15 years ago)

Author:

heather

Message:

merging in addstar changes

Location:

trunk/ippTasks

Files:

• addstar.pro (modified) (7 diffs)
• survey.pro (modified) (4 diffs)

trunk/ippTasks/addstar.pro

@@ -17 +17 @@
 
 macro addstar.on
-  task addstar.exp.load
+  task addstar.exp.load.stack
+    active true
+  end
+  task addstar.exp.load.cam
+    active true
+  end
+  task addstar.exp.load.staticsky
     active true
   end
@@ -26 +32 @@
 
 macro addstar.off
-  task addstar.exp.load
+  task addstar.exp.load.stack
+    active false
+  end
+  task addstar.exp.load.cam
+    active false
+  end
+  task addstar.exp.load.staticsky
     active false
   end
@@ -54 +66 @@
 # new entries are added to addPendingExp
 # skip already-present entries
-task           addstar.exp.load
+task           addstar.exp.load.stack
   host         local
 
@@ -67 +79 @@
   task.exec
    # if ($LABEL:n == 0) break
-    $run = addtool -pendingexp
+    $run = addtool -pendingexp -stage stack
     if ($DB:n == 0)
       option DEFAULT
@@ -109 +121 @@
 end
 
+task           addstar.exp.load.cam
+  host         local
+
+  periods      -poll $LOADPOLL
+  periods      -exec $LOADEXEC
+  periods      -timeout 30
+  npending     1
+
+  stdout NULL
+  stderr $LOGDIR/addstar.exp.log
+
+  task.exec
+   # if ($LABEL:n == 0) break
+    $run = addtool -pendingexp -stage cam
+    if ($DB:n == 0)
+      option DEFAULT
+    else
+      # save the DB name for the exit tasks
+      option $DB:$addstar_DB
+      $run = $run -dbname $DB:$addstar_DB
+      $addstar_DB ++
+      if ($addstar_DB >= $DB:n) set addstar_DB = 0
+    end
+    add_poll_args run
+    add_poll_labels run
+    command $run
+  end
+
+  # success
+  task.exit    0
+    # convert 'stdout' to book format
+    ipptool2book stdout addPendingExp -key add_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    if ($VERBOSE > 2)
+      book listbook addPendingExp
+    end
+
+    # delete existing entries in the appropriate pantaskStates
+    process_cleanup addPendingExp
+  end
+
+  # default exit status
+  task.exit    default
+    showcommand failure
+  end
+
+  task.exit    crash
+    showcommand crash
+  end
+
+  # operation times out?
+  task.exit    timeout
+    showcommand timeout
+  end
+end
+task           addstar.exp.load.staticsky
+  host         local
+
+  periods      -poll $LOADPOLL
+  periods      -exec $LOADEXEC
+  periods      -timeout 30
+  npending     1
+
+  stdout NULL
+  stderr $LOGDIR/addstar.exp.log
+
+  task.exec
+   # if ($LABEL:n == 0) break
+    $run = addtool -pendingexp -stage staticsky
+    if ($DB:n == 0)
+      option DEFAULT
+    else
+      # save the DB name for the exit tasks
+      option $DB:$addstar_DB
+      $run = $run -dbname $DB:$addstar_DB
+      $addstar_DB ++
+      if ($addstar_DB >= $DB:n) set addstar_DB = 0
+    end
+    add_poll_args run
+    add_poll_labels run
+    command $run
+  end
+
+  # success
+  task.exit    0
+    # convert 'stdout' to book format
+    ipptool2book stdout addPendingExp -key add_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    if ($VERBOSE > 2)
+      book listbook addPendingExp
+    end
+
+    # delete existing entries in the appropriate pantaskStates
+    process_cleanup addPendingExp
+  end
+
+  # default exit status
+  task.exit    default
+    showcommand failure
+  end
+
+  task.exit    crash
+    showcommand crash
+  end
+
+  # operation times out?
+  task.exit    timeout
+    showcommand timeout
+  end
+end
 # run the addstar script on pending exposures
 task           addstar.exp.run
@@ -132 +252 @@
     book getword addPendingExp $pageName exp_tag -var EXP_TAG
     book getword addPendingExp $pageName add_id -var ADD_ID
-    book getword addPendingExp $pageName camroot -var CAMROOT
+    book getword addPendingExp $pageName stageroot -var STAGEROOT
+    book getword addPendingExp $pageName stage -var STAGE  
     book getword addPendingExp $pageName workdir -var WORKDIR_TEMPLATE
     book getword addPendingExp $pageName reduction -var REDUCTION
@@ -157 +278 @@
 
     ## generate outroot specific to this exposure (& chip)
-    sprintf outroot "%s/%s/%s.add.%s" $WORKDIR $EXP_TAG $EXP_TAG $ADD_ID
+
+    if ("$STAGE" == "cam")
+        sprintf outroot "%s/%s/%s.add.%s" $WORKDIR $EXP_TAG $EXP_TAG $ADD_ID
+    end
+    if ("$STAGE" == "staticsky")
+        sprintf outroot "%s.add.%s" $STAGEROOT $ADD_ID
+    end
+    if ("$STAGE" == "stack")
+        sprintf outroot "%s.add.%s" $STAGEROOT $ADD_ID
+    end
+  
 
     stdout $LOGDIR/addstar.exp.log
     stderr $LOGDIR/addstar.exp.log
 
-    $run = addstar_run.pl --exp_tag $EXP_TAG --add_id $ADD_ID --camera $CAMERA --dvodb $DVODB --camroot $CAMROOT --outroot $outroot --redirect-output
+    $run = addstar_run.pl --add_id $ADD_ID --camera $CAMERA --dvodb $DVODB --stage $STAGE --stageroot $STAGEROOT --outroot $outroot --redirect-output
     if ("$REDUCTION" != "NULL")
       $run = $run --reduction $REDUCTION

trunk/ippTasks/survey.pro

@@ -231 +231 @@
 
 macro survey.add.addstar
-  if ($0 != 4)
-    echo "USAGE: survey.add.addstar (label) (dvodb) (minidvodb_group)"
+  if ($0 != 5)
+    echo "USAGE: survey.add.addstar (label) (dvodb) (minidvodb_group) (stage)"
     break
   end
@@ -238 +238 @@
   book setword SURVEY_ADDSTAR $1 DVODB $2
   book setword SURVEY_ADDSTAR $1 MINIDVODB_GROUP $3
+  book setword SURVEY_ADDSTAR $1 STAGE $4  
   book setword SURVEY_ADDSTAR $1 STATE PENDING
 end
@@ -753 +754 @@
     book getword SURVEY_ADDSTAR $label DVODB -var dvodb
     book getword SURVEY_ADDSTAR $label MINIDVODB_GROUP -var minidvodb_group
+    book getword SURVEY_ADDSTAR $label STAGE -var stage
+    
   
  #   $run = addtool -definebyquery -destreaked -label $label -set_dvodb $dbodb
@@ -763 +766 @@
     end
     
-    $run = $run -definebyquery -destreaked -label $label -set_dvodb $dvodb -set_minidvodb_group $minidvodb_group -set_minidvodb -set_label $minidvodb_group
+    $run = $run -definebyquery -label $label -set_dvodb $dvodb -set_minidvodb_group $minidvodb_group -set_minidvodb -set_label $minidvodb_group -stage $stage
     # echo $run
+    if ($stage == 'cam') 
+        #only queue destreaked cams. stacks and staticsky don't need this
+        $run = $run -destreaked
+    end
+   
+
     command $run
   end