Changeset 31687 for trunk/ippTools/share

Timestamp:

Jun 22, 2011, 4:12:33 PM (15 years ago)

Author:

bills

Message:

Only add the group by data_group when requested by the user. Use differernt sql
depending on that option.

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• staticskytool_definebyquery_select.sql (modified) (4 diffs)
• staticskytool_definebyquery_select_by_dg.sql (added)

trunk/ippTools/share/Makefile.am

@@ -371 +371 @@
         stacktool_addsummary.sql \
         staticskytool_definebyquery_select.sql \
+        staticskytool_definebyquery_select_by_dg.sql \
         staticskytool_definebyquery_inputs.sql \
         staticskytool_export_run.sql \

trunk/ippTools/share/staticskytool_definebyquery_select.sql

@@ -1 @@
-SELECT 
+SELECT DISTINCT
        tess_id, 
        skycell_id,
-       data_group,
-       label,
        num_filter 
 FROM (
@@ -9 +7 @@
       tess_id,
       skycell_id,
-      label,
-      data_group,
       COUNT(DISTINCT filter) AS num_filter
   FROM stackRun
@@ -18 +14 @@
       AND stackSumSkyfile.quality = 0
   -- WHERE hook 1 %s 
-  -- restrict by stackSumSkyfile.good_frac, stackRun.skycell_id, stackRun.label
+  -- restrict by selected filters, stackSumSkyfile.good_frac, stackRun.skycell_id, stackRun.label
   GROUP BY
       tess_id,
-      skycell_id,
-      data_group
-  ) AS TMP
+      skycell_id
+  ) AS Stacks
 LEFT JOIN (
   SELECT DISTINCT sky_id,
     stackRun.skycell_id,
-    stackRun.label,
+    stackRun.tess_id,
     stackRun.data_group,
     COUNT(stack_id) AS num_filter
@@ -35 +30 @@
     JOIN stackSumSkyfile USING(stack_id)
     WHERE 1
+    -- restrict by selected filters, stackSumSkyfile.good_frac, stackRun.skycell_id, stackRun.label
+    -- and unless -rerun is supplied that no existing staticskyRun exists
     -- WHERE hook 2 %s
   GROUP BY sky_id
- ) AS oldRuns
-USING(label, data_group, num_filter, skycell_id)
+ ) AS ExistingRunsInputs
+USING(tess_id, skycell_id, num_filter)
 WHERE num_filter = %d
 -- WHERE hook 3 %s