Index: trunk/ippTools/share/warptool_tooverlap.sql
===================================================================
--- trunk/ippTools/share/warptool_tooverlap.sql	(revision 16985)
+++ trunk/ippTools/share/warptool_tooverlap.sql	(revision 17145)
@@ -1,9 +1,11 @@
 SELECT
     warpRun.warp_id,
-    camProcessedExp.cam_id,
+    warpRun.cam_id,
+    warpRun.workdir,
     warpRun.tess_id,
-    warpRun.workdir,
+    warpRun.label,
     rawExp.camera,
-    exp_id
+    exp_id,
+    warpRun.magiced
 FROM warpRun
 JOIN camProcessedExp
@@ -15,4 +17,6 @@
 LEFT JOIN warpSkyCellMap
     USING(warp_id, cam_id)
+LEFT JOIN warpMask
+    ON warpRun.label = warpMask.label
 WHERE
     warpRun.state = 'run'
@@ -20,2 +24,3 @@
     AND warpSkyCellMap.warp_id IS NULL
     AND warpSkyCellMap.cam_id IS NULL
+    AND warpMask.label IS NULL
Index: trunk/ippTools/share/warptool_towarped.sql
===================================================================
--- trunk/ippTools/share/warptool_towarped.sql	(revision 16985)
+++ trunk/ippTools/share/warptool_towarped.sql	(revision 17145)
@@ -21,4 +21,6 @@
     AND warpSkyCellMap.skycell_id = warpSkyfile.skycell_id
     AND warpSkyCellMap.tess_id = warpSkyfile.tess_id
+LEFT JOIN warpMask
+    ON warpRun.label = warpMask.label
 WHERE
     warpRun.state = 'run'
@@ -27,3 +29,3 @@
     AND warpSkyfile.tess_id IS NULL
     AND warpSkyCellMap.fault = 0
-
+    AND warpMask.label IS NULL