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