Index: /trunk/ippTasks/detrend.norm.pro
===================================================================
--- /trunk/ippTasks/detrend.norm.pro	(revision 11475)
+++ /trunk/ippTasks/detrend.norm.pro	(revision 11476)
@@ -34,4 +34,46 @@
   book listbook detPendingNormImfile
   book listbook detPendingNormExp
+end
+
+macro detnorm.on
+  task dettool.norm.load
+    active true
+  end
+  task dettool.norm.run
+    active true
+  end
+  task dettool.normexp.load
+    active true
+  end
+  task dettool.normexp.run
+    active true
+  end
+  task dettool.normstat.load
+    active true
+  end
+  task dettool.normstat.run
+    active true
+  end
+end
+
+macro detnorm.off
+  task dettool.norm.load
+    active false
+  end
+  task dettool.norm.run
+    active false
+  end
+  task dettool.normexp.load
+    active false
+  end
+  task dettool.normexp.run
+    active false
+  end
+  task dettool.normstat.load
+    active false
+  end
+  task dettool.normstat.run
+    active false
+  end
 end
 
@@ -93,5 +135,5 @@
 
 # copy new images, sending job to desired host
-task	       dettool.normstat.process
+task	       dettool.normstat.run
   periods      -poll $runpoll
   periods      -exec $runexec
@@ -206,5 +248,5 @@
 
 # copy new images, sending job to desired host
-task	       dettool.norm.process
+task	       dettool.norm.run
   periods      -poll $runpoll
   periods      -exec $runexec
@@ -321,5 +363,5 @@
 
 # copy new images, sending job to desired host
-task	       dettool.normexp.process
+task	       dettool.normexp.run
   periods      -poll $runpoll
   periods      -exec $runexec
Index: /trunk/ippTasks/detrend.process.pro
===================================================================
--- /trunk/ippTasks/detrend.process.pro	(revision 11475)
+++ /trunk/ippTasks/detrend.process.pro	(revision 11476)
@@ -34,4 +34,35 @@
   book listbook detPendingProcessedExp
 end
+
+macro detproc.on
+  task dettool.process.load
+    active true
+  end
+  task dettool.process.run
+    active true
+  end
+  task dettool.processexp.load
+    active true
+  end
+  task dettool.processexp.run
+    active true
+  end
+end
+
+macro detproc.off
+  task dettool.process.load
+    active false
+  end
+  task dettool.process.run
+    active false
+  end
+  task dettool.processexp.load
+    active false
+  end
+  task dettool.processexp.run
+    active false
+  end
+end
+
 
 # these variables will cycle through the known database names
Index: /trunk/ippTasks/detrend.reject.pro
===================================================================
--- /trunk/ippTasks/detrend.reject.pro	(revision 11475)
+++ /trunk/ippTasks/detrend.reject.pro	(revision 11476)
@@ -28,4 +28,22 @@
 macro detreject.status
   book listbook detRejectExp
+end
+
+macro detreject.on
+  task dettool.reject.load
+    active true
+  end
+  task dettool.reject.run
+    active true
+  end
+end
+
+macro detreject.off
+  task dettool.reject.load
+    active false
+  end
+  task dettool.reject.run
+    active false
+  end
 end
 
Index: /trunk/ippTasks/detrend.resid.pro
===================================================================
--- /trunk/ippTasks/detrend.resid.pro	(revision 11475)
+++ /trunk/ippTasks/detrend.resid.pro	(revision 11476)
@@ -31,4 +31,34 @@
   book listbook detPendingResidImfile
   book listbook detPendingResidExp
+end
+
+macro detresid.on
+  task dettool.resid.load
+    active true
+  end
+  task dettool.resid.run
+    active true
+  end
+  task dettool.residexp.load
+    active true
+  end
+  task dettool.residexp.run
+    active true
+  end
+end
+
+macro detresid.off
+  task dettool.resid.load
+    active false
+  end
+  task dettool.resid.run
+    active false
+  end
+  task dettool.residexp.load
+    active false
+  end
+  task dettool.residexp.run
+    active false
+  end
 end
 
Index: /trunk/ippTasks/detrend.stack.pro
===================================================================
--- /trunk/ippTasks/detrend.stack.pro	(revision 11475)
+++ /trunk/ippTasks/detrend.stack.pro	(revision 11476)
@@ -29,4 +29,22 @@
   echo detPendingStackedImfile
   book listbook detPendingStackedImfile
+end
+
+macro detstack.on
+  task dettool.stack.load
+    active true
+  end
+  task dettool.stack.run
+    active true
+  end
+end
+
+macro detstack.off
+  task dettool.stack.load
+    active false
+  end
+  task dettool.stack.run
+    active false
+  end
 end
 
Index: /trunk/ippTasks/pantasks.pro
===================================================================
--- /trunk/ippTasks/pantasks.pro	(revision 11475)
+++ /trunk/ippTasks/pantasks.pro	(revision 11476)
@@ -69,5 +69,5 @@
   if ($parallel) 
     controller exit true
-    controller host add alala
+    controller host add mithrandir
   end
 end
@@ -122,4 +122,20 @@
   input $scripts/detrend.resid.pro
   input $scripts/detrend.reject.pro
+end
+
+macro detrend.on
+  detproc.on
+  detstack.on
+  detnorm.on
+  detresid.on
+  detreject.on
+end
+
+macro detrend.off
+  detproc.off
+  detstack.off
+  detnorm.off
+  detresid.off
+  detreject.off
 end
 
Index: /trunk/ippTasks/phase0.pro
===================================================================
--- /trunk/ippTasks/phase0.pro	(revision 11475)
+++ /trunk/ippTasks/phase0.pro	(revision 11476)
@@ -31,4 +31,34 @@
   book listbook p0PendingImfile
   book listbook p0PendingExp
+end
+
+macro phase0.on
+  task phase0.imfile.load
+    active true
+  end
+  task phase0.imfile.run
+    active true
+  end
+  task phase0.exp.load
+    active true
+  end
+  task phase0.exp.run
+    active true
+  end
+end
+
+macro phase0.off
+  task phase0.imfile.load
+    active false
+  end
+  task phase0.imfile.run
+    active false
+  end
+  task phase0.exp.load
+    active false
+  end
+  task phase0.exp.run
+    active false
+  end
 end
 
Index: /trunk/ippTasks/phase2.pro
===================================================================
--- /trunk/ippTasks/phase2.pro	(revision 11475)
+++ /trunk/ippTasks/phase2.pro	(revision 11476)
@@ -24,4 +24,26 @@
 macro phase2.status
   book listbook p2PendingImfile
+end
+
+macro phase2.reset
+  book init p2PendingImfile
+end
+
+macro phase2.on
+  task phase2.imfile.load
+    active true
+  end
+  task phase2.imfile.run
+    active true
+  end
+end
+
+macro phase2.off
+  task phase2.imfile.load
+    active false
+  end
+  task phase2.imfile.run
+    active false
+  end
 end
 
@@ -114,6 +136,8 @@
 
     ## generate output log based on filerule
-    $outroot = $WORKDIR/$EXP_TAG
-    $logfile = `ipp_filename.pl PHASE2.LOG $outroot $CLASS_ID`
+    $outroot = `ipp_datapath.pl $WORKDIR`
+    $outroot = $outroot/$EXP_TAG
+    # $logfile = `ipp_filename.pl PHASE2.LOG $outroot $CLASS_ID`
+    $logfile = $outroot/$EXP_TAG.$CLASS_ID.p2.log
     stdout $logfile
     stderr $logfile
Index: /trunk/ippTasks/phase3.pro
===================================================================
--- /trunk/ippTasks/phase3.pro	(revision 11475)
+++ /trunk/ippTasks/phase3.pro	(revision 11476)
@@ -110,6 +110,8 @@
 
     # output log from filerule
-    $outroot = $WORKDIR/$EXP_TAG
-    $logfile = `ipp_filename.pl PHASE3.LOG $outroot $CLASS_ID`
+    $outroot = `ipp_datapath.pl $WORKDIR`
+    $outroot = $outroot/$EXP_TAG
+    # $logfile = `ipp_filename.pl PHASE3.LOG $outroot $CLASS_ID`
+    $logfile = $outroot/$EXP_TAG.$CLASS_ID.p3.log
     stdout $logfile
     stderr $logfile