Changeset 29561 for trunk/ippTasks

Timestamp:

Oct 26, 2010, 8:39:32 AM (16 years ago)

Author:

bills

Message:

Change the destreak cleanup to preserve the rows in the magicDSFile table

Location:

trunk/ippTasks

Files:

• destreak.cleanup.pro (modified) (2 diffs)
• destreak.pro (modified) (4 diffs)

trunk/ippTasks/destreak.cleanup.pro

@@ -50 +50 @@
   periods      -timeout 20
   npending     1
-  active       false
 
   stdout NULL
@@ -105 +104 @@
   periods      -exec $RUNEXEC
   periods      -timeout 60
-  active       false
 
   task.exec

trunk/ippTasks/destreak.pro

@@ -185 +185 @@
     book getword magicToDS $pageName exp_id -var EXP_ID
     book getword magicToDS $pageName magic_ds_id -var MAGIC_DS_ID
+    book getword magicToDS $pageName state -var RUN_STATE
     book getword magicToDS $pageName camera -var CAMERA
     book getword magicToDS $pageName streaks_uri -var STREAKS
@@ -215 +216 @@
     # 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_path_base $STREAKS_PATH_BASE --inv_streaks_path_base $INV_STREAKS_PATH_BASE --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
+    $run = magic_destreak.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --exp_id $EXP_ID --streaks_path_base $STREAKS_PATH_BASE --inv_streaks_path_base $INV_STREAKS_PATH_BASE --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 --run-state $RUN_STATE
 
     add_standard_args run
@@ -390 +391 @@
     book getword magicDSToRevert $pageName camera -var CAMERA
     book getword magicDSToRevert $pageName stage -var STAGE
+    book getword magicDSToRevert $pageName state -var RUN_STATE
     book getword magicDSToRevert $pageName stage_id -var STAGE_ID
     book getword magicDSToRevert $pageName component -var COMPONENT
@@ -414 +416 @@
     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 --magicked $MAGICKED
+    $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 --run-state $RUN_STATE
 
     add_standard_args run