Index: trunk/ippTasks/detrend.norm.pro
===================================================================
--- trunk/ippTasks/detrend.norm.pro	(revision 11338)
+++ trunk/ippTasks/detrend.norm.pro	(revision 11346)
@@ -119,6 +119,9 @@
     # XXX add $WORKDIR/$LOG_DIR
     # XXX use ipp_filename.pl to lookup output file names
-    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
-    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
+    $outroot = `ipp_datapath.pl $WORKDIR`
+    $logfile = $outroot/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
+    stdout $logfile
+    stderr $logfile
+    exec mkdir -p $outroot
 
     # save the pageName for future reference below
@@ -230,6 +233,9 @@
 
     # XXX use ipp_filename.pl to lookup output file names
-    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
-    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
+    $outroot = `ipp_datapath.pl $WORKDIR`
+    $logfile = $outroot/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
+    stdout $logfile
+    stderr $logfile
+    exec mkdir -p $outroot
 
     # save the pageName for future reference below
@@ -338,6 +344,9 @@
 
     # XXX add $WORKDIR/$LOG_DIR
-    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
-    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
+    $outroot = `ipp_datapath.pl $WORKDIR`
+    $logfile = $outroot/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
+    stdout $logfile
+    stderr $logfile
+    exec mkdir -p $outroot
 
     # save the pageName for future reference below
Index: trunk/ippTasks/detrend.process.pro
===================================================================
--- trunk/ippTasks/detrend.process.pro	(revision 11338)
+++ trunk/ippTasks/detrend.process.pro	(revision 11346)
@@ -118,9 +118,10 @@
 
     ## generate output log based on filerule
-    $outroot = $WORKDIR/$EXP_TAG
-    $logfile = `ipp_filename.pl DETPROC.LOG $outroot $CLASS_ID`
+    $outroot = `ipp_datapath.pl $WORKDIR`
+    $outroot = $outroot/$EXP_TAG
+    $logfile = $outroot/$EXP_TAG.$CLASS_ID.detproc.$DET_ID.log
     stdout $logfile
     stderr $logfile
-    exec mkdir -p $WORKDIR
+    exec mkdir -p $outroot
 
     # save the pageName for future reference below
@@ -230,6 +231,7 @@
 
     # XXX push this into the filerules?
-    $outroot = $WORKDIR/$EXP_TAG
-    $logfile = $outroot/$EXP_TAG.detproc.$DET_ID.log
+    $outroot = `ipp_datapath.pl $WORKDIR`
+    $outroot = $outroot/$EXP_TAG
+    $logfile = $outroot/$EXP_TAG.detproc.$DET_ID.$ITERATION.log
     stdout $logfile
     stderr $logfile
Index: trunk/ippTasks/detrend.reject.pro
===================================================================
--- trunk/ippTasks/detrend.reject.pro	(revision 11338)
+++ trunk/ippTasks/detrend.reject.pro	(revision 11346)
@@ -113,6 +113,9 @@
 
     # I'd like to add CAMERA to the log file...
-    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
-    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
+    $outroot = `ipp_datapath.pl $WORKDIR`
+    $logfile = $outroot/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
+    stdout $logfile
+    stderr $logfile
+    exec mkdir -p $outroot
 
     # save the pageName for future reference below
Index: trunk/ippTasks/detrend.resid.pro
===================================================================
--- trunk/ippTasks/detrend.resid.pro	(revision 11338)
+++ trunk/ippTasks/detrend.resid.pro	(revision 11346)
@@ -120,10 +120,10 @@
 
     # XXX use ipp_filename.pl to lookup output file names
-    $word = `basename $EXP_TAG | tr '.' ' '`
-    list word -split $word
-    $base = $word:0
-    stdout $LOGSUBDIR/$base/$EXP_TAG.detresid.$DET_ID.$ITERATION.$CLASS_ID.log
-    stderr $LOGSUBDIR/$base/$EXP_TAG.detresid.$DET_ID.$ITERATION.$CLASS_ID.log
-    exec mkdir -p $LOGSUBDIR/$base
+    $outroot = `ipp_datapath.pl $WORKDIR`
+    $outroot = $outroot/$EXP_TAG
+    $logfile = $outroot/$EXP_TAG.$CLASS_ID.detresid.$DET_ID.$ITERATION.log
+    stdout $logfile
+    stderr $logfile
+    exec mkdir -p $outroot
 
     # save the pageName for future reference below
@@ -235,10 +235,10 @@
 
     # XXX use ipp_filename.pl to lookup output file names
-    $word = `basename $EXP_TAG | tr '.' ' '`
-    list word -split $word
-    $base = $word:0
-    stdout $LOGSUBDIR/$base/$EXP_TAG.detresid.$DET_ID.$ITERATION.log
-    stderr $LOGSUBDIR/$base/$EXP_TAG.detresid.$DET_ID.$ITERATION.log
-    exec mkdir -p $LOGSUBDIR/$base
+    $outroot = `ipp_datapath.pl $WORKDIR`
+    $outroot = $outroot/$EXP_TAG
+    $logfile = $outroot/$EXP_TAG.detresid.$DET_ID.$ITERATION.log
+    stdout $logfile
+    stderr $logfile
+    exec mkdir -p $outroot
 
     # save the pageName for future reference below
Index: trunk/ippTasks/detrend.stack.pro
===================================================================
--- trunk/ippTasks/detrend.stack.pro	(revision 11338)
+++ trunk/ippTasks/detrend.stack.pro	(revision 11346)
@@ -114,6 +114,10 @@
     # XXX add $WORKDIR/$LOG_DIR
     # XXX use ipp_filename.pl to lookup output file names
-    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.$CLASS_ID.log
-    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.$CLASS_ID.log
+    $outroot = `ipp_datapath.pl $WORKDIR`
+    $outroot = $outroot/$EXP_TAG
+    $logfile = $outroot/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.$CLASS_ID.log
+    stdout $logfile
+    stderr $logfile
+    exec mkdir -p $outroot
 
     # save the pageName for future reference below
Index: trunk/ippTasks/pantasks.pro
===================================================================
--- trunk/ippTasks/pantasks.pro	(revision 11338)
+++ trunk/ippTasks/pantasks.pro	(revision 11346)
@@ -102,4 +102,16 @@
   input $scripts/detrend.resid.pro
   input $scripts/detrend.reject.pro
+end
+
+macro module.tasks
+  module phase0.pro
+# input $scripts/phase2.pro
+# input $scripts/phase3.pro
+
+  module detrend.process.pro
+  module detrend.stack.pro
+  module detrend.norm.pro
+  module detrend.resid.pro
+  module detrend.reject.pro
 end
 
Index: trunk/ippTasks/phase0.pro
===================================================================
--- trunk/ippTasks/phase0.pro	(revision 11338)
+++ trunk/ippTasks/phase0.pro	(revision 11346)
@@ -119,9 +119,11 @@
 
     ## generate output log based on filerule XXX put this in a function?
-    $outroot = $WORKDIR/$EXP_TAG
-    $logfile = `ipp_filename.pl PHASE0.LOG $outroot $CLASS_ID`
+    $outroot = `ipp_datapath.pl $WORKDIR`
+    $outroot = $outroot/$EXP_TAG
+    # $logfile = `ipp_filename.pl PHASE0.LOG $outroot $CLASS_ID`
+    $logfile = $outroot/$EXP_TAG.$CLASS_ID.p0.log
     stdout $logfile
     stderr $logfile
-    exec mkdir -p $WORKDIR
+    exec mkdir -p $outroot
 
     # save the pageName for future reference below
@@ -224,9 +226,10 @@
 
     ## generate output log based on filerule
-    $outroot = $WORKDIR/$EXP_TAG
-    $logfile = `ipp_filename.pl PHASE0.LOG $outroot FPA`
+    $outroot = `ipp_datapath.pl $WORKDIR`
+    $outroot = $outroot/$EXP_TAG
+    $logfile = $outroot/$EXP_TAG.p0.log
     stdout $logfile
     stderr $logfile
-    exec mkdir -p $WORKDIR
+    exec mkdir -p $outroot
 
     # save the pageName for future reference below