Index: trunk/ippTasks/pantasks.pro
===================================================================
--- trunk/ippTasks/pantasks.pro	(revision 11522)
+++ trunk/ippTasks/pantasks.pro	(revision 11536)
@@ -4,12 +4,6 @@
 $parallel = 1
 $VERBOSE = 1
-
-# $scripts = $HOME/src/pantasks/ipp/ippTasks
+$LOGDIR = `pwd`
 $scripts = .
-# $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
 
 $loadpoll = 1
@@ -29,122 +23,78 @@
 $DB:n = 0
 
+macro init.cluster.po
+  $parallel = 1
+  controller exit true
+
+  # po05 -- using for pantasks 
+  # po23 -- broken perl
+
+  controller host add po02
+  controller host add po03
+  controller host add po04
+# controller host add po05
+  controller host add po06
+  controller host add po07
+  controller host add po08
+  controller host add po09
+  controller host add po10
+  controller host add po11
+  controller host add po12
+  controller host add po13
+  controller host add po14
+  controller host add po15
+  controller host add po16
+  controller host add po17
+  controller host add po18
+  controller host add po19
+  controller host add po20
+  controller host add po21
+  controller host add po22
+  controller host add po23
+  controller host add po24
+end
+
+macro init.cluster.sn
+  $parallel = 1
+  controller exit true
+  controller host add sn2
+  controller host add sn3
+  controller host add sn4
+  controller host add sn5
+end
+
 macro init.isp
-  $LOGDIR = `ipp_datapath.pl path://ISP`
-  $LOGDIR = $LOGDIR/logs
-  exec mkdir -p $LOGDIR
-
   list DB -add isp
-
+end
+
+macro init.essence
+  list DB -add essence_v2
+end
+
+macro init.simtest.local
+  list DB -add simtest
+  $parallel = 0
+  controller exit true
+end
+
+macro init.simtest.default.db
+  $host = `hostname`
   if ($parallel) 
     controller exit true
-    controller host add po03
-    controller host add po04
-    controller host add po05
-    controller host add po06
-    controller host add po07
-    controller host add po08
-    controller host add po09
-    controller host add po10
-    controller host add po11
-    controller host add po12
-    controller host add po13
-    controller host add po14
-    controller host add po15
-    controller host add po16
-    controller host add po17
-    controller host add po18
-    controller host add po19
-    controller host add po20
-    controller host add po21
-    controller host add po22
-    controller host add po24
-
-    # controller host add po02 -- using for pantasks 
-    # controller host add po23 -- broken perl
-  end
-end
-
-macro init.simtest.local
-  $LOGDIR = `ipp_datapath.pl path://SIMTEST`
-  $LOGDIR = $LOGDIR/logs
-  exec mkdir -p $LOGDIR
-  $parallel = 0
-end
-
-macro init.simtest.defDB
-  $LOGDIR = `ipp_datapath.pl path://SIMTEST`
-  $LOGDIR = $LOGDIR/logs
-  exec mkdir -p $LOGDIR
-
+    controller host add $host
+  end
+end
+
+macro init.simtest
+  list DB -add simtest
+
+  $host = `hostname`
   if ($parallel) 
     controller exit true
-    controller host add alala
-  end
-end
-
-macro init.simtest
-  $LOGDIR = `ipp_datapath.pl path://SIMTEST`
-  $LOGDIR = $LOGDIR/logs
-  exec mkdir -p $LOGDIR
-
-  list DB -add simtest
-
-  if ($parallel) 
-    controller exit true
-    echo "add your local host with"
-    echo "controller host add (localhost)"
-  end
-end
-
-macro init.essence
-  $LOGDIR = `ipp_datapath.pl path://ESSENCE`
-  $LOGDIR = $LOGDIR/logs
-  exec mkdir -p $LOGDIR
-
-  list DB -add essence_v2
-
-  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
-
-  # list DB -add isp
-
-  if ($parallel) 
-    controller exit true
-    controller host add po02
-    controller host add po03
-    controller host add po04
-    controller host add po05
-    controller host add po06
-    controller host add po07
-    controller host add po08
-    controller host add po09
-    controller host add po10
+    controller host add $host
   end
 end
 
 # need the ability to activate or deactivate specific tasks...
-
-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
 
 macro detrend.on
@@ -175,7 +125,6 @@
 macro module.tasks
   module phase0.pro
-# input $scripts/phase2.pro
-# input $scripts/phase3.pro
-
+# module $scripts/phase2.pro
+# module $scripts/phase3.pro
   module detrend.process.pro
   module detrend.stack.pro