Index: /trunk/ippTasks/pantasks.pro
===================================================================
--- /trunk/ippTasks/pantasks.pro	(revision 10759)
+++ /trunk/ippTasks/pantasks.pro	(revision 10760)
@@ -9,8 +9,7 @@
 # $LOGDIR = `ipp_datapath.pl path://ESSENCE`
 # $LOGDIR = `ipp_datapath.pl path://SIMTEST`
-$LOGDIR = `ipp_datapath.pl path://ISPTEST`
-
-$LOGDIR = $LOGDIR/logs
-exec mkdir -p $LOGDIR
+# $LOGDIR = `ipp_datapath.pl path://ISPTEST`
+# $LOGDIR = $LOGDIR/logs
+# exec mkdir -p $LOGDIR
 
 $loadpoll = 1
@@ -19,5 +18,23 @@
 $runexec = 1
 
-macro init.controller
+macro init.essence
+  $LOGDIR = `ipp_datapath.pl path://ESSENCE`
+  $LOGDIR = $LOGDIR/logs
+  exec mkdir -p $LOGDIR
+
+  if ($parallel) 
+    controller exit true
+    controller host add sn2
+    controller host add sn3
+    controller host add sn4
+    controller host add sn5
+  end
+end
+
+macro init.isptest
+  $LOGDIR = `ipp_datapath.pl path://ISPTEST`
+  $LOGDIR = $LOGDIR/logs
+  exec mkdir -p $LOGDIR
+
   if ($parallel) 
     controller exit true
@@ -31,6 +48,4 @@
     controller host add po09
     controller host add po10
-#    controller host add sn6
-# sn7 serves the disk
   end
 end
@@ -40,79 +55,12 @@
 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
+  input $scripts/phase2.pro
+# input $scripts/phase3.pro
 
-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
-
-  exec rm -f ../bias/*.log
-  exec rm -f ../bias/*.stats
-  exec rm -f ../bias/*.detproc.*.fits
-  exec rm -f ../bias/*.detproc.*.jpg
-  exec rm -f ../bias/*.detproc.*.list
-  exec rm -f ../bias/*.detresid.*.fits
-  exec rm -f ../bias/*.detresid.*.jpg
-  exec rm -f ../bias/*.detresid.*.list
-  exec rm -f ../bias/ISP.bias.*.fits
-  exec rm -f ../bias/ISP.bias.*.jpg
-  exec rm -f ../bias/ISP.bias.*.log
-
-  exec rm -f ../dark/*.log
-  exec rm -f ../dark/*.stats
-  exec rm -f ../dark/*.detproc.*.fits
-  exec rm -f ../dark/*.detproc.*.jpg
-  exec rm -f ../dark/*.detproc.*.list
-  exec rm -f ../dark/*.detresid.*.fits
-  exec rm -f ../dark/*.detresid.*.jpg
-  exec rm -f ../dark/*.detresid.*.list
-  exec rm -f ../dark/ISP.dark.*.fits
-  exec rm -f ../dark/ISP.dark.*.jpg
-  exec rm -f ../dark/ISP.dark.*.log
-
-  exec rm -f ../flat/*.log
-  exec rm -f ../flat/*.stats
-  exec rm -f ../flat/*.detproc.*.fits
-  exec rm -f ../flat/*.detproc.*.jpg
-  exec rm -f ../flat/*.detproc.*.list
-  exec rm -f ../flat/*.detresid.*.fits
-  exec rm -f ../flat/*.detresid.*.jpg
-  exec rm -f ../flat/*.detresid.*.list
-  exec rm -f ../flat/ISP.flat.*.fits
-  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
+  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