Index: trunk/ippTools/share/magictool_definebyquery_select.sql
===================================================================
--- trunk/ippTools/share/magictool_definebyquery_select.sql	(revision 20734)
+++ trunk/ippTools/share/magictool_definebyquery_select.sql	(revision 20739)
@@ -1,8 +1,9 @@
 -- Get a list of exposures on which magic may be performed
-SELECT
+SELECT DISTINCT
     exp_id,
     filter,
     num_todo,
-    num_done
+    num_done,
+    magic_id
 FROM (
     -- Number of skycells as a function of exposure
@@ -10,5 +11,5 @@
         exp_id,
         filter,
-        COUNT(DISTINCT skycell_id) AS num_todo
+        COUNT(DISTINCT warpSkyfile.tess_id,warpSkyfile.skycell_id) AS num_todo
     FROM rawExp
     JOIN chipRun USING(exp_id)
@@ -18,8 +19,9 @@
     JOIN warpSkyCellMap USING(warp_id)
     JOIN warpSkyfile USING(warp_id, skycell_id)
+    JOIN diffInputSkyfile USING(warp_id,skycell_id)
+    JOIN diffRun USING(diff_id)
     WHERE
         warpSkyfile.ignored = 0
-        AND warpRun.state = 'full'
-        --- magicSkycellNums WHERE hook %s
+        -- magicSkycellNums WHERE hook %s
     GROUP BY
         exp_id
@@ -35,4 +37,2 @@
     ) AS magicDiffNums USING(exp_id)
 LEFT JOIN magicRun USING(exp_id)
-WHERE
-    magicRun.magic_id IS NULL