Changeset 25051 for branches/czw_branch/cleanup/ippTasks/magic.pro

Timestamp:

Aug 11, 2009, 3:54:00 PM (17 years ago)

Author:

watersc1

Message:

Bringing branch up-to-date at revision 25049

Location:

branches/czw_branch/cleanup

Files:

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

branches/czw_branch/cleanup/ippTasks/magic.pro

@@ -104 +104 @@
     end
 end
+macro magic.ds.off
+    task magic.destreak.load
+        active false
+    end
+    task magic.destreak.run
+        active false
+    end
+end
+macro magic.ds.on
+    task magic.destreak.load
+        active true
+    end
+    task magic.destreak.run
+        active true
+    end
+end
+
+macro magic.ds.status
+    echo magicToDS
+    book listbook magicToDS
+    echo ""
+    echo magicDSToRevert
+    book listbook magicDSToRevert
+end
+
 
 
@@ -380 +405 @@
 
   periods      -poll $LOADPOLL
-  periods      -exec $LOADEXEC
-  periods      -timeout 20
+  # this query can take a long time
+  periods      -exec 10
+  periods      -timeout 120
   npending     1
 
@@ -388 +414 @@
 
   task.exec
-    $run = magicdstool -todestreak -limit 32
+    $run = magicdstool -todestreak -limit 120
     if ($DB:n == 0)
       option DEFAULT
@@ -449 +475 @@
     book getword magicToDS $pageName camera -var CAMERA
     book getword magicToDS $pageName streaks_uri -var STREAKS
+    book getword magicToDS $pageName inv_streaks_uri -var INV_STREAKS
     book getword magicToDS $pageName stage -var STAGE
     book getword magicToDS $pageName stage_id -var STAGE_ID
@@ -454 +481 @@
     book getword magicToDS $pageName uri -var URI
     book getword magicToDS $pageName path_base -var PATH_BASE
-    book getword magicToDS $pageName inverse -var INVERSE
     book getword magicToDS $pageName cam_path_base -var CAM_PATH_BASE
     book getword magicToDS $pageName outroot -var OUTROOT
@@ -473 +499 @@
     # 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 --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.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --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
 
     add_standard_args run