Changeset 9506 for trunk/ippTasks/detrend.resid.pro

Timestamp:

Oct 12, 2006, 10:16:49 AM (20 years ago)

Author:

Paul Price

Message:

Making poll and exec delays globally configurable.

File:

• trunk/ippTasks/detrend.resid.pro (modified) (7 diffs)

trunk/ippTasks/detrend.resid.pro

@@ -30 +30 @@
   host         local
 
-  periods      -poll 1.0
-  periods      -exec 3.0
+  periods      -poll $loadpoll
+  periods      -exec $loadexec
   periods      -timeout 30
 
@@ -79 +79 @@
 # copy new images, sending job to desired host
 task           dettool.resid.run
-  periods      -poll 0.5
-  periods      -exec 1.0
+  periods      -poll $runpoll
+  periods      -exec $runexec
   periods      -timeout 30
 
@@ -154 +154 @@
   host         local
 
-  periods      -poll 1.0
-  periods      -exec 3.0
+  periods      -poll $loadpoll
+  periods      -exec $loadexec
   periods      -timeout 30
 
@@ -178 +178 @@
       $EXP_TAG  = $word:3
       $INCLUDE  = $word:4
-      queuepush DetrendResidExposures -uniq -key 1:2:4 "NEW $DET_ID $ITER $DET_TYPE $EXP_TAG $INCLUDE"
+      $CAMERA   = $word:5
+      queuepush DetrendResidExposures -uniq -key 1:2:4 "NEW $DET_ID $ITER $DET_TYPE $EXP_TAG $INCLUDE $CAMERA"
     end
 
@@ -199 +200 @@
 # copy new images, sending job to desired host
 task           dettool.residexp.run
-  periods      -poll 0.5
-  periods      -exec 1.0
+  periods      -poll $runpoll
+  periods      -exec $runexec
   periods      -timeout 30
 
@@ -226 +227 @@
     $EXP_TAG  = $word:3
     $INCLUDE  = $word:4
+    $CAMERA   = $word:5
 
     # XXX add $WORKDIR/$LOG_DIR
@@ -250 +252 @@
     options "$line"
     if ($drop) 
-      echo command detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITER --exp_tag $EXP_TAG --det_type $DET_TYPE --reject
-      command detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITER --exp_tag $EXP_TAG --det_type $DET_TYPE --reject
+      echo command detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITER --exp_tag $EXP_TAG --det_type $DET_TYPE --camera $CAMERA --reject
+      command detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITER --exp_tag $EXP_TAG --det_type $DET_TYPE --camera $CAMERA --reject
     else 
-      echo command detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITER --exp_tag $EXP_TAG --det_type $DET_TYPE
-      command detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITER --exp_tag $EXP_TAG --det_type $DET_TYPE
+      echo command detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITER --exp_tag $EXP_TAG --det_type $DET_TYPE --camera $CAMERA
+      command detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITER --exp_tag $EXP_TAG --det_type $DET_TYPE --camera $CAMERA
     end
   end