Changeset 27926 for trunk/ippTasks

Timestamp:

May 12, 2010, 10:23:55 AM (16 years ago)

Author:

bills

Message:

When updating an image use the original path base for consistency with the database

Location:

trunk/ippTasks

Files:

• chip.pro (modified) (2 diffs)
• warp.pro (modified) (2 diffs)

trunk/ippTasks/chip.pro

@@ -153 +153 @@
     book getword chipPendingImfile $pageName reduction -var REDUCTION
     book getword chipPendingImfile $pageName state -var RUN_STATE
+    book getword chipPendingImfile $pageName path_base -var PATH_BASE
 
     if ($RAW_MAGICKED > 0)
@@ -174 +175 @@
     # neb:///ipp004-vol0/gpc1/20080130
 
-    ## generate outroot specific to this exposure (& chip)
-    sprintf outroot "%s/%s/%s.ch.%s" $WORKDIR $EXP_TAG $EXP_TAG $CHIP_ID
+    if ("$PATH_BASE" == "NULL") 
+        ## generate outroot specific to this exposure (& chip)
+        sprintf outroot "%s/%s/%s.ch.%s" $WORKDIR $EXP_TAG $EXP_TAG $CHIP_ID
+    else
+        $outroot = $PATH_BASE
+    end
 
     stdout $LOGDIR/chip.imfile.log

trunk/ippTasks/warp.pro

@@ -314 +314 @@
     book getword warpPendingSkyCell $pageName camera -var CAMERA
     book getword warpPendingSkyCell $pageName workdir -var WORKDIR_TEMPLATE
+    book getword warpPendingSkyCell $pageName path-base -var PATH_BASE
     book getword warpPendingSkyCell $pageName dbname -var DBNAME
     # XXX change tess_id to tess_dir when schema is changed
@@ -331 +332 @@
     set.workdir.by.skycell $SKYCELL_ID $WORKDIR_TEMPLATE $default_host WORKDIR
 
-    ## generate outroot specific to this exposure
-    sprintf outroot "%s/%s/%s.wrp.%s.%s" $WORKDIR $EXP_TAG $EXP_TAG $WARP_ID $SKYCELL_ID
+    if ("$PATH_BASE" == "NULL") 
+        ## generate outroot specific to this exposure
+        sprintf outroot "%s/%s/%s.wrp.%s.%s" $WORKDIR $EXP_TAG $EXP_TAG $WARP_ID $SKYCELL_ID
+    else 
+        $outroot = $PATH_BASE
+    end
 
     stdout $LOGDIR/warp.skycell.log