Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ippTasks/magic.pro

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

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

branches/cnb_branches/cnb_branch_20090301/ippTasks/magic.pro

@@ -98 +98 @@
     end
     add_poll_args run
+    add_poll_labels run
     command $run
   end
@@ -157 +158 @@
     $WORKDIR = $WORKDIR_TEMPLATE
 
-    basename $TESS_DIR -var TESS_ID
-
-    $TESS_ID = "FIXNS"
-
     sprintf outroot "%s/%s/%s.mgc.%s" $WORKDIR $EXP_ID $EXP_ID $MAGIC_ID
 
@@ -228 +225 @@
     end
     add_poll_args run
+    add_poll_labels run
     command $run
   end
@@ -333 +331 @@
 
   periods      -poll $LOADPOLL
-  periods      -exec 30
+  periods      -exec $LOADEXEC
   periods      -timeout 20
   npending     1
@@ -351 +349 @@
       if ($magicToDS_DB >= $DB:n) set magicToDS_DB = 0
     end
-#    XXX magicDSRun doesn't have label so can't use add_poll_args
-#    add_poll_args run
+    add_poll_args run
+    add_poll_labels run
     command $run
   end
@@ -407 +405 @@
     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
@@ -421 +420 @@
 
     $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 --remove $REMOVE 
+    if ("$INVERSE" == "T")
+       # Inverse subtraction
+       $run = $run --inverse
+    end
 
     add_standard_args run