Changeset 28003 for branches/pap/ippTasks/destreak.pro

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

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

branches/pap/ippTasks/destreak.pro

@@ -37 +37 @@
     echo magicDSToRevert
     book listbook magicDSToRevert
+    echo magicDSToCleanup
+    book listbook magicDSToCleanup
 end
 
@@ -212 +214 @@
     book getword magicToDS $pageName recoveryroot -var RECROOT
     book getword magicToDS $pageName re_place -var REPLACE
+    book getword magicToDS $pageName magicked -var MAGICKED
     book getword magicToDS $pageName dbname -var DBNAME
 
@@ -226 +229 @@
     # 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 --cam_reduction $CAM_REDUCTION --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 --magicked $MAGICKED
 
     add_standard_args run
@@ -273 +276 @@
   #periods      -exec $LOADEXEC
   periods      -exec 30
-  periods      -timeout 20
+  periods      -timeout 60
   npending     1
 
@@ -412 +415 @@
     book getword magicDSToRevert $pageName re_place -var REPLACE
     book getword magicDSToRevert $pageName bothways -var BOTHWAYS
+    book getword magicDSToRevert $pageName magicked -var MAGICKED
     book getword magicDSToRevert $pageName dbname -var DBNAME
 
@@ -424 +428 @@
     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 --cam_reduction $CAM_REDUCTION --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 --magicked $MAGICKED
 
     add_standard_args run