Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 20722)
+++ trunk/ippTools/share/Makefile.am	(revision 20734)
@@ -101,10 +101,8 @@
      magictool_definebyquery.sql \
      magictool_definebyquery_insert.sql \
-     magictool_definebyquery_select_part1.sql \
-     magictool_definebyquery_select_part2.sql \
+     magictool_definebyquery_select.sql \
      magictool_definebyquery_select_test.sql \
      magictool_definebyquery_temp_create.sql \
      magictool_definebyquery_temp_insert.sql \
-     magictool_definebyquery_temp_insert_groupby.sql \
      magictool_inputs.sql \
      magictool_inputskyfile.sql \
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 20734)
@@ -0,0 +1,38 @@
+-- Get a list of exposures on which magic may be performed
+SELECT
+    exp_id,
+    filter,
+    num_todo,
+    num_done
+FROM (
+    -- Number of skycells as a function of exposure
+    SELECT
+        exp_id,
+        filter,
+        COUNT(DISTINCT skycell_id) AS num_todo
+    FROM rawExp
+    JOIN chipRun USING(exp_id)
+    JOIN camRun USING(chip_id)
+    JOIN fakeRun USING(cam_id)
+    JOIN warpRun USING(fake_id)
+    JOIN warpSkyCellMap USING(warp_id)
+    JOIN warpSkyfile USING(warp_id, skycell_id)
+    WHERE
+        warpSkyfile.ignored = 0
+        AND warpRun.state = 'full'
+        --- magicSkycellNums WHERE hook %s
+    GROUP BY
+        exp_id
+    ) AS magicSkycellNums
+JOIN (
+    -- Number of completed diffs for an exposure
+    SELECT
+        exp_id,
+        COUNT(diff_id) AS num_done
+    FROM magicBestDiffs
+    GROUP BY
+        exp_id
+    ) AS magicDiffNums USING(exp_id)
+LEFT JOIN magicRun USING(exp_id)
+WHERE
+    magicRun.magic_id IS NULL
Index: trunk/ippTools/share/magictool_definebyquery_select_part1.sql
===================================================================
--- trunk/ippTools/share/magictool_definebyquery_select_part1.sql	(revision 20722)
+++ 	(revision )
@@ -1,25 +1,0 @@
--- This is part 1 of 2 of a query to get a list of exposures on which magic may be performed
--- After this follows magictool_definebyquery_select_part2.sql
-SELECT
-    exp_id,
-    filter,
-    num_todo,
-    num_done
-FROM (
-    -- Number of skycells as a function of exposure
-    SELECT
-        exp_id,
-        filter,
-        COUNT(DISTINCT skycell_id) AS num_todo
-    FROM rawExp
-    JOIN chipRun USING(exp_id)
-    JOIN camRun USING(chip_id)
-    JOIN fakeRun USING(cam_id)
-    JOIN warpRun USING(fake_id)
-    JOIN warpSkyCellMap USING(warp_id)
-    JOIN warpSkyfile USING(warp_id, skycell_id)
-    WHERE
-        warpSkyfile.ignored = 0
-    AND warpRun.state = 'full'
--- INSERT HERE any additional restrictions (e.g., exp_id, warpSkyfile.good_frac)
--- INSERT HERE magictool_definebyquery_select_part2.sql
Index: trunk/ippTools/share/magictool_definebyquery_select_part2.sql
===================================================================
--- trunk/ippTools/share/magictool_definebyquery_select_part2.sql	(revision 20722)
+++ 	(revision )
@@ -1,18 +1,0 @@
--- This is part 2 of 2 of a query to get a list of exposures on which magic may be performed
--- This follows magictool_definebyquery_select_part1.sql
-    GROUP BY
-        exp_id
-    ) AS magicSkycellNums
-JOIN (
-    -- Number of completed diffs for an exposure
-    SELECT
-        exp_id,
-        COUNT(diff_id) AS num_done
-    FROM magicBestDiffs
-    GROUP BY
-        exp_id
-    ) AS magicDiffNums USING(exp_id)
-LEFT JOIN magicRun USING(exp_id)
-WHERE
-    num_done = num_todo
-    AND magicRun.magic_id IS NULL
Index: trunk/ippTools/share/magictool_definebyquery_temp_insert.sql
===================================================================
--- trunk/ippTools/share/magictool_definebyquery_temp_insert.sql	(revision 20722)
+++ trunk/ippTools/share/magictool_definebyquery_temp_insert.sql	(revision 20734)
@@ -21,2 +21,6 @@
 WHERE
     diffSkyfile.fault = 0
+---- WHERE hook %s
+GROUP BY
+    exp_id,
+    warpSkyfile.skycell_id
Index: trunk/ippTools/share/magictool_definebyquery_temp_insert_groupby.sql
===================================================================
--- trunk/ippTools/share/magictool_definebyquery_temp_insert_groupby.sql	(revision 20722)
+++ 	(revision )
@@ -1,3 +1,0 @@
-GROUP BY
-    exp_id,
-    warpSkyfile.skycell_id