Changeset 38937 for trunk/ippTools/share

Timestamp:

Oct 21, 2015, 5:44:52 PM (11 years ago)

Author:

watersc1

Message:

Untested fullforce_summary handlers. addtool compiles and addstar_run.pl doesn't complain about variables, but I have not confirmed they work correctly.

Location:

trunk/ippTools/share

Files:

• addtool_find_ffsummary_id.sql (modified) (1 diff)
• addtool_find_ffsummary_id_dvo.sql (modified) (1 diff)

trunk/ippTools/share/addtool_find_ffsummary_id.sql

@@ -1 @@
-SELECT
-     fullForceRun.*
-FROM 
-     fullForceRun
-JOIN fullForceSummary using (ff_id)
-
-LEFT JOIN (SELECT ff_id       AS added_ff_id,
-                  addRun.dvodb AS previous_dvodb
-           FROM addRun
-JOIN fullForceRun on (ff_id = stage_id and addRun.stage = 'fullforce_summary')
-          ) as foo
-     ON ff_id = added_ff_id 
-     --AND stage = 'skycal'
+SELECT fullForceRun.* FROM fullForceRun
+JOIN fullForceSummary USING (ff_id)
+LEFT JOIN (
+     SELECT ff_id AS added_ff_id,
+            addRun.dvodb AS previous_dvodb
+     FROM addRun
+     JOIN fullForceRun ON (ff_id = stage_id and addRun.stage = 'fullforce_summary')
+     ) as foo
+ON ff_id = added_ff_id 
+     -- AND stage = 'skycal'
      -- hook for qualifying the join on the previous_dvodb
      AND %s

trunk/ippTools/share/addtool_find_ffsummary_id_dvo.sql

@@ -1 @@
-SELECT fullForceRun.* FROM fullForceRun JOIN fullForceSummary using (ff_id)
-JOIN skycalRun using (skycal_id) join stackRun using (stack_id) 
-JOIN skycell using (skycell_id, tess_id)
+SELECT fullForceRun.* FROM fullForceRun 
+JOIN fullForceSummary USING (ff_id)
+JOIN skycalRun USING (skycal_id) 
+JOIN stackRun USING (stack_id) 
+JOIN skycell USING (skycell_id, tess_id)
 
-WHERE fullForceRun.state = 'full' and fullForceSummary.quality = 0 and fullForceSummary.fault = 0 
-    AND fullForceRun.ff_id NOT IN (SELECT fullForceRun.ff_id
-       FROM addRun
-       JOIN fullForceRun on (fullForceRun.ff_id = addRun.stage_id and addRun.stage = 'fullforce_summary') JOIN fullForceSummary on (fullForceRun.ff_id = fullForceSummary.ff_id)
+WHERE fullForceRun.state = 'full' 
+AND fullForceSummary.quality = 0 
+AND fullForceSummary.fault = 0 
+AND fullForceRun.ff_id NOT IN (
+    SELECT fullForceRun.ff_id FROM addRun
+    JOIN fullForceRun ON (fullForceRun.ff_id = addRun.stage_id and addRun.stage = 'fullforce_summary') 
+    JOIN fullForceSummary ON (fullForceRun.ff_id = fullForceSummary.ff_id)
        WHERE addRun.stage = 'fullforce_summary' AND %s
-      )
+    )