Changeset 27929

Timestamp:

May 12, 2010, 10:59:33 AM (16 years ago)

Author:

bills

Message:

When updating use the original path_base

Location:

trunk

Files:

• ippTasks/camera.pro (modified) (2 diffs)
• ippTasks/stack.pro (modified) (2 diffs)
• ippTools/share/camtool_find_pendingexp.sql (modified) (1 diff)
• ippTools/share/stacktool_tosum.sql (modified) (1 diff)

trunk/ippTasks/camera.pro

@@ -154 +154 @@
     book getword camPendingExp $pageName cam_id -var CAM_ID
     book getword camPendingExp $pageName workdir -var WORKDIR_TEMPLATE
+    book getword camPendingExp $pageName path_base -var PATH_BASE
     book getword camPendingExp $pageName dvodb  -var DVODB
     book getword camPendingExp $pageName dbname -var DBNAME
@@ -173 +174 @@
     # neb:///ipp004-vol0/gpc1/20080130
 
-    ## generate outroot specific to this exposure (& chip)
-    sprintf outroot "%s/%s/%s.cm.%s" $WORKDIR $EXP_TAG $EXP_TAG $CAM_ID
+    if ("$PATH_BASE" == "NULL") 
+        ## generate outroot specific to this exposure (& chip)
+        sprintf outroot "%s/%s/%s.cm.%s" $WORKDIR $EXP_TAG $EXP_TAG $CAM_ID
+    else
+        $outroot = $PATH_BASE
+    end
 
     stdout $LOGDIR/camera.exp.log

trunk/ippTasks/stack.pro

@@ -172 +172 @@
     book getword stackSumSkyfile $pageName skycell_id -var SKYCELL_ID
     book getword stackSumSkyfile $pageName workdir -var WORKDIR_TEMPLATE
+    book getword stackSumSkyfile $pageName path_base -var PATH_BASE
     book getword stackSumSkyfile $pageName reduction -var REDUCTION
     book getword stackSumSkyfile $pageName dbname -var DBNAME
@@ -185 +186 @@
 
     basename $TESS_DIR -var TESS_ID
-    sprintf outroot "%s/%s/%s/%s.%s.stk.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $STACK_ID
+    if ("$PATH_BASE" == "NULL")
+        sprintf outroot "%s/%s/%s/%s.%s.stk.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $STACK_ID
+    else
+        $outroot = $PATH_BASE
+    end
 
     stdout $LOGDIR/stack.skycell.log

trunk/ippTools/share/camtool_find_pendingexp.sql

@@ -10 +10 @@
     rawExp.telescope,
     rawExp.filelevel,
-    chipRun.magicked AS chip_magicked
+    chipRun.magicked AS chip_magicked,
+    camProcessedExp.path_base
 FROM camRun
 JOIN chipRun

trunk/ippTools/share/stacktool_tosum.sql

@@ -6 +6 @@
     stackRun.reduction,
     stackRun.label,
-    stackRun.state
+    stackRun.state,
+    stackSumSkyfile.path_base
 FROM stackRun
 JOIN stackInputSkyfile USING(stack_id)