Changeset 17412

Timestamp:

Apr 8, 2008, 2:29:03 PM (18 years ago)

Author:

Paul Price

Message:

Haven't got hosts or workdirs set by camera. Had some missing variables.

Location:

trunk/ippTasks

Files:

• diff.pro (modified) (1 diff)
• stack.pro (modified) (1 diff)

trunk/ippTasks/diff.pro

@@ -115 +115 @@
     book setword diffSkyfile $pageName pantaskState RUN
     book getword diffSkyfile $pageName diff_id -var DIFF_ID
+    book getword diffSkyfile $pageName tess_id -var TESS_ID
+    book getword diffSkyfile $pageName skycell_id -var SKYCELL_ID
     book getword diffSkyfile $pageName workdir -var WORKDIR_TEMPLATE
     book getword diffSkyfile $pageName dbname -var DBNAME
 
     ### XXX Instead of setting these by camera, need to set by skycell_id
-    set.host.for.camera $CAMERA $DIFF_ID
-    set.workdir.by.camera $CAMERA $DIFF_ID $WORKDIR_TEMPLATE $default_host WORKDIR
+#    set.host.for.camera $CAMERA $DIFF_ID
+#    set.workdir.by.camera $CAMERA $DIFF_ID $WORKDIR_TEMPLATE $default_host WORKDIR
+    $WORKDIR = $WORKDIR_TEMPLATE
 
     sprintf outroot "%s/tess_%s/%s/%s.%s.dif.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $DIFF_ID

trunk/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 skycell_id -var SKYCELL_ID
     book getword stackSumSkyfile $pageName workdir -var WORKDIR_TEMPLATE
     book getword stackSumSkyfile $pageName dbname -var DBNAME
 
     ### XXX Instead of setting these by camera, need to set by skycell_id
-    set.host.for.camera $CAMERA $STACK_ID
-    set.workdir.by.camera $CAMERA $STACK_ID $WORKDIR_TEMPLATE $default_host WORKDIR
+#    set.host.for.camera $CAMERA $STACK_ID
+#    set.workdir.by.camera $CAMERA $STACK_ID $WORKDIR_TEMPLATE $default_host WORKDIR
+    $WORKDIR = $WORKDIR_TEMPLATE
 
     sprintf outroot "%s/tess_%s/%s/%s.%s.stk.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $STACK_ID