Changeset 38582

Timestamp:

Jul 8, 2015, 1:54:31 PM (11 years ago)

Author:

heather

Message:

sas39 multimode works now

Location:

trunk/ippTasks

Files:

• addstar.pro (modified) (7 diffs)
• survey.pro (modified) (1 diff)

trunk/ippTasks/addstar.pro

@@ -39 +39 @@
     active true
     end
+end
+macro addstar.multi.on
   task addstar.multiexp.load
     active true
@@ -54 +56 @@
     active false
   end
+end
+macro addstar.multi.off
   task addstar.multiexp.load
     active false
@@ -328 +332 @@
   task.exec
     #if no stages defined we can't run
-    if ($MULTIADDSTAGES:n == 0) echo "what" 
+    if ($MULTIADDSTAGES:n == 0) echo "no stages for addstar.multi, use add.addstagesmulti" 
  #   if ($MULTIADDSTAGES:n == 0) break
     $run = addtool -pendingexp
     
     #option $ADDSTAGES:$addstar_stages_DB
-    $run = $run -stage $MULTIADDSTAGES:$addstar_multi_stages_DB -multimode  
+    $run = $run -stage $MULTIADDSTAGES:$addstar_multi_stages_DB -multiadd  
     option $DB:$addstar_multi_DB
     $run = $run -dbname $DB:$addstar_multi_DB
@@ -413 +417 @@
     book getword addPendingExp $pageName dbname -var DBNAME
 
+
     # specify choice of remote host based on camera and chip (class_id)
     # set.host.for.camera $CAMERA FPA
@@ -555 +560 @@
     book getword addPendingMultiExp $pageName image_only -var IMAGE_ONLY
     book getword addPendingMultiExp $pageName dbname -var DBNAME
+    book getword addPendingMultiExp $pageName label -var LABEL
 
     # specify choice of remote host based on camera and chip (class_id)
@@ -596 +602 @@
     stderr $LOGDIR/addstar.multiexp.log
 
-    $run = addstar_multi_run.pl --add_id $ADD_ID --camera $CAMERA --dvodb $DVODB --stage $STAGE --stageroot $STAGEROOT --outroot $outroot --redirect-output
+    $run = addstar_multi_run.pl --stage_id $STAGE_ID --label $LABEL --camera $CAMERA --dvodb $DVODB --stage $STAGE --stageroot $STAGEROOT --outroot $outroot --redirect-output
     if ("$REDUCTION" != "NULL")
       $run = $run --reduction $REDUCTION
@@ -609 +615 @@
       $run = $run --stage_id $STAGE_ID
     end
-   if ("$STAGE" == "diff")
-      $run = $run --stage_id $STAGE_ID --stage_extra1 $STAGE_EXTRA1
-    end
-   if ("$STAGE" == "fullforce")
-      $run = $run --stage_id $STAGE_ID --stage_extra1 $STAGE_EXTRA1
-    end
+   #if ("$STAGE" == "diff")
+   #   $run = $run --stage_id $STAGE_ID --stage_extra1 $STAGE_EXTRA1
+   # end
+   #if ("$STAGE" == "fullforce")
+   #   $run = $run --stage_id $STAGE_ID --stage_extra1 $STAGE_EXTRA1
+   # end
 
 

trunk/ippTasks/survey.pro

@@ -1021 +1021 @@
     end
     if ("$stage" == "diff")
-        $run = $run -uncensored)
+        $run = $run -uncensored
     end 
     # we need to handle isp/gpc1: gpc1 wants destreaked, isp wants uncensored.  Perhaps the best way is by default do destreaked (the most paranoid), and if db = isp (is this the best way?) then do uncensored