Changeset 20973 for trunk/ippTasks

Timestamp:

Dec 13, 2008, 10:17:34 AM (18 years ago)

Author:

bills

Message:

Rework the diff stage to process the skycells from an exposure in a single
diffRun

Location:

trunk/ippTasks

Files:

• diff.pro (modified) (3 diffs)
• simtest.auto (modified) (1 diff)

trunk/ippTasks/diff.pro

@@ -98 +98 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout diffSkyfile -key diff_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    ipptool2book stdout diffSkyfile -key diff_id:skycell_id -uniq -setword dbname $options:0 -setword pantaskState INIT
     if ($VERBOSE > 2)
       book listbook diffSkyfile
@@ -157 +157 @@
     stderr $LOGDIR/diff.skycell.log
 
-    $run = diff_skycell.pl --threads @MAX_THREADS@ --diff_id $DIFF_ID --diff_skyfile_id $DIFF_SKYFILE_ID --outroot $outroot --redirect-output
+    $run = diff_skycell.pl --threads @MAX_THREADS@ --diff_id $DIFF_ID --skycell_id $SKYCELL_ID --outroot $outroot --redirect-output
     add_standard_args run
 
@@ -215 +215 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout diffCleanup -key diff_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    ipptool2book stdout diffCleanup -key diff_id:skycell_id -uniq -setword dbname $options:0 -setword pantaskState INIT
     if ($VERBOSE > 2)
       book listbook diffCleanup

trunk/ippTasks/simtest.auto

@@ -70 +70 @@
 END
 
-#### Magic automation???
+### Magic automation???
 #automate METADATA
 #  name       STR MAGIC
-#  regular    STR "magictool -definebyquery -workdir file://@CWD@/magic -good_frac 0.2 -dbname @DBNAME@"
+#  regular    STR "magictool -definebyquery -workdir file://@CWD@/magic -dbname @DBNAME@"
 #END
-