Index: /trunk/ippTasks/stack.pro
===================================================================
--- /trunk/ippTasks/stack.pro	(revision 12115)
+++ /trunk/ippTasks/stack.pro	(revision 12116)
@@ -2,5 +2,5 @@
 
 ### After a stack (with associated stack_id) is defined, the stack is performed
-### (tasks in stackPendingSkycell).
+### (tasks in stackSumSkyfile).
 
 
@@ -25,5 +25,5 @@
 
 ### Initialise the books containing the tasks to do
-book init stackPendingSkycell
+book init stackSumSkyfile
 
 ### Database lists
@@ -32,10 +32,10 @@
 ### Check status of stacking tasks
 macro stack.status
-  book listbook stackPendingSkycell
+  book listbook stackSumSkyfile
 end
 
 ### Reset stacking tasks
 macro stack.reset
-  book init stackPendingSkycell
+  book init stackSumSkyfile
 end
 
@@ -62,5 +62,5 @@
 
 ### Load tasks for doing the stack
-### Tasks are loaded into stackPendingSkycell.
+### Tasks are loaded into stackSumSkyfile.
 task	       stack.skycell.load
   host         local
@@ -77,9 +77,9 @@
     if ($DB:n == 0)
       option DEFAULT
-      command stacktool -tostacked -limit 20
+      command stacktool -tosum -limit 20
     else
       # save the DB name for the exit tasks
       option $DB:$stackSkycell_DB
-      command stacktool -tostackskyfile -limit 20 -dbname $DB:$stackSkycell_DB
+      command stacktool -tosum -limit 20 -dbname $DB:$stackSkycell_DB
       $stackSkycell_DB ++
       if ($stackSkycell_DB >= $DB:n) set stackSkycell_DB = 0
@@ -90,11 +90,11 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout stackPendingSkycell -key stack_id -uniq -setword dbname $options:0
+    ipptool2book stdout stackSumSkyfile -key stack_id -uniq -setword dbname $options:0
     if ($VERBOSE > 2)
-      book listbook stackPendingSkycell
+      book listbook stackSumSkyfile
     end
 
     # delete existing entries in the appropriate states
-    process_cleanup stackPendingSkycell
+    process_cleanup stackSumSkyfile
   end
 
@@ -111,6 +111,6 @@
 
 ### Run tasks for calculating the stack overlaps
-### Tasks are taken from stackPendingSkycell.
-task	       stack.exp.run
+### Tasks are taken from stackSumSkyfile.
+task	       stack.skycell.run
   periods      -poll $runpoll
   periods      -exec $runexec
@@ -118,17 +118,16 @@
 
   task.exec
-    book npages stackPendingSkycell -var N
+    book npages stackSumSkyfile -var N
     if ($N == 0) break
     if ($network == 0) break
     
-    # look for new images in stackPendingSkycell (state == NULL)
-    book getpage stackPendingSkycell 0 -var pageName -key state NULL
+    # look for new images in stackSumSkyfile (state == NULL)
+    book getpage stackSumSkyfile 0 -var pageName -key state NULL
     if ($pageName == NULL) break
 
-    book setword stackPendingSkycell $pageName state RUN
-    book getword stackPendingSkycell $pageName stack_id -var STACK_ID
-    book getword stackPendingSkycell $pageName camera -var CAMERA
-    book getword stackPendingSkycell $pageName workdir -var WORKDIR
-    book getword stackPendingSkycell $pageName dbname -var DBNAME
+    book setword stackSumSkyfile $pageName state RUN
+    book getword stackSumSkyfile $pageName stack_id -var STACK_ID
+    book getword stackSumSkyfile $pageName workdir -var WORKDIR
+    book getword stackSumSkyfile $pageName dbname -var DBNAME
     set_standard_args
 
@@ -154,12 +153,12 @@
     # create the command line
     if ($VERBOSE > 1)
-      echo command stack_skycell.pl --stack_id $STACK_ID --camera $CAMERA --workdir $WORKDIR $ARGS
+      echo command stack_skycell.pl --stack_id $STACK_ID --workdir $WORKDIR $ARGS
     end
-    command stack_skycell.pl --stack_id $STACK_ID --camera $CAMERA --workdir $WORKDIR $ARGS
+    command stack_skycell.pl --stack_id $STACK_ID --workdir $WORKDIR $ARGS
   end
 
   # default exit status
   task.exit    default
-    process_exit stackPendingSkycell $options:0 $JOB_STATUS
+    process_exit stackSumSkyfile $options:0 $JOB_STATUS
   end
 
@@ -167,5 +166,5 @@
   task.exit    timeout
     showcommand timeout
-    book setword stackPendingSkycell $options:0 state TIMEOUT
+    book setword stackSumSkyfile $options:0 state TIMEOUT
   end
 end