Changeset 30118 for branches/czw_branch/20101203/ippTasks

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ippTasks (modified) (1 prop)
• ippTasks/detrend.resid.pro (modified) (2 diffs)
• ippTasks/publish.pro (modified) (2 diffs)
• ippTasks/register.pro (modified) (2 diffs)

branches/czw_branch/20101203/ippTasks/detrend.resid.pro

@@ -136 +136 @@
 
   task.exec
+    periods -exec $RUNEXEC
+
     book npages detPendingResidImfile -var N
     if ($N == 0) break
@@ -187 +189 @@
       echo command $run
     end
+    periods -exec 0.05
     command $run
   end

branches/czw_branch/20101203/ippTasks/publish.pro

@@ -130 +130 @@
     book getword publishRun $pageName stage_id -var STAGE_ID
     book getword publishRun $pageName dbname -var DBNAME
+    book getword publishRun $pageName output_format -var OUTPUT_FORMAT
 
     stdout $LOGDIR/publish.run.log
@@ -137 +138 @@
     strsub $WORKDIR_TEMPLATE @HOST@ $default_host -var WORKDIR
 
-    $run = publish_file.pl --pub_id $PUB_ID --camera $CAMERA --workdir $WORKDIR --product $PRODUCT --stage $STAGE --stage_id $STAGE_ID --redirect-output
+    $run = publish_file.pl --pub_id $PUB_ID --camera $CAMERA --workdir $WORKDIR --product $PRODUCT --stage $STAGE --stage_id $STAGE_ID --output_format $OUTPUT_FORMAT --redirect-output
     add_standard_args run
 

branches/czw_branch/20101203/ippTasks/register.pro

@@ -466 +466 @@
     $today = `date -u +%Y-%m-%d`
 # debugging purposes
-    $today = "2010-12-06"
+#    $today = "2010-12-06"
     $run = $run -date $today -valid_burntool $valid_burntool_value
     if ($DB:n == 0)
@@ -478 +478 @@
     end
 
-    echo $run
+#    echo $run
     add_poll_args run
     command $run