Changeset 9428

Timestamp:

Oct 9, 2006, 2:48:23 PM (20 years ago)

Author:

eugene

Message:

faster tasks, cleanups

Location:

trunk/ippTasks

Files:

• detrend.norm.pro (modified) (3 diffs)
• detrend.process.pro (modified) (2 diffs)
• detrend.resid.pro (modified) (2 diffs)
• pantasks.pro (modified) (5 diffs)

trunk/ippTasks/detrend.norm.pro

@@ -68 +68 @@
 task           dettool.normstat.process
   periods      -poll 0.5
-  periods      -exec 5.0
+  periods      -exec 1.0
   periods      -timeout 30
 
@@ -182 +182 @@
 task           dettool.norm.process
   periods      -poll 0.5
-  periods      -exec 5.0
+  periods      -exec 1.0
   periods      -timeout 30
 
@@ -300 +300 @@
 task           dettool.normexp.process
   periods      -poll 0.5
-  periods      -exec 5.0
+  periods      -exec 1.0
   periods      -timeout 30
 

trunk/ippTasks/detrend.process.pro

@@ -75 +75 @@
 task           dettool.process.run
   periods      -poll 0.5
-  periods      -exec 2.0
+  periods      -exec 1.0
   periods      -timeout 60
 
@@ -190 +190 @@
 task           dettool.processexp.run
   periods      -poll 0.5
-  periods      -exec 2.0
+  periods      -exec 1.0
   periods      -timeout 60
 

trunk/ippTasks/detrend.resid.pro

@@ -80 +80 @@
 task           dettool.resid.run
   periods      -poll 0.5
-  periods      -exec 5.0
+  periods      -exec 1.0
   periods      -timeout 15
 
@@ -200 +200 @@
 task           dettool.residexp.run
   periods      -poll 0.5
-  periods      -exec 5.0
+  periods      -exec 1.0
   periods      -timeout 15
 

trunk/ippTasks/pantasks.pro

@@ -8 +8 @@
   if ($parallel) 
     # controller host add alala
+    controller exit true
     controller host add po03
     controller host add po04
@@ -14 +15 @@
   end
   exec rm -f *.log
-  exec rm -f *.stats
-  exec rm -f *.detproc.*.fits
-  exec rm -f *.detproc.*.jpg
-  exec rm -f *.detproc.*.list
-  exec rm -f *.detresid.*.fits
-  exec rm -f *.detresid.*.jpg
-  exec rm -f *.detresid.*.list
-  exec rm -f ISP.bias.*.fits
 
   exec rm -f ../bias/*.log
@@ -58 +51 @@
   exec rm -f ../flat/ISP.flat.*.jpg
   exec rm -f ../flat/ISP.flat.*.log
+
+  exec rm -f ../object/*.log
+  exec rm -f ../object/*.p2.*.fits
+  exec rm -f ../object/*.p3.*.jpg
 end
 
@@ -66 +63 @@
   exec upload.sh
   input $scripts/phase0.pro
+  # input $scripts/phase2.pro
+  # input $scripts/phase3.pro
+  input $scripts/detrend.process.pro
+  input $scripts/detrend.stack.pro
+  input $scripts/detrend.norm.pro
+  input $scripts/detrend.resid.pro
+  input $scripts/detrend.reject.pro
   run
 end
 
-# alala: dettool -tostack -simple
 macro define.bias
   exec dettool -definebyquery -det_type bias -exp_type bias -camera isp
@@ -91 +94 @@
   run
 end
-
-macro step2
-  input $scripts/detrend.process.pro
-  input $scripts/detrend.stack.pro
-  input $scripts/detrend.norm.pro
-  input $scripts/detrend.resid.pro
-  input $scripts/detrend.reject.pro
-  run
-end