Changeset 35461 for trunk/ippTools/share

Timestamp:

May 1, 2013, 3:32:57 PM (13 years ago)

Author:

bills

Message:

changes to support relStack.stack_type 'nightly'

Location:

trunk/ippTools/share

Files:

• releasetool_definerelstack.sql (modified) (2 diffs)
• releasetool_definerelstack_with_skycal.sql (modified) (1 diff)
• releasetool_listrelstack.sql (modified) (1 diff)

trunk/ippTools/share/releasetool_definerelstack.sql

@@ -6 +6 @@
     stackRun.tess_id,
     stackRun.filter,
-    0 AS mjd_obs,
+    stackSumSkyfile.mjd_obs,
     0 AS zpt_obs,
     0 AS zpt_stdev
@@ -12 +12 @@
 FROM ippRelease
 JOIN stackRun
-LEFT JOIN relStack AS previousRelStack USING(rel_id, tess_id, skycell_id, filter)
-
+JOIN stackSumSkyfile using(stack_id)
+LEFT JOIN relStack AS previousRelStack 
+    ON previousRelStack.rel_id = ippRelease.rel_id
+    AND previousRelStack.tess_id = stackRun.tess_id 
+    AND previousRelStack.skycell_id = stackRun.skycell_id
+    AND previousRelStack.filter = stackRun.filter
+    -- JOIN hook %s
 WHERE previousRelStack.relstack_id IS NULL
+    AND stackRun.state ='full'
+    AND stackSumSkyfile.quality = 0
+    AND stackSumSkyfile.fault = 0

trunk/ippTools/share/releasetool_definerelstack_with_skycal.sql

@@ -13 +13 @@
 JOIN stackRun
 JOIN stackSumSkyfile USING(stack_id)
-LEFT JOIN relStack AS previousRelStack USING(rel_id, tess_id, skycell_id, filter)
 JOIN skycalRun ON skycalRun.stack_id = stackRun.stack_id
 JOIN skycalResult ON skycalRun.skycal_id = skycalResult.skycal_id
+-- LEFT JOIN relStack AS previousRelStack USING(rel_id, tess_id, skycell_id, filter)
+LEFT JOIN relStack AS previousRelStack 
+    ON ippRelease.rel_id = previousRelStack.rel_id 
+    AND stackRun.tess_id = previousRelStack.tess_id 
+    AND stackRun.skycell_id = previousRelStack.skycell_id 
+    AND stackRun.filter = previousRelStack.filter
+-- JOIN Hook %s
 
 WHERE previousRelStack.relstack_id IS NULL
+    AND skycalRun.state = 'full'

trunk/ippTools/share/releasetool_listrelstack.sql

@@ -7 +7 @@
     stackRun.state AS stack_state,
     stackRun.data_group AS stack_data_group,
+    skycalResult.fwhm_major,
     skycalResult.path_base AS skycal_path_base,
     skycalRun.data_group AS skycal_data_group,