Index: /trunk/ippTasks/detrend.norm.pro
===================================================================
--- /trunk/ippTasks/detrend.norm.pro	(revision 9427)
+++ /trunk/ippTasks/detrend.norm.pro	(revision 9428)
@@ -68,5 +68,5 @@
 task	       dettool.normstat.process
   periods      -poll 0.5
-  periods      -exec 5.0
+  periods      -exec 1.0
   periods      -timeout 30
 
@@ -182,5 +182,5 @@
 task	       dettool.norm.process
   periods      -poll 0.5
-  periods      -exec 5.0
+  periods      -exec 1.0
   periods      -timeout 30
 
@@ -300,5 +300,5 @@
 task	       dettool.normexp.process
   periods      -poll 0.5
-  periods      -exec 5.0
+  periods      -exec 1.0
   periods      -timeout 30
 
Index: /trunk/ippTasks/detrend.process.pro
===================================================================
--- /trunk/ippTasks/detrend.process.pro	(revision 9427)
+++ /trunk/ippTasks/detrend.process.pro	(revision 9428)
@@ -75,5 +75,5 @@
 task	       dettool.process.run
   periods      -poll 0.5
-  periods      -exec 2.0
+  periods      -exec 1.0
   periods      -timeout 60
 
@@ -190,5 +190,5 @@
 task	       dettool.processexp.run
   periods      -poll 0.5
-  periods      -exec 2.0
+  periods      -exec 1.0
   periods      -timeout 60
 
Index: /trunk/ippTasks/detrend.resid.pro
===================================================================
--- /trunk/ippTasks/detrend.resid.pro	(revision 9427)
+++ /trunk/ippTasks/detrend.resid.pro	(revision 9428)
@@ -80,5 +80,5 @@
 task	       dettool.resid.run
   periods      -poll 0.5
-  periods      -exec 5.0
+  periods      -exec 1.0
   periods      -timeout 15
 
@@ -200,5 +200,5 @@
 task	       dettool.residexp.run
   periods      -poll 0.5
-  periods      -exec 5.0
+  periods      -exec 1.0
   periods      -timeout 15
 
Index: /trunk/ippTasks/pantasks.pro
===================================================================
--- /trunk/ippTasks/pantasks.pro	(revision 9427)
+++ /trunk/ippTasks/pantasks.pro	(revision 9428)
@@ -8,4 +8,5 @@
   if ($parallel) 
     # controller host add alala
+    controller exit true
     controller host add po03
     controller host add po04
@@ -14,12 +15,4 @@
   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,4 +51,8 @@
   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,8 +63,14 @@
   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,11 +94,2 @@
   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