Index: trunk/ippTasks/detrend.norm.pro
===================================================================
--- trunk/ippTasks/detrend.norm.pro	(revision 9455)
+++ trunk/ippTasks/detrend.norm.pro	(revision 9490)
@@ -24,5 +24,5 @@
 
   periods      -poll 1.0
-  periods      -exec 2.0
+  periods      -exec 3.0
   periods      -timeout 30
 
@@ -135,5 +135,5 @@
 
   periods      -poll 1.0
-  periods      -exec 2.0
+  periods      -exec 3.0
   periods      -timeout 30
 
@@ -253,5 +253,5 @@
 
   periods      -poll 1.0
-  periods      -exec 2.0
+  periods      -exec 3.0
   periods      -timeout 30
 
Index: trunk/ippTasks/detrend.process.pro
===================================================================
--- trunk/ippTasks/detrend.process.pro	(revision 9455)
+++ trunk/ippTasks/detrend.process.pro	(revision 9490)
@@ -30,5 +30,5 @@
 
   periods      -poll 1.0
-  periods      -exec 2.0
+  periods      -exec 3.0
   periods      -timeout 30
 
@@ -122,5 +122,4 @@
   # success
   task.exit 0
-    echo "success detrend_process_imfile.pl $options:0"
     queuepush DetrendProcessImfiles -replace -key 1:3:5 "DONE $options:0"
     # detrend_process_imfile.pl --force_exist --det_id $DET_ID --exp_tag $EXP_TAG --class $CLASS --class_id $CLASS_ID --det_type $DET_TYPE --input_uri $URI
@@ -148,5 +147,5 @@
 
   periods      -poll 1.0
-  periods      -exec 2.0
+  periods      -exec 3.0
   periods      -timeout 30
 
Index: trunk/ippTasks/detrend.reject.pro
===================================================================
--- trunk/ippTasks/detrend.reject.pro	(revision 9455)
+++ trunk/ippTasks/detrend.reject.pro	(revision 9490)
@@ -29,5 +29,5 @@
 
   periods      -poll 1.0
-  periods      -exec 2.0
+  periods      -exec 3.0
   periods      -timeout 30
 
Index: trunk/ippTasks/detrend.resid.pro
===================================================================
--- trunk/ippTasks/detrend.resid.pro	(revision 9455)
+++ trunk/ippTasks/detrend.resid.pro	(revision 9490)
@@ -31,5 +31,5 @@
 
   periods      -poll 1.0
-  periods      -exec 2.0
+  periods      -exec 3.0
   periods      -timeout 30
 
@@ -155,5 +155,5 @@
 
   periods      -poll 1.0
-  periods      -exec 2.0
+  periods      -exec 3.0
   periods      -timeout 30
 
@@ -244,4 +244,6 @@
       $drop = ("$INCLUDE" == "F")
     end
+    ### XXX no artificial rejections
+    $drop = 0
 
     # create example job options as a demonstration
Index: trunk/ippTasks/detrend.stack.pro
===================================================================
--- trunk/ippTasks/detrend.stack.pro	(revision 9455)
+++ trunk/ippTasks/detrend.stack.pro	(revision 9490)
@@ -31,5 +31,5 @@
 
   periods      -poll 1.0
-  periods      -exec 2.0
+  periods      -exec 3.0
   periods      -timeout 30
 
Index: trunk/ippTasks/pantasks.pro
===================================================================
--- trunk/ippTasks/pantasks.pro	(revision 9455)
+++ trunk/ippTasks/pantasks.pro	(revision 9490)
@@ -5,5 +5,5 @@
 $WORKDIR = `ipp_workdir.pl`
 
-macro init
+macro init.controller
   if ($parallel) 
     # controller host add alala
@@ -14,4 +14,44 @@
     controller host add po06
   end
+end
+
+# need the ability to activate or deactivate specific tasks...
+
+macro load.tasks
+  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
+end
+
+macro define.bias
+  exec dettool -definebyquery -det_type bias -exp_type bias -camera isp
+  run
+end
+
+macro define.dark
+  exec dettool -definebyquery -det_type dark -exp_type dark -camera isp
+  run
+end
+
+macro define.flat
+  exec dettool -definebyquery -det_type flat -exp_type flat -camera isp
+  run
+end
+
+macro define.all
+  ## perhaps not the best way to run this...
+  break
+  exec dettool -definebyquery -det_type bias -exp_type bias -camera isp
+  exec dettool -definebyquery -det_type dark -exp_type dark -camera isp
+  exec dettool -definebyquery -det_type flat -exp_type flat -camera isp
+  run
+end
+
+macro cleanup
   exec rm -f *.log
 
@@ -56,49 +96,2 @@
   exec rm -f ../object/*.p3.*.jpg
 end
-
-# need the ability to activate or deactivate specific tasks...
-
-macro objects
-  init
-  exec object.sh
-  input $scripts/phase0.pro
-  input $scripts/phase2.pro
-  input $scripts/phase3.pro
-  run
-end
-
-macro step1
-  init
-  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
-
-macro define.bias
-  exec dettool -definebyquery -det_type bias -exp_type bias -camera isp
-  run
-end
-
-macro define.dark
-  exec dettool -definebyquery -det_type dark -exp_type dark -camera isp
-  run
-end
-
-macro define.flat
-  exec dettool -definebyquery -det_type flat -exp_type flat -camera isp
-  run
-end
-
-macro define.all
-  exec dettool -definebyquery -det_type bias -exp_type bias -camera isp
-  exec dettool -definebyquery -det_type dark -exp_type dark -camera isp
-  exec dettool -definebyquery -det_type flat -exp_type flat -camera isp
-  run
-end