Index: trunk/ippTasks/warp.pro
===================================================================
--- trunk/ippTasks/warp.pro	(revision 24595)
+++ trunk/ippTasks/warp.pro	(revision 24596)
@@ -17,5 +17,6 @@
 $warpExp_DB = 0
 $warpSkycell_DB = 0
-#$warpCleanup_DB = 0
+$warp_revert_overlap_DB = 0
+$warp_revert_warped_DB = 0
 
 ### Check status of warping tasks
@@ -23,5 +24,4 @@
   book listbook warpInputExp
   book listbook warpPendingSkyCell
-#  book listbook warpPendingCleanup
 end
 
@@ -30,5 +30,4 @@
   book init warpInputExp
   book init warpPendingSkyCell
-#  book init warpPendingCleanup
 end
 
@@ -70,21 +69,4 @@
   end
 end
-
-# macro warp.cleanup.on
-#   task warp.cleanup.load
-#     active true
-#   end
-#   task warp.cleanup.run
-#     active true
-#   end
-# end
-# macro warp.cleanup.off
-#   task warp.cleanup.load
-#     active false
-#   end
-#   task warp.cleanup.run
-#     active false
-#   end
-# end
 
 ### Load tasks for calculating the warp overlaps
@@ -404,119 +386,93 @@
 end
 
-# # select images ready for warp analysis
-# # new entries are added to warpPendingImfile
-# # skip already-present entries
-# task	       warp.cleanup.load
-#   host         local
-
-#   periods      -poll $LOADPOLL
-#   periods      -exec $LOADEXEC
-#   periods      -timeout 30
-#   npending     1
-#   active       false
-
-#   stdout NULL
-#   stderr $LOGDIR/warp.cleanup.log
-
-#   task.exec
-#     if ($LABEL:n == 0) break
-#     $run = warptool -pendingcleanuprun
-#     if ($DB:n == 0)
-#       option DEFAULT
-#     else
-#       # save the DB name for the exit tasks
-#       option $DB:$warpCleanup_DB
-#       $run = $run -dbname $DB:$warpCleanup_DB
-#       $warpCleanup_DB ++
-#       if ($warpCleanup_DB >= $DB:n) set warpCleanup_DB = 0
-#     end
-#     add_poll_args run
-#     add_poll_labels run
-#     command $run
-#   end
-
-#   # success
-#   task.exit    0
-#     # convert 'stdout' to book format
-#     ipptool2book stdout warpPendingCleanup -key warp_id -uniq -setword dbname $options:0 -setword pantaskState INIT
-#     if ($VERBOSE > 2)
-#       book listbook warpPendingCleanup
-#     end
-
-#     # delete existing entries in the appropriate pantaskStates
-#     process_cleanup warpPendingCleanup
-#   end
-
-#   # locked list
-#   task.exit    default
-#     showcommand failure
-#   end
-
-#   task.exit    crash
-#     showcommand crash
-#   end
-
-#   # operation times out?
-#   task.exit    timeout
-#     showcommand timeout
-#   end
-# end
-
-# # run the ipp_cleanup.pl script on pending images
-# task	       warp.cleanup.run
-#   periods      -poll $RUNPOLL
-#   periods      -exec $RUNEXEC
-#   periods      -timeout 60
-#   active       false
-
-#   task.exec
-#     book npages warpPendingCleanup -var N
-#     if ($N == 0) break
-#     if ($NETWORK == 0) break
-    
-#     # look for new images in warpPendingCleanup (pantaskState == INIT)
-#     book getpage warpPendingCleanup 0 -var pageName -key pantaskState INIT
-#     if ("$pageName" == "NULL") break
-
-#     book setword warpPendingCleanup $pageName pantaskState RUN
-#     book getword warpPendingCleanup $pageName camera -var CAMERA
-#     book getword warpPendingCleanup $pageName state -var CLEANUP_MODE
-#     book getword warpPendingCleanup $pageName warp_id -var WARP_ID
-#     book getword warpPendingCleanup $pageName dbname -var DBNAME
-
-#     # specify choice of local or remote host based on camera and warp (class_id)
-#     set.host.for.camera $CAMERA FPA
-
-#     stdout $LOGDIR/warp.cleanup.log
-#     stderr $LOGDIR/warp.cleanup.log
-
-#     # XXX is everything listed here needed?
-#     $run = ipp_cleanup.pl --stage warp --stage_id $WARP_ID --camera $CAMERA --mode $CLEANUP_MODE
-#     add_standard_args run
-
-#     # save the pageName for future reference below
-#     options $pageName
-
-#     # create the command line
-#     if ($VERBOSE > 1)
-#       echo command $run
-#     end
-#     command $run
-#   end
-
-#   # default exit status
-#   task.exit    default
-#     process_exit warpPendingCleanup $options:0 $JOB_STATUS
-#   end
-
-#   task.exit    crash
-#     showcommand crash
-#     book setword warpPendingCleanup $options:0 pantaskState CRASH
-#   end
-
-#   # operation timed out?
-#   task.exit    timeout
-#     showcommand timeout
-#     book setword warpPendingCleanup $options:0 pantaskState TIMEOUT
-#   end
-# end
+task warp.revert.overlap
+  host         local
+
+  periods      -poll 5.0
+  periods      -exec 60.0
+  periods      -timeout 120.0
+  npending     1
+
+  stdout NULL
+  stderr $LOGDIR/revert.log
+
+  task.exec
+    if ($LABEL:n == 0) break
+    $run = warptool -revertoverlap
+    if ($DB:n == 0)
+      option DEFAULT
+    else
+      # save the DB name for the exit tasks
+      option $DB:$warp_revert_overlap_DB
+      $run = $run -dbname $DB:$warp_revert_overlap_DB
+      $warp_revert_overlap_DB ++
+      if ($warp_revert_overlap_DB >= $DB:n) set warp_revert_overlap_DB = 0
+    end
+    add_poll_labels run
+    command $run
+  end
+
+  # success
+  task.exit    0
+  end
+
+  # locked list
+  task.exit    default
+    showcommand failure
+  end
+
+  task.exit    crash
+    showcommand crash
+  end
+
+  # operation times out?
+  task.exit    timeout
+    showcommand timeout
+  end
+end
+
+task warp.revert.warped
+  host         local
+
+  periods      -poll 5.0
+  periods      -exec 60.0
+  periods      -timeout 120.0
+  npending     1
+
+  stdout NULL
+  stderr $LOGDIR/revert.log
+
+  task.exec
+    if ($LABEL:n == 0) break
+    $run = warptool -revertwarped
+    if ($DB:n == 0)
+      option DEFAULT
+    else
+      # save the DB name for the exit tasks
+      option $DB:$warp_revert_warped_DB
+      $run = $run -dbname $DB:$warp_revert_warped_DB
+      $warp_revert_warped_DB ++
+      if ($warp_revert_warped_DB >= $DB:n) set warp_revert_warped_DB = 0
+    end
+    add_poll_labels run
+    command $run
+  end
+
+  # success
+  task.exit    0
+  end
+
+  # locked list
+  task.exit    default
+    showcommand failure
+  end
+
+  task.exit    crash
+    showcommand crash
+  end
+
+  # operation times out?
+  task.exit    timeout
+    showcommand timeout
+  end
+end