Changeset 24174 for trunk/ippTasks

Timestamp:

May 13, 2009, 12:37:33 PM (17 years ago)

Author:

Paul Price

Message:

Merging branches/pap_magic@24173 into trunk. One conflict in dbconfig/changes.txt resolved easily.

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTasks/diff.pro (modified) (2 diffs)
• ippTasks/magic.pro (modified) (5 diffs)
• ippTasks/simtest.basic.auto (modified) (2 diffs)

trunk/ippTasks/diff.pro

@@ -146 +146 @@
     book getword diffSkyfile $pageName skycell_id -var SKYCELL_ID
     book getword diffSkyfile $pageName camera -var CAMERA
+    book getword diffSkyfile $pageName bothways -var BOTHWAYS
     book getword diffSkyfile $pageName workdir -var WORKDIR_TEMPLATE
     book getword diffSkyfile $pageName dbname -var DBNAME
@@ -164 +165 @@
 
     $run = diff_skycell.pl --threads @MAX_THREADS@ --diff_id $DIFF_ID --skycell_id $SKYCELL_ID --diff_skyfile_id $DIFF_SKYFILE_ID --outroot $outroot --redirect-output
+    if ($BOTHWAYS > 1)
+       $run = $run --inverse
+    end
     add_standard_args run
 

trunk/ippTasks/magic.pro

@@ -280 +280 @@
     book getword magicToProcess $pageName camera -var CAMERA
     book getword magicToProcess $pageName workdir -var WORKDIR_TEMPLATE
-    book getword magicToProcess $pageName template_uri -var TEMPLATE_URI
     book getword magicToProcess $pageName dbname -var DBNAME
 
@@ -302 +301 @@
     mkdir $outpath
 
-    $run = magic_process.pl --magic_id $MAGIC_ID --camera $CAMERA --node $NODE --outroot $outroot --template_uri $TEMPLATE_URI --logfile $logfile
+    $run = magic_process.pl --magic_id $MAGIC_ID --camera $CAMERA --node $NODE --outroot $outroot --logfile $logfile
     add_standard_args run
 
@@ -354 +353 @@
       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
@@ -410 +409 @@
     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
@@ -424 +424 @@
 
     $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 > 0)
+       # Inverse subtraction
+       $run = $run --inverse
+    end
 
     add_standard_args run

trunk/ippTasks/simtest.basic.auto

@@ -58 +58 @@
 END
 
-### Stack automation???
+### Stack automation
 automate METADATA
   name       STR STACK
@@ -64 +64 @@
 END
 
-### Diff automation???
+### Diff automation
 automate METADATA
   name       STR DIFF
-  regular    STR "difftool -definebyquery -label proc -workdir file://@CWD@/diff -good_frac 0.2 -dbname @DBNAME@"
+  regular    STR "difftool -definewarpstack -label proc -workdir file://@CWD@/diff -good_frac 0.2 -dbname @DBNAME@"
 END