Index: trunk/ippTasks/detrend.stack.pro
===================================================================
--- trunk/ippTasks/detrend.stack.pro	(revision 9104)
+++ trunk/ippTasks/detrend.stack.pro	(revision 9338)
@@ -39,6 +39,4 @@
   # success
   task.exit    0
-    # XXX is it necessary for these to be local?
-    # drop after this task macro is done?
     local i Nqueue
 
@@ -51,9 +49,8 @@
       $DET_ID   = $word:0
       $ITER     = $word:1
-      $TYPE     = $word:2
+      $DET_TYPE = $word:2
       $CLASS_ID = $word:3
       $CAMERA   = $word:4
-      echo queuepush DetrendStackClass -uniq -key 1:2:4 "NEW $DET_ID $ITER $TYPE $CLASS_ID $CAMERA"
-      queuepush DetrendStackClass -uniq -key 1:2:4 "NEW $DET_ID $ITER $TYPE $CLASS_ID $CAMERA"
+      queuepush DetrendStackClass -uniq -key 1:2:4 "NEW $DET_ID $ITER $DET_TYPE $CLASS_ID $CAMERA"
     end
 
@@ -101,10 +98,11 @@
     $DET_ID   = $word:0
     $ITER     = $word:1
-    $TYPE     = $word:2
+    $DET_TYPE = $word:2
     $CLASS_ID = $word:3
     $CAMERA   = $word:4
 
-    stdout $CAMERA.$TYPE.$DET_ID.$ITER.$CLASS_ID.log
-    stderr $CAMERA.$TYPE.$DET_ID.$ITER.$CLASS_ID.log
+    # XXX add $WORKDIR/$LOG_DIR
+    stdout $CAMERA.$DET_TYPE.$DET_ID.$ITER.$CLASS_ID.log
+    stderr $CAMERA.$DET_TYPE.$DET_ID.$ITER.$CLASS_ID.log
 
     # specify choice of remote host:
@@ -118,6 +116,6 @@
     options "$line"
     # detrend_stack.pl --det_id 1 --iteration 0 --class_id isp --det_type bias --camera ISP || exit 1
-    echo command detrend_stack.pl --det_id $DET_ID --iteration $ITER --class_id $CLASS_ID --det_type $TYPE --camera $CAMERA
-    command detrend_stack.pl --det_id $DET_ID --iteration $ITER --class_id $CLASS_ID --det_type $TYPE --camera $CAMERA
+    echo 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 $ITER --class_id $CLASS_ID --det_type $DET_TYPE --camera $CAMERA
   end