Changeset 20739

Timestamp:

Nov 13, 2008, 3:57:01 PM (17 years ago)

Author:

Paul Price

Message:

DISTINCT covers a multitude of sins. Removing "magic_id IS NULL" so
that we can re-do magic on an exposure if desired (we'll add this in
to magictool).

File:

• trunk/ippTools/share/magictool_definebyquery_select.sql (modified) (4 diffs)

trunk/ippTools/share/magictool_definebyquery_select.sql

@@ -1 +1 @@
 -- 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 +11 @@
         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 +19 @@
     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 +37 @@
     ) AS magicDiffNums USING(exp_id)
 LEFT JOIN magicRun USING(exp_id)
-WHERE
-    magicRun.magic_id IS NULL