Index: trunk/ippTasks/phase2.pro
===================================================================
--- trunk/ippTasks/phase2.pro	(revision 11336)
+++ 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
