Changeset 31297 for branches/haf_branches/haf_add2011/ippTasks/addstar.pro

Timestamp:

Apr 15, 2011, 12:17:51 PM (15 years ago)

Author:

heather

Message:

small modifications (with testing) to get staticsky stage working in add*

File:

• branches/haf_branches/haf_add2011/ippTasks/addstar.pro (modified) (2 diffs)

branches/haf_branches/haf_add2011/ippTasks/addstar.pro

@@ -252 +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
@@ -277 +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 --stage $STAGE --stageroot $STAGEROOT --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