Index: trunk/ippTasks/detrend.stack.pro
===================================================================
--- trunk/ippTasks/detrend.stack.pro	(revision 9081)
+++ trunk/ippTasks/detrend.stack.pro	(revision 9104)
@@ -15,5 +15,5 @@
 ## STATE DET_ID ITER TYPE CLASS_ID CAMERA
 
-queueinit DetrendClassIDtoStack
+queueinit DetrendStackClass
 if ($?network == 0)
   $network = 1
@@ -24,5 +24,5 @@
 
 # select images ready for copy 
-# new entries are added to queue DetrendClassIDtoStack
+# new entries are added to queue DetrendStackClass
 # compare the new list with the ones already selected
 task	       dettool.stack.load
@@ -54,30 +54,25 @@
       $CLASS_ID = $word:3
       $CAMERA   = $word:4
-      echo queuepush DetrendClassIDtoStack -uniq -key 1:2:4 "NEW $DET_ID $ITER $TYPE $CLASS_ID $CAMERA"
-      queuepush DetrendClassIDtoStack -uniq -key 1:2:4 "NEW $DET_ID $ITER $TYPE $CLASS_ID $CAMERA"
+      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"
     end
 
     # delete existing entries which are DONE
-    queuedrop DetrendClassIDtoStack -key 0 DONE
+    queuedrop DetrendStackClass -key 0 DONE
   end
 
   # locked list
-  task.exit    1
-    echo       "new.images: exec failure"
-  end
-
-  # default exit status
   task.exit    default
-    echo       "new.images: unknown exit status: $EXIT"
+    echo       "detrend.stack: failure"
   end
 
   # operation times out?
   task.exit    timeout
-    echo       "new.images: timeout"
+    echo       "detrend.stack: timeout"
   end
 end
 
 # copy new images, sending job to desired host
-task	       dettool.stack.process
+task	       dettool.stack.run
   periods      -poll 0.5
   periods      -exec 1.0
@@ -85,19 +80,19 @@
 
   task.exec
-    queuesize DetrendClassIDtoStack -var N
+    queuesize DetrendStackClass -var N
    
     if ($N == 0) break
     if ($network == 0) break
     
-    # look for new images on the internal DetrendClassIDtoStack queue
+    # look for new images on the internal DetrendStackClass queue
     # caution with these 'if' statements: syntax errors 
     # will make the task fail without given a good status
-    queuepop DetrendClassIDtoStack -var line -key 0 NEW
+    queuepop DetrendStackClass -var line -key 0 NEW
     if ("$line" == "NULL") break
 
     strpop line state
-    queuepush DetrendClassIDtoStack -replace -key 1:2:4 "RUN $line"
+    queuepush DetrendStackClass -replace -key 1:2:4 "RUN $line"
 
-    # the DetrendClassIDtoStack queue contains:
+    # the DetrendStackClass queue contains:
     # STATE DET_ID ITER TYPE CLASS_ID 
     ## NOTE: the queue has the STATE prepended 
@@ -108,5 +103,5 @@
     $TYPE     = $word:2
     $CLASS_ID = $word:3
-    $CAMERA   = $word:3
+    $CAMERA   = $word:4
 
     stdout $CAMERA.$TYPE.$DET_ID.$ITER.$CLASS_ID.log
@@ -129,15 +124,15 @@
   # success
   task.exit 0
-    queuepush DetrendClassIDtoStack -replace -key 1:2:4 "DONE $options:0"
+    queuepush DetrendStackClass -replace -key 1:2:4 "DONE $options:0"
   end
 
   # default exit status
   task.exit    default
-    queuepush DetrendClassIDtoStack -replace -key 1:2:4 "FAIL $options:0"
+    queuepush DetrendStackClass -replace -key 1:2:4 "FAIL $options:0"
   end
 
   # operation times out?
   task.exit    timeout
-    queuepush DetrendClassIDtoStack -replace -key 1:2:4 "TIMEOUT $options:0"
+    queuepush DetrendStackClass -replace -key 1:2:4 "TIMEOUT $options:0"
   end
 end