Index: trunk/ippTasks/diff.pro
===================================================================
--- trunk/ippTasks/diff.pro	(revision 12078)
+++ trunk/ippTasks/diff.pro	(revision 12113)
@@ -2,5 +2,5 @@
 
 ### After a difference (with associated diff_id) is defined, the difference is performed
-### (tasks in diffPendingSkycell).
+### (tasks in diffSkyfile).
 
 
@@ -25,5 +25,5 @@
 
 ### Initialise the books containing the tasks to do
-book init diffPendingSkycell
+book init diffSkyfile
 
 ### Database lists
@@ -32,10 +32,10 @@
 ### Check status of diffing tasks
 macro diff.status
-  book listbook diffPendingSkycell
+  book listbook diffSkyfile
 end
 
 ### Reset diffing tasks
 macro diff.reset
-  book init diffPendingSkycell
+  book init diffSkyfile
 end
 
@@ -62,5 +62,5 @@
 
 ### Load tasks for doing the differences
-### Tasks are loaded into diffPendingSkycell.
+### Tasks are loaded into diffSkyfile.
 task	       diff.skycell.load
   host         local
@@ -90,11 +90,11 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout diffPendingSkycell -key diff_id -uniq -setword dbname $options:0
+    ipptool2book stdout diffSkyfile -key diff_id -uniq -setword dbname $options:0
     if ($VERBOSE > 2)
-      book listbook diffPendingSkycell
+      book listbook diffSkyfile
     end
 
     # delete existing entries in the appropriate states
-    process_cleanup diffPendingSkycell
+    process_cleanup diffSkyfile
   end
 
@@ -111,6 +111,6 @@
 
 ### Run tasks for calculating the diff overlaps
-### Tasks are taken from diffPendingSkycell.
-task	       diff.exp.run
+### Tasks are taken from diffSkyfile.
+task	       diff.skycell.run
   periods      -poll $runpoll
   periods      -exec $runexec
@@ -118,17 +118,16 @@
 
   task.exec
-    book npages diffPendingSkycell -var N
+    book npages diffSkyfile -var N
     if ($N == 0) break
     if ($network == 0) break
     
-    # look for new images in diffPendingSkycell (state == NULL)
-    book getpage diffPendingSkycell 0 -var pageName -key state NULL
+    # look for new images in diffSkyfile (state == NULL)
+    book getpage diffSkyfile 0 -var pageName -key state NULL
     if ($pageName == NULL) break
 
-    book setword diffPendingSkycell $pageName state RUN
-    book getword diffPendingSkycell $pageName diff_id -var DIFF_ID
-    book getword diffPendingSkycell $pageName camera -var CAMERA
-    book getword diffPendingSkycell $pageName workdir -var WORKDIR
-    book getword diffPendingSkycell $pageName dbname -var DBNAME
+    book setword diffSkyfile $pageName state RUN
+    book getword diffSkyfile $pageName diff_id -var DIFF_ID
+    book getword diffSkyfile $pageName workdir -var WORKDIR
+    book getword diffSkyfile $pageName dbname -var DBNAME
     set_standard_args
 
@@ -154,12 +153,12 @@
     # create the command line
     if ($VERBOSE > 1)
-      echo command diff_skycell.pl --diff_id $DIFF_ID --camera $CAMERA --workdir $WORKDIR $ARGS
+      echo command diff_skycell.pl --diff_id $DIFF_ID --workdir $WORKDIR $ARGS
     end
-    command diff_skycell.pl --diff_id $DIFF_ID --camera $CAMERA --workdir $WORKDIR $ARGS
+    command diff_skycell.pl --diff_id $DIFF_ID --workdir $WORKDIR $ARGS
   end
 
   # default exit status
   task.exit    default
-    process_exit diffPendingSkycell $options:0 $JOB_STATUS
+    process_exit diffSkyfile $options:0 $JOB_STATUS
   end
 
@@ -167,5 +166,5 @@
   task.exit    timeout
     showcommand timeout
-    book setword diffPendingSkycell $options:0 state TIMEOUT
+    book setword diffSkyfile $options:0 state TIMEOUT
   end
 end