Changeset 23688 for trunk/ippTools/share/difftool_definebyquery_part1.sql

Timestamp:

Apr 2, 2009, 2:51:37 PM (17 years ago)

Author:

Paul Price

Message:

Merging in branches/pap/ from r23685. Some conflicts, most notably in ippTools, but these resolved fairly simply. Only question mark is on regtool reversion, but I think I got it right. Everything builds fine.

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/share/difftool_definebyquery_part1.sql (modified) (1 diff)

trunk/ippTools/share/difftool_definebyquery_part1.sql

@@ -1 @@
-    SELECT
-        exp_id,
-        warp_id,
-        rawExp.filter,
-        warpRun.label,
-        warpRun.tess_id,
-        count(skycell_id) as skycell_count
-    FROM warpRun
-    JOIN warpSkyfile USING(warp_id)
-    JOIN fakeRun USING(fake_id) 
-    JOIN camRun USING(cam_id) 
-    JOIN chipRun USING (chip_id) 
-    JOIN rawExp USING(exp_id)
-    LEFT JOIN diffRun USING(exp_id)
-
-    WHERE
-        warpSkyfile.ignored = 0
-        -- warp where hook %s
-        -- exp where hook %s
-        -- diff where hook %s
-
-    GROUP BY exp_id, warp_id DESC
+SELECT
+    exp_id,
+    warp_id,
+    rawExp.filter,
+    warpRun.label,
+    warpRun.tess_id,
+    COUNT(skycell_id) as skycell_count
+FROM warpRun
+JOIN warpSkyfile USING(warp_id)
+JOIN fakeRun USING(fake_id)
+JOIN camRun USING(cam_id)
+JOIN chipRun USING(chip_id)
+JOIN rawExp USING(exp_id)
+LEFT JOIN diffRun USING(exp_id)
+WHERE
+    warpSkyfile.fault = 0
+    AND warpSkyfile.quality = 0
+    -- warp where hook %s
+    -- exp where hook %s
+    -- diff where hook %s
+GROUP BY exp_id, warp_id DESC