Changeset 28003 for branches/pap/ippTasks/camera.pro

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippTasks/camera.pro (modified) (2 diffs)

branches/pap/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