Changeset 18528 for branches/eam_branch_20080706/ippTasks/stack.pro

Timestamp:

Jul 14, 2008, 8:40:01 PM (18 years ago)

Author:

eugene

Message:

mods from HEAD

File:

• branches/eam_branch_20080706/ippTasks/stack.pro (modified) (3 diffs)

branches/eam_branch_20080706/ippTasks/stack.pro

@@ -115 +115 @@
     book setword stackSumSkyfile $pageName pantaskState RUN
     book getword stackSumSkyfile $pageName stack_id -var STACK_ID
-    book getword stackSumSkyfile $pageName tess_id -var TESS_ID
+    book getword stackSumSkyfile $pageName tess_id -var TESS_DIR
     book getword stackSumSkyfile $pageName skycell_id -var SKYCELL_ID
+    book getword stackSumSkyfile $pageName camera -var CAMERA
     book getword stackSumSkyfile $pageName workdir -var WORKDIR_TEMPLATE
     book getword stackSumSkyfile $pageName dbname -var DBNAME
@@ -126 +127 @@
     $WORKDIR = $WORKDIR_TEMPLATE
 
-    sprintf outroot "%s/tess_%s/%s/%s.%s.stk.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $STACK_ID
+    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
 
     ## generate output log based on filerule (convert the URI to a PATH) (use STACK_ID?)
@@ -132 +134 @@
     $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id NONE --basename $outroot`
     if ("$logfile" == "") 
-      echo "WARNING: logfile not defined in stack.pro:136"
+      echo "WARNING: logfile not defined in stack.pro:135"
       break
     end