Index: trunk/ippTasks/warp.pro
===================================================================
--- trunk/ippTasks/warp.pro	(revision 12104)
+++ trunk/ippTasks/warp.pro	(revision 12107)
@@ -2,5 +2,5 @@
 
 ### This is done in two (main) steps.  After a warp (with associated warp_id) is defined,
-### overlaps between the exposure being warped and skycells are calculated (tasks in warpPendingExp).
+### overlaps between the exposure being warped and skycells are calculated (tasks in warpInputExp).
 ### Then for each skycell, the warp is made (tasks in warpPendingSkycell).
 
@@ -26,6 +26,6 @@
 
 ### Initialise the books containing the tasks to do
-book init warpPendingExp
-book init warpPendingSkycell
+book init warpInputExp
+book init warpPendingSkyCell
 
 ### Database lists
@@ -35,5 +35,5 @@
 ### Check status of warping tasks
 macro warp.status
-  book listbook warpPendingExp
+  book listbook warpInputExp
   book listbook warpPendingSkycell
 end
@@ -41,5 +41,5 @@
 ### Reset warping tasks
 macro warp.reset
-  book init warpPendingExp
+  book init warpInputExp
   book init warpPendingSkycell
 end
@@ -78,5 +78,5 @@
 
 ### Load tasks for calculating the warp overlaps
-### Tasks are loaded into warpPendingExp.
+### Tasks are loaded into warpInputExp.
 task	       warp.exp.load
   host         local
@@ -106,11 +106,11 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout warpPendingExp -key warp_id -uniq -setword dbname $options:0
+    ipptool2book stdout warpInputExp -key warp_id -uniq -setword dbname $options:0
     if ($VERBOSE > 2)
-      book listbook warpPendingExp
+      book listbook warpInputExp
     end
 
     # delete existing entries in the appropriate states
-    process_cleanup warpPendingExp
+    process_cleanup warpInputExp
   end
 
@@ -127,5 +127,5 @@
 
 ### Run tasks for calculating the warp overlaps
-### Tasks are taken from warpPendingExp.
+### Tasks are taken from warpInputExp.
 task	       warp.exp.run
   periods      -poll $runpoll
@@ -134,17 +134,17 @@
 
   task.exec
-    book npages warpPendingExp -var N
+    book npages warpInputExp -var N
     if ($N == 0) break
     if ($network == 0) break
     
-    # look for new images in warpPendingExp (state == NULL)
-    book getpage warpPendingExp 0 -var pageName -key state NULL
+    # look for new images in warpInputExp (state == NULL)
+    book getpage warpInputExp 0 -var pageName -key state NULL
     if ($pageName == NULL) break
 
-    book setword warpPendingExp $pageName state RUN
-    book getword warpPendingExp $pageName warp_id -var WARP_ID
-    book getword warpPendingExp $pageName camera -var CAMERA
-    book getword warpPendingExp $pageName workdir -var WORKDIR
-    book getword warpPendingExp $pageName dbname -var DBNAME
+    book setword warpInputExp $pageName state RUN
+    book getword warpInputExp $pageName warp_id -var WARP_ID
+    book getword warpInputExp $pageName camera -var CAMERA
+    book getword warpInputExp $pageName workdir -var WORKDIR
+    book getword warpInputExp $pageName dbname -var DBNAME
     set_standard_args
 
@@ -177,5 +177,5 @@
   # default exit status
   task.exit    default
-    process_exit warpPendingExp $options:0 $JOB_STATUS
+    process_exit warpInputExp $options:0 $JOB_STATUS
   end
 
@@ -183,5 +183,5 @@
   task.exit    timeout
     showcommand timeout
-    book setword warpPendingExp $options:0 state TIMEOUT
+    book setword warpInputExp $options:0 state TIMEOUT
   end
 end
@@ -239,5 +239,5 @@
 ### Run tasks for calculating the warp overlaps
 ### Tasks are taken from warpPendingSkycell.
-task	       warp.exp.run
+task	       warp.skycell.run
   periods      -poll $runpoll
   periods      -exec $runexec