Changeset 27517 for branches/eam_branches/20100225/ippTasks/destreak.pro

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ippTasks/destreak.pro (modified) (8 diffs)

branches/eam_branches/20100225/ippTasks/destreak.pro

@@ -127 +127 @@
 
   task.exec
-    $run = magicdstool -todestreak -limit 25 -stage $DS_STAGE:$magicDSStage
+    $run = magicdstool -todestreak -stage $DS_STAGE:$magicDSStage
     $magicDSStage ++
     if ($magicDSStage >= $DS_STAGE:n) set magicDSStage = 0
@@ -144 +144 @@
       end
     end
-    # add_poll_args run
+    add_poll_args run
     add_poll_labels run
     command $run
@@ -208 +208 @@
     book getword magicToDS $pageName path_base -var PATH_BASE
     book getword magicToDS $pageName cam_path_base -var CAM_PATH_BASE
+    book getword magicToDS $pageName cam_reduction -var CAM_REDUCTION
     book getword magicToDS $pageName outroot -var OUTROOT
     book getword magicToDS $pageName recoveryroot -var RECROOT
@@ -225 +226 @@
     # TODO: do not add recoveryroot or replace if they are null or zero
 
-    $run = magic_destreak.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --exp_id $EXP_ID --streaks $STREAKS --inv_streaks $INV_STREAKS --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --uri $URI --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --outroot $OUTROOT --logfile $logfile --recoveryroot $RECROOT --replace $REPLACE
+    $run = magic_destreak.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --exp_id $EXP_ID --streaks $STREAKS --inv_streaks $INV_STREAKS --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --uri $URI --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --cam_reduction $CAM_REDUCTION --outroot $OUTROOT --logfile $logfile --recoveryroot $RECROOT --replace $REPLACE
 
     add_standard_args run
@@ -401 +402 @@
     book getword magicDSToRevert $pageName path_base -var PATH_BASE
     book getword magicDSToRevert $pageName cam_path_base -var CAM_PATH_BASE
+    book getword magicDSToRevert $pageName cam_reduction -var CAM_REDUCTION
     book getword magicDSToRevert $pageName outroot -var OUTROOT
     book getword magciDSToRevert $pageName bytes -var BYTES
@@ -419 +421 @@
     end
 
-    $run = magic_destreak_revert.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --outroot $OUTROOT --logfile $logfile --replace $REPLACE --bothways $BOTHWAYS
+    $run = magic_destreak_revert.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --cam_reduction $CAM_REDUCTION --outroot $OUTROOT --logfile $logfile --replace $REPLACE --bothways $BOTHWAYS
 
     add_standard_args run
@@ -471 +473 @@
 
   task.exec
-    $run = magicdstool -limit 25 -completedrevert 
+    $run = magicdstool -completedrevert 
     if ($DB:n == 0)
       option DEFAULT
@@ -483 +485 @@
       if ($magicDSCompletedRevert_DB >= $DB:n) set magicDSCompletedRevert_DB = 0
     end
-    # add_poll_args run
+    add_poll_args run
     add_poll_labels run
     command $run