Index: /branches/eam_branch_00/ippTasks/detrend.norm.pro
===================================================================
--- /branches/eam_branch_00/ippTasks/detrend.norm.pro	(revision 11018)
+++ /branches/eam_branch_00/ippTasks/detrend.norm.pro	(revision 11019)
@@ -49,5 +49,5 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout DetrendNormStat -key det_id:iter -uniq
+    ipptool2book stdout DetrendNormStat -key det_id:iteration -uniq
     if ($VERBOSE > 2)
       book listbook DetrendNormStat
@@ -85,8 +85,8 @@
 
     book setword DetrendNormStat $pageName state RUN
-    book getword DetrendNormStat $pageName DET_ID   -var DET_ID
-    book getword DetrendNormStat $pageName DET_TYPE -var DET_TYPE
-    book getword DetrendNormStat $pageName ITER     -var ITER
-    book getword DetrendNormStat $pageName CAMERA   -var CAMERA  
+    book getword DetrendNormStat $pageName det_id    -var DET_ID
+    book getword DetrendNormStat $pageName det_type  -var DET_TYPE
+    book getword DetrendNormStat $pageName iteration -var ITERATION
+    book getword DetrendNormStat $pageName camera    -var CAMERA  
 
     # specify choice of remote host:
@@ -98,6 +98,6 @@
 
     # XXX add $WORKDIR/$LOG_DIR
-    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITER.log
-    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITER.log
+    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
+    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATIION.log
 
     # save the pageName for future reference below
@@ -106,7 +106,7 @@
     # create example job options as a demonstration
     if ($VERBOSE > 1)
-      echo command detrend_norm_calc.pl --det_id $DET_ID --iteration $ITER --det_type $DET_TYPE
-    end
-    command detrend_norm_calc.pl --det_id $DET_ID --iteration $ITER --det_type $DET_TYPE
+      echo command detrend_norm_calc.pl --det_id $DET_ID --iteration $ITERATION --det_type $DET_TYPE
+    end
+    command detrend_norm_calc.pl --det_id $DET_ID --iteration $ITERATION --det_type $DET_TYPE
   end
 
@@ -149,5 +149,5 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout DetrendNorm -key det_id:iter -uniq
+    ipptool2book stdout DetrendNorm -key det_id:iteration -uniq
     if ($VERBOSE > 2)
       book listbook DetrendNorm
@@ -185,11 +185,11 @@
 
     book setword DetrendNorm $pageName state RUN
-    book getword DetrendNorm $pageName det_type -var DET_TYPE 
-    book getword DetrendNorm $pageName camera   -var CAMERA   
-    book getword DetrendNorm $pageName uri      -var URI      
-    book getword DetrendNorm $pageName det_id   -var DET_ID   
-    book getword DetrendNorm $pageName iter     -var ITER     
-    book getword DetrendNorm $pageName class_id -var CLASS_ID 
-    book getword DetrendNorm $pageName norm     -var NORM     
+    book getword DetrendNorm $pageName det_type  -var DET_TYPE 
+    book getword DetrendNorm $pageName camera    -var CAMERA   
+    book getword DetrendNorm $pageName uri       -var URI      
+    book getword DetrendNorm $pageName det_id    -var DET_ID   
+    book getword DetrendNorm $pageName iteration -var ITERATION     
+    book getword DetrendNorm $pageName class_id  -var CLASS_ID 
+    book getword DetrendNorm $pageName norm      -var NORM     
 
     # specify choice of remote host:
@@ -200,6 +200,6 @@
     end
 
-    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITER.log
-    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITER.log
+    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
+    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
 
     # save the pageName for future reference below
@@ -208,7 +208,7 @@
     # create example job options as a demonstration
     if ($VERBOSE > 1)
-      echo command detrend_norm_apply.pl --det_id $DET_ID --iteration $ITER --class_id $CLASS_ID --value $NORM --input_uri $URI --camera $CAMERA --det_type $DET_TYPE
-    end
-    command detrend_norm_apply.pl --det_id $DET_ID --iteration $ITER --class_id $CLASS_ID --value $NORM --input_uri $URI --camera $CAMERA --det_type $DET_TYPE
+      echo command detrend_norm_apply.pl --det_id $DET_ID --iteration $ITERATION --class_id $CLASS_ID --value $NORM --input_uri $URI --camera $CAMERA --det_type $DET_TYPE
+    end
+    command detrend_norm_apply.pl --det_id $DET_ID --iteration $ITERATION --class_id $CLASS_ID --value $NORM --input_uri $URI --camera $CAMERA --det_type $DET_TYPE
   end
 
@@ -251,5 +251,5 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout DetrendNormExp -key det_id:iter -uniq
+    ipptool2book stdout DetrendNormExp -key det_id:iteration -uniq
     if ($VERBOSE > 2)
       book listbook DetrendNormExp
@@ -287,8 +287,8 @@
 
     book setword DetrendNormExp $pageName state RUN
-    book getword DetrendNormExp $pageName det_id   -var DET_ID  
-    book getword DetrendNormExp $pageName iter     -var ITER    
-    book getword DetrendNormExp $pageName det_type -var DET_TYPE
-    book getword DetrendNormExp $pageName camera   -var CAMERA  
+    book getword DetrendNormExp $pageName det_id    -var DET_ID  
+    book getword DetrendNormExp $pageName iteration -var ITERATION    
+    book getword DetrendNormExp $pageName det_type  -var DET_TYPE
+    book getword DetrendNormExp $pageName camera    -var CAMERA  
 
     # specify choice of remote host:
@@ -300,6 +300,6 @@
 
     # XXX add $WORKDIR/$LOG_DIR
-    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITER.log
-    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITER.log
+    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
+    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
 
     # save the pageName for future reference below
@@ -308,7 +308,7 @@
     # create example job options as a demonstration
     if ($VERBOSE > 1)
-      echo command detrend_norm_exp.pl --det_id $DET_ID --iteration $ITER --camera $CAMERA --det_type $DET_TYPE
-    end
-    command detrend_norm_exp.pl --det_id $DET_ID --iteration $ITER --camera $CAMERA --det_type $DET_TYPE
+      echo command detrend_norm_exp.pl --det_id $DET_ID --iteration $ITERATION --camera $CAMERA --det_type $DET_TYPE
+    end
+    command detrend_norm_exp.pl --det_id $DET_ID --iteration $ITERATION --camera $CAMERA --det_type $DET_TYPE
   end
 
Index: /branches/eam_branch_00/ippTasks/detrend.process.pro
===================================================================
--- /branches/eam_branch_00/ippTasks/detrend.process.pro	(revision 11018)
+++ /branches/eam_branch_00/ippTasks/detrend.process.pro	(revision 11019)
@@ -110,5 +110,8 @@
 
     # create example job options as a demonstration
-    setcommand detrend_process_imfile.pl --det_id $DET_ID --det_type $DET_TYPE --exp_tag $EXP_TAG --class $CLASS --class_id $CLASS_ID --input_uri $URI --camera $CAMERA
+    if ($VERBOSE > 1)
+      echo command detrend_process_imfile.pl --det_id $DET_ID --det_type $DET_TYPE --exp_tag $EXP_TAG --class $CLASS --class_id $CLASS_ID --input_uri $URI --camera $CAMERA
+    end
+    command detrend_process_imfile.pl --det_id $DET_ID --det_type $DET_TYPE --exp_tag $EXP_TAG --class $CLASS --class_id $CLASS_ID --input_uri $URI --camera $CAMERA
   end
 
@@ -151,5 +154,5 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout DetrendProcessExposures -key det_id:iter:exp_tag -uniq
+    ipptool2book stdout DetrendProcessExposures -key det_id:iteration:exp_tag -uniq
     if ($VERBOSE > 2)
       book listbook DetrendProcessExposures
@@ -187,9 +190,9 @@
 
     book setword DetrendProcessExposures $pageName state RUN
-    book getword DetrendProcessExposures $pageName det_id   -var DET_ID
-    book getword DetrendProcessExposures $pageName iter	    -var ITER
-    book getword DetrendProcessExposures $pageName det_type -var DET_TYPE
-    book getword DetrendProcessExposures $pageName exp_tag  -var EXP_TAG
-    book getword DetrendProcessExposures $pageName camera   -var CAMERA  
+    book getword DetrendProcessExposures $pageName det_id    -var DET_ID
+    book getword DetrendProcessExposures $pageName iteration -var ITERATION
+    book getword DetrendProcessExposures $pageName det_type  -var DET_TYPE
+    book getword DetrendProcessExposures $pageName exp_tag   -var EXP_TAG
+    book getword DetrendProcessExposures $pageName camera    -var CAMERA  
 
     # specify choice of remote host:
Index: /branches/eam_branch_00/ippTasks/detrend.reject.pro
===================================================================
--- /branches/eam_branch_00/ippTasks/detrend.reject.pro	(revision 11018)
+++ /branches/eam_branch_00/ippTasks/detrend.reject.pro	(revision 11019)
@@ -45,5 +45,5 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout DetrendRejectExp -key det_id:iter -uniq
+    ipptool2book stdout DetrendRejectExp -key det_id:iteration -uniq
     if ($VERBOSE > 2)
       book listbook DetrendRejectExp
@@ -81,9 +81,9 @@
 
     book setword DetrendRejectExp $pageName state RUN
-    book getword DetrendRejectExp $pageName DET_ID   -var DET_ID   
-    book getword DetrendRejectExp $pageName ITER     -var ITER     
-    book getword DetrendRejectExp $pageName DET_TYPE -var DET_TYPE 
-    book getword DetrendRejectExp $pageName MODE     -var MODE     
-    book getword DetrendRejectExp $pageName CAMERA   -var CAMERA   
+    book getword DetrendRejectExp $pageName det_id    -var DET_ID   
+    book getword DetrendRejectExp $pageName iteration -var ITERATION     
+    book getword DetrendRejectExp $pageName det_type  -var DET_TYPE 
+    book getword DetrendRejectExp $pageName mode      -var MODE     
+    book getword DetrendRejectExp $pageName camera    -var CAMERA   
 
     # specify choice of remote host:
@@ -95,6 +95,6 @@
 
     # I'd like to add CAMERA to the log file...
-    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITER.log
-    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITER.log
+    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
+    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
 
     # save the pageName for future reference below
@@ -103,7 +103,7 @@
     # create example job options as a demonstration
     if ($VERBOSE > 1)
-      echo command detrend_reject_exp.pl --det_id $DET_ID --iteration $ITER --det_type $DET_TYPE --camera $CAMERA
+      echo command detrend_reject_exp.pl --det_id $DET_ID --iteration $ITERATION --det_type $DET_TYPE --camera $CAMERA
     end
-    command detrend_reject_exp.pl --det_id $DET_ID --iteration $ITER --det_type $DET_TYPE --camera $CAMERA
+    command detrend_reject_exp.pl --det_id $DET_ID --iteration $ITERATION --det_type $DET_TYPE --camera $CAMERA
  end
 
Index: /branches/eam_branch_00/ippTasks/detrend.resid.pro
===================================================================
--- /branches/eam_branch_00/ippTasks/detrend.resid.pro	(revision 11018)
+++ /branches/eam_branch_00/ippTasks/detrend.resid.pro	(revision 11019)
@@ -47,5 +47,5 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout DetrendResidImfiles -key det_id:iter:exp_tag:class_id -uniq
+    ipptool2book stdout DetrendResidImfiles -key det_id:iteration:exp_tag:class_id -uniq
     if ($VERBOSE > 2)
       book listbook DetrendResidImfiles
@@ -83,13 +83,13 @@
 
     book setword DetrendResidImfiles $pageName state RUN
-    book getword DetrendResidImfiles $pageName DET_ID   -var DET_ID   
-    book getword DetrendResidImfiles $pageName ITER     -var ITER     
-    book getword DetrendResidImfiles $pageName DET_TYPE -var DET_TYPE 
-    book getword DetrendResidImfiles $pageName MODE     -var MODE     
-    book getword DetrendResidImfiles $pageName EXP_TAG  -var EXP_TAG  
-    book getword DetrendResidImfiles $pageName CLASS_ID -var CLASS_ID 
-    book getword DetrendResidImfiles $pageName URI      -var URI      
-    book getword DetrendResidImfiles $pageName DET_URI  -var DET_URI  
-    book getword DetrendResidImfiles $pageName CAMERA   -var CAMERA   
+    book getword DetrendResidImfiles $pageName det_id    -var DET_ID   
+    book getword DetrendResidImfiles $pageName iteration -var ITERATION     
+    book getword DetrendResidImfiles $pageName det_type  -var DET_TYPE 
+    book getword DetrendResidImfiles $pageName mode      -var MODE     
+    book getword DetrendResidImfiles $pageName exp_tag   -var EXP_TAG  
+    book getword DetrendResidImfiles $pageName class_id  -var CLASS_ID 
+    book getword DetrendResidImfiles $pageName uri       -var URI      
+    book getword DetrendResidImfiles $pageName det_uri   -var DET_URI  
+    book getword DetrendResidImfiles $pageName camera    -var CAMERA   
 
     # specify choice of remote host:
@@ -103,6 +103,6 @@
     list word -split $word
     $base = $word:0
-    stdout $LOGSUBDIR/$base/$EXP_TAG.detresid.$DET_ID.$ITER.$CLASS_ID.log
-    stderr $LOGSUBDIR/$base/$EXP_TAG.detresid.$DET_ID.$ITER.$CLASS_ID.log
+    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
 
@@ -112,7 +112,7 @@
     # create command
     if ($VERBOSE > 1)
-      echo command detrend_resid.pl --det_id $DET_ID --iteration $ITER --exp_tag $EXP_TAG --class_id $CLASS_ID --det_type $DET_TYPE --detrend $DET_URI --input_uri $URI --camera $CAMERA --mode $MODE
-    end
-    command detrend_resid.pl --det_id $DET_ID --iteration $ITER --exp_tag $EXP_TAG --class_id $CLASS_ID --det_type $DET_TYPE --detrend $DET_URI --input_uri $URI --camera $CAMERA --mode $MODE
+      echo command detrend_resid.pl --det_id $DET_ID --iteration $ITERATION --exp_tag $EXP_TAG --class_id $CLASS_ID --det_type $DET_TYPE --detrend $DET_URI --input_uri $URI --camera $CAMERA --mode $MODE
+    end
+    command detrend_resid.pl --det_id $DET_ID --iteration $ITERATION --exp_tag $EXP_TAG --class_id $CLASS_ID --det_type $DET_TYPE --detrend $DET_URI --input_uri $URI --camera $CAMERA --mode $MODE
   end
 
@@ -155,5 +155,5 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout DetrendResidExposures -key det_id:iter:exp_tag -uniq
+    ipptool2book stdout DetrendResidExposures -key det_id:iteration:exp_tag -uniq
     if ($VERBOSE > 2)
       book listbook DetrendResidExposures
@@ -191,11 +191,11 @@
 
     book setword DetrendResidExposures $pageName state RUN
-    book getword DetrendResidExposures $pageName DET_ID   -var DET_ID  
-    book getword DetrendResidExposures $pageName ITER     -var ITER    
-    book getword DetrendResidExposures $pageName DET_TYPE -var DET_TYPE
-    book getword DetrendResidExposures $pageName MODE     -var MODE    
-    book getword DetrendResidExposures $pageName EXP_TAG  -var EXP_TAG 
-    book getword DetrendResidExposures $pageName INCLUDE  -var INCLUDE 
-    book getword DetrendResidExposures $pageName CAMERA   -var CAMERA  
+    book getword DetrendResidExposures $pageName det_id    -var DET_ID  
+    book getword DetrendResidExposures $pageName iteration -var ITERATION    
+    book getword DetrendResidExposures $pageName det_type  -var DET_TYPE
+    book getword DetrendResidExposures $pageName mode      -var MODE    
+    book getword DetrendResidExposures $pageName exp_tag   -var EXP_TAG 
+    book getword DetrendResidExposures $pageName include   -var INCLUDE 
+    book getword DetrendResidExposures $pageName camera    -var CAMERA  
 
     # specify choice of remote host:
@@ -210,6 +210,6 @@
     list word -split $word
     $base = $word:0
-    stdout $LOGSUBDIR/$base/$EXP_TAG.detresid.$DET_ID.$ITER.log
-    stderr $LOGSUBDIR/$base/$EXP_TAG.detresid.$DET_ID.$ITER.log
+    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
 
@@ -219,7 +219,7 @@
     # create example job options as a demonstration
     if ($VERBOSE > 1)
-      echo command detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITER --exp_tag $EXP_TAG --det_type $DET_TYPE --camera $CAMERA
-    end
-    command detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITER --exp_tag $EXP_TAG --det_type $DET_TYPE --camera $CAMERA
+      echo command detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITERATION --exp_tag $EXP_TAG --det_type $DET_TYPE --camera $CAMERA
+    end
+    command detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITERATION --exp_tag $EXP_TAG --det_type $DET_TYPE --camera $CAMERA
   end
 
Index: /branches/eam_branch_00/ippTasks/detrend.stack.pro
===================================================================
--- /branches/eam_branch_00/ippTasks/detrend.stack.pro	(revision 11018)
+++ /branches/eam_branch_00/ippTasks/detrend.stack.pro	(revision 11019)
@@ -45,5 +45,5 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout DetrendStackClass -key det_id:iter:class_id -uniq
+    ipptool2book stdout DetrendStackClass -key det_id:iteration:class_id -uniq
     if ($VERBOSE > 2)
       book listbook DetrendStackClass
@@ -81,9 +81,9 @@
 
     book setword DetrendStackClass $pageName state RUN
-    book getword DetrendStackClass $pageName det_id   -var DET_ID
-    book getword DetrendStackClass $pageName iter     -var ITER
-    book getword DetrendStackClass $pageName det_type -var DET_TYPE
-    book getword DetrendStackClass $pageName class_id -var CLASS_ID
-    book getword DetrendStackClass $pageName camera   -var CAMERA  
+    book getword DetrendStackClass $pageName det_id    -var DET_ID
+    book getword DetrendStackClass $pageName iteration -var ITERATION
+    book getword DetrendStackClass $pageName det_type  -var DET_TYPE
+    book getword DetrendStackClass $pageName class_id  -var CLASS_ID
+    book getword DetrendStackClass $pageName camera    -var CAMERA  
 
     # specify choice of remote host:
@@ -95,6 +95,6 @@
 
     # XXX add $WORKDIR/$LOG_DIR
-    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITER.$CLASS_ID.log
-    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITER.$CLASS_ID.log
+    stdout $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.$CLASS_ID.log
+    stderr $LOGSUBDIR/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.$CLASS_ID.log
 
     # save the pageName for future reference below
@@ -103,7 +103,7 @@
     # create the command line
     if ($VERBOSE > 1)
-      echo command detrend_stack.pl --det_id $DET_ID --iteration $ITER --class_id $CLASS_ID --det_type $DET_TYPE --camera $CAMERA
+      echo command detrend_stack.pl --det_id $DET_ID --iteration $ITERATION --class_id $CLASS_ID --det_type $DET_TYPE --camera $CAMERA
     end
-    command detrend_stack.pl --det_id $DET_ID --iteration $ITER --class_id $CLASS_ID --det_type $DET_TYPE --camera $CAMERA
+    command detrend_stack.pl --det_id $DET_ID --iteration $ITERATION --class_id $CLASS_ID --det_type $DET_TYPE --camera $CAMERA
   end
 
Index: /branches/eam_branch_00/ippTasks/pantasks.pro
===================================================================
--- /branches/eam_branch_00/ippTasks/pantasks.pro	(revision 11018)
+++ /branches/eam_branch_00/ippTasks/pantasks.pro	(revision 11019)
@@ -17,4 +17,15 @@
 $runpoll = 0.5
 $runexec = 1
+
+macro init.simtest
+  $LOGDIR = `ipp_datapath.pl path://SIMTEST`
+  $LOGDIR = $LOGDIR/logs
+  exec mkdir -p $LOGDIR
+
+  if ($parallel) 
+    controller exit true
+    controller host add alala
+  end
+end
 
 macro init.essence
@@ -55,5 +66,5 @@
 macro load.tasks
   input $scripts/phase0.pro
-  input $scripts/phase2.pro
+#  input $scripts/phase2.pro
 # input $scripts/phase3.pro
 
@@ -80,14 +91,2 @@
   end
 end
-
-macro setcommand
-  local n 
-  $command = ""
-  for n 1 $0
-    $command = $command $$n
-  end
-  if ($VERBOSE > 1)
-    echo "command $command"
-  end
-  command $command
-end