Index: branches/eam_branch_00/ippTasks/detrend.resid.pro
===================================================================
--- branches/eam_branch_00/ippTasks/detrend.resid.pro	(revision 11012)
+++ 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
 
