Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 15486)
+++ trunk/ippTools/share/Makefile.am	(revision 15499)
@@ -42,4 +42,6 @@
 	magictool_tomask.sql \
 	magictool_toskyfilemask.sql \
+	magictool_find_complete_diffed_exposures.sql \
+	magictool_find_complete_warpruns.sql \
 	pztool_find_completed_exp.sql \
 	pztool_pendingimfile.sql \
Index: trunk/ippTools/share/magictool_find_complete_diffed_exposures.sql
===================================================================
--- trunk/ippTools/share/magictool_find_complete_diffed_exposures.sql	(revision 15499)
+++ trunk/ippTools/share/magictool_find_complete_diffed_exposures.sql	(revision 15499)
@@ -0,0 +1,16 @@
+SELECT
+    warp_id,
+    diff_id,
+    skycell_id,
+    tess_id
+FROM warpComplete 
+LEFT JOIN diffInputSkyfile
+    USING(warp_id, skycell_id, tess_id)
+WHERE 
+    (diffInputSkyfile.template = 0 || diffInputSkyfile.template IS NULL)
+GROUP BY
+    warpComplete.warp_id
+HAVING
+    COUNT(warpComplete.warp_id) = COUNT(diffInputSkyfile.warp_id)
+    AND COUNT(warpComplete.skycell_id) = COUNT(diffInputSkyfile.skycell_id)
+    AND COUNT(warpComplete.tess_id) = COUNT(diffInputSkyfile.tess_id)
Index: trunk/ippTools/share/magictool_find_complete_warpruns.sql
===================================================================
--- trunk/ippTools/share/magictool_find_complete_warpruns.sql	(revision 15486)
+++ trunk/ippTools/share/magictool_find_complete_warpruns.sql	(revision 15499)
@@ -1,6 +1,9 @@
 -- find stopped warp runsthat have had all of their skycell's warped without
 -- any faults
-SELECT 
-    warp_id
+INSERT INTO warpComplete
+SELECT
+    warp_id,
+    skycell_id,
+    tess_id
 FROM (
     SELECT 
Index: trunk/ippTools/share/magictool_find_unmagiced.sql
===================================================================
--- trunk/ippTools/share/magictool_find_unmagiced.sql	(revision 15486)
+++ trunk/ippTools/share/magictool_find_unmagiced.sql	(revision 15499)
@@ -8,5 +8,6 @@
         warpSkyfile.fault as f1,
         diffSkyfile.fault as f2,
-        warpSkyCellMap.skycell_id as s1,
+        warpSkyCellMap.skycell_id as wscm_s,
+        warpSkyfile.skycell_id as wsf_s,
         diffInputSkyfile.skycell_id as s2
     FROM warpRun
@@ -26,6 +27,4 @@
     LEFT JOIN magicInputSkyfile
         USING(diff_id)
-    LEFT JOIN magicRun
-        USING (magic_id)
     WHERE
         warpRun.state = 'stop'
@@ -42,5 +41,6 @@
     --    warpRun.warp_id, warpSkyCellMap.skycell_id, warpSkyCellMap.tess_id
     HAVING
-        COUNT(warpSkyCellMap.skycell_id) = COUNT(diffInputSkyfile.skycell_id)
+        COUNT(warpSkyCellMap.skycell_id) = COUNT(warpSkyfile.skycell_id)
+        AND COUNT(warpSkyCellMap.skycell_id) = COUNT(diffInputSkyfile.skycell_id)
         AND SUM(warpSkyfile.fault) = 0
         AND SUM(diffSkyfile.fault) = 0