Changeset 26567 for trunk/ippTasks

Timestamp:

Jan 12, 2010, 2:07:51 PM (17 years ago)

Author:

bills

Message:

Make update processing compatible with magic. Fix some bugs in update for the warp stage
Make script changes to implement update for diff stage.
Change value of 'magicked' in the various runs and files to contain the value
the magic_id of the magicRun that corresponds to the streaks file used for desreaking.

Location:

trunk/ippTasks

Files:

• chip.pro (modified) (1 diff)
• diff.pro (modified) (2 diffs)
• dist.cleanup.pro (modified) (2 diffs)
• warp.pro (modified) (1 diff)

trunk/ippTasks/chip.pro

@@ -138 +138 @@
     book getword chipPendingImfile $pageName state -var RUN_STATE
 
-    if ("$RAW_MAGICKED" == "T")
-        $MAGICKED_ARG = "--magicked"
+    if ($RAW_MAGICKED > 0)
+        $MAGICKED_ARG = "--magicked $RAW_MAGICKED"
     else 
         $MAGICKED_ARG = ""

trunk/ippTasks/diff.pro

@@ -155 +155 @@
     book getword diffSkyfile $pageName bothways -var BOTHWAYS
     book getword diffSkyfile $pageName workdir -var WORKDIR_TEMPLATE
+    book getword diffSkyfile $pageName state -var RUN_STATE
     book getword diffSkyfile $pageName dbname -var DBNAME
 
@@ -171 +172 @@
     stderr $LOGDIR/diff.skycell.log
 
-    $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
+    $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 --run-state $RUN_STATE
     if ("$BOTHWAYS" == "T")
        $run = $run --inverse

trunk/ippTasks/dist.cleanup.pro

@@ -48 +48 @@
 
   stdout NULL
-  stderr $LOGDIR/dist.cleanup.log
+  stderr $LOGDIR/dist.cleanup.load.log
 
   task.exec
     if ($LABEL:n == 0) break
-    $run = disttool -pendingcleanup
+    $run = disttool -pendingcleanup -all
     if ($DB:n == 0)
       option DEFAULT
@@ -98 +98 @@
   periods      -poll $RUNPOLL
   periods      -exec $RUNEXEC
-  periods      -timeout 60
+  periods      -timeout 600
   active       false
 

trunk/ippTasks/warp.pro

@@ -295 +295 @@
     book getword warpPendingSkyCell $pageName state -var RUN_STATE
     book getword warpPendingSkyCell $pageName magicked -var CHIP_MAGICKED
-    if ("$CHIP_MAGICKED" == "T")
-        $MAGICKED_ARG = "--magicked"
+    if ($CHIP_MAGICKED > 0)
+        $MAGICKED_ARG = "--magicked $CHIP_MAGICKED"
     else
         $MAGICKED_ARG = ""