Index: branches/tap_branches/ippTasks/warp.pro
===================================================================
--- branches/tap_branches/ippTasks/warp.pro	(revision 25900)
+++ branches/tap_branches/ippTasks/warp.pro	(revision 27838)
@@ -82,4 +82,22 @@
 end
 
+macro warp.revert.on
+  task warp.revert.warped
+    active true
+  end
+  task warp.revert.overlap
+    active true
+  end
+end
+
+macro warp.revert.off
+  task warp.revert.warped
+    active false
+  end
+  task warp.revert.overlap
+    active false
+  end
+end
+
 ### Load tasks for calculating the warp overlaps
 ### Tasks are loaded into warpInputExp.
@@ -89,5 +107,5 @@
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC
-  periods      -timeout 30
+  periods      -timeout 1200
   npending     1
 
@@ -147,8 +165,12 @@
 
   task.exec
+    # if we are unable to run the 'exec', use a long retry time
+    periods -exec $RUNEXEC
+
     book npages warpInputExp -var N
     if ($N == 0) break
     if ($NETWORK == 0) break
-    
+    if ($BURNTOOLING == 1) break
+
     # look for new images in warpInputExp (pantaskState == INIT)
     book getpage warpInputExp 0 -var pageName -key pantaskState INIT
@@ -185,4 +207,5 @@
       echo command $run
     end
+    periods -exec 0.05
     command $run
   end
@@ -215,5 +238,5 @@
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC
-  periods      -timeout 30
+  periods      -timeout 1200
   npending     1
 
@@ -274,4 +297,7 @@
 
   task.exec
+    # if we are unable to run the 'exec', use a long retry time
+    periods -exec $RUNEXEC
+
     book npages warpPendingSkyCell -var N
     if ($N == 0) break
@@ -295,6 +321,6 @@
     book getword warpPendingSkyCell $pageName state -var RUN_STATE
     book getword warpPendingSkyCell $pageName magicked -var CHIP_MAGICKED
-    if ("$CHIP_MAGICKED" == "T")
-        $MAGICKED_ARG = "--magicked"
+    if ($CHIP_MAGICKED > 0)
+        $MAGICKED_ARG = "--magicked $CHIP_MAGICKED"
     else
         $MAGICKED_ARG = ""
@@ -324,4 +350,5 @@
       echo command $run
     end
+    periods -exec 0.05
     command $run
   end
@@ -401,6 +428,6 @@
   host         local
 
-  periods      -poll 5.0
-  periods      -exec 60.0
+  periods      -poll 60.0
+  periods      -exec 1800.0
   periods      -timeout 120.0
   npending     1
@@ -447,6 +474,6 @@
   host         local
 
-  periods      -poll 5.0
-  periods      -exec 60.0
+  periods      -poll 60.0
+  periods      -exec 1800.0
   periods      -timeout 120.0
   npending     1
@@ -457,5 +484,9 @@
   task.exec
     if ($LABEL:n == 0) break
-    $run = warptool -revertwarped
+    # Only revert failures with fault=2 (SYS_ERROR), which tend to be
+    # temporary filesystem problems.  Every other fault type is
+    # interesting and should be kept for debugging (and so it doesn't
+    # continue to occur).
+    $run = warptool -revertwarped -fault 2
     if ($DB:n == 0)
       option DEFAULT