Index: trunk/ippTasks/pantasks.pro
===================================================================
--- trunk/ippTasks/pantasks.pro	(revision 9104)
+++ trunk/ippTasks/pantasks.pro	(revision 9338)
@@ -2,5 +2,6 @@
 $network = 1
 $parallel = 0
-$scripts = /home/kiawe/eugene/src/panstarrs/ipp.full/ippTasks
+$scripts = /home/kiawe/eugene/src/panstarrs/ipp/ippTasks
+$WORKDIR = `ipp_workdir.pl`
 
 macro init
@@ -11,10 +12,40 @@
   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 ISP.bias.*.fits
 
-  exec upload.sh
+  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 ../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 ../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
 end
 
@@ -23,4 +54,5 @@
 macro step1
   init
+  exec upload.sh
   input $scripts/phase0.pro
   run
@@ -28,31 +60,28 @@
 
 # alala: dettool -tostack -simple
-macro step2.bias
+macro define.bias
   exec dettool -definebyquery -det_type bias -exp_type bias -camera isp
-  input $scripts/detrend.process.pro
   run
 end
 
-macro step2.dark
+macro define.dark
   exec dettool -definebyquery -det_type dark -exp_type dark -camera isp
-  input $scripts/detrend.process.pro
   run
 end
 
-macro step2.flat
+macro define.flat
   exec dettool -definebyquery -det_type flat -exp_type flat -camera isp
-  input $scripts/detrend.process.pro
   run
 end
 
-macro step2.both
+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
-  input $scripts/detrend.process.pro
   run
 end
 
-macro step3
+macro step2
+  input $scripts/detrend.process.pro
   input $scripts/detrend.stack.pro
   input $scripts/detrend.norm.pro