Changeset 23677 for branches/pap/ippTools/share/difftool_definebyquery_part2.sql

Timestamp:

Apr 2, 2009, 11:55:52 AM (17 years ago)

Author:

Paul Price

Message:

Removing warpSkyfile.ignored from database, in favour of using the quality flags. This means that we can ignore skycells on the basis of usefulness (whether we can measure the PSF) rather than an arbitrary cut of 10% lit pixels (which pixels may or may not be useful).

File:

• branches/pap/ippTools/share/difftool_definebyquery_part2.sql (modified) (1 diff)

branches/pap/ippTools/share/difftool_definebyquery_part2.sql

@@ -1 +1 @@
 -- insert skycells to diff
 INSERT INTO skycellsToDiff
+SELECT
+    0,                      -- diff_id
+    warpSkyfile.skycell_id,
+    warpSkyfile.warp_id,    -- warp1
+    NULL,                   -- stack1
+    NULL,                   -- warp2
+    max_stack_id,           -- stack2
+    warpSkyfile.tess_id,
+    0
+FROM warpSkyfile
+JOIN warpRun USING(warp_id)
+LEFT JOIN (
     SELECT
-        0,                      -- diff_id
-        warpSkyfile.skycell_id,
-        warpSkyfile.warp_id,    -- warp1
-        NULL,                   -- stack1
-        NULL,                   -- warp2
-        max_stack_id,           -- stack2
-        warpSkyfile.tess_id,
-        0
-        FROM warpSkyfile
-        JOIN warpRun USING(warp_id)
-        LEFT JOIN (
-            SELECT
-                MAX(stack_id) AS max_stack_id, -- most recent stack, by virtue of auto-increment
-                stackRun.skycell_id,
-                stackRun.tess_id,
-                filter
-            FROM stackRun
-            JOIN stackSumSkyfile USING(stack_id)
-            WHERE stackSumSkyfile.fault = 0
-                AND stackRun.state = 'full'
-            -- stacks where hook %s
-            GROUP BY
-                skycell_id,
-                filter
-            ) as bestStacks
-        USING(skycell_id)
-        WHERE
-            warpSkyfile.warp_id = %lld
-            AND ignored = 0
-            AND filter = '%s'
-            AND warpSkyfile.tess_id = bestStacks.tess_id
-        -- (good fraction test goes here for example also above)
-        -- warp where hook %s
+        MAX(stack_id) AS max_stack_id, -- most recent stack, by virtue of auto-increment
+        stackRun.skycell_id,
+        stackRun.tess_id,
+        filter
+    FROM stackRun
+    JOIN stackSumSkyfile USING(stack_id)
+    WHERE stackSumSkyfile.fault = 0
+        AND stackSumSkyfile.quality = 0
+        AND stackRun.state = 'full'
+    -- stacks where hook %s
+    GROUP BY
+        skycell_id,
+        filter
+    ) as bestStacks USING(skycell_id)
+WHERE
+    warpSkyfile.warp_id = %lld
+    AND warpSkyfile.fault = 0
+    AND warpSkyfile.quality = 0
+    AND filter = '%s'
+    AND warpSkyfile.tess_id = bestStacks.tess_id
+-- warp where hook %s