Changeset 24690

Timestamp:

Jul 6, 2009, 4:22:38 PM (17 years ago)

Author:

bills

Message:

progress on revert task. Not quite done yet for non-nebulous case

File:

• trunk/ippTasks/magic.pro (modified) (2 diffs)

trunk/ippTasks/magic.pro

@@ -23 +23 @@
 list STAGE -add "raw"
 list STAGE -add "chip"
-#list STAGE -add "camera"
+list STAGE -add "camera"
 list STAGE -add "warp"
 list STAGE -add "diff"
@@ -590 +590 @@
     book getword magicDSToRevert $pageName magic_ds_id -var MAGIC_DS_ID
     book getword magicDSToRevert $pageName camera -var CAMERA
-    book getword magicDSToRevert $pageName streaks_uri -var STREAKS
     book getword magicDSToRevert $pageName stage -var STAGE
     book getword magicDSToRevert $pageName stage_id -var STAGE_ID
     book getword magicDSToRevert $pageName component -var COMPONENT
-    book getword magicDSToRevert $pageName uri -var URI
     book getword magicDSToRevert $pageName path_base -var PATH_BASE
-    book getword magicDSToRevert $pageName inverse -var INVERSE
     book getword magicDSToRevert $pageName cam_path_base -var CAM_PATH_BASE
     book getword magicDSToRevert $pageName outroot -var OUTROOT
-    book getword magicDSToRevert $pageName recoveryroot -var RECROOT
+    book getword magciDSToRevert $pageName bytes -var BYTES
+    book getword magciDSToRevert $pageName md5sum -var md5sum
+#    book getword magicDSToRevert $pageName recoveryroot -var RECROOT
     book getword magicDSToRevert $pageName re_place -var REPLACE
     book getword magicDSToRevert $pageName dbname -var DBNAME
 
-    sprintf logfile "%s/%s.mds.%s.%s.%s.log" $OUTROOT $EXP_ID $MAGIC_DS_ID $STAGE_ID $COMPONENT
+    sprintf logfile "%s/%s.mds.revert.%s.%s.%s.log" $OUTROOT $EXP_ID $MAGIC_DS_ID $STAGE_ID $COMPONENT
 
     host anyhost
 
-    # TODO: do not add recoveryroot or replace if they are null or zero
-
-    $run = magic_destreak_revert.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --streaks $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
-    if ("$INVERSE" == "T")
-       # Inverse subtraction
-       $run = $run --inverse
-    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
 
     add_standard_args run