Changeset 38049 for branches/eam_branches/ipp-20150112/ippTools/share/difftool_definewarpstack.sql

Timestamp:

Mar 28, 2015, 8:24:37 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20150112/ippTools/share/difftool_definewarpstack.sql (modified) (4 diffs)

branches/eam_branches/ipp-20150112/ippTools/share/difftool_definewarpstack.sql

@@ -2 +2 @@
 -- and check results against existing diffs
 SELECT
+   exp_id,
+   warp_id,
+   filter,
+   warpLabel,
+   warpDataGroup,
+   Inputs.tess_id,
+   Inputs.skycell_id,
+   stack_id,
+   stackLabel,
+   stackDataGroup,
+   diff_id,
+   diffLabel
+FROM
+(
+SELECT 
    exp_id,
    warp_id,
@@ -11 +26 @@
    MAX(stack_id) AS stack_id,
    stackRun.label AS stackLabel,
-   stackRun.data_group AS stackDataGroup,
-   diff_id,
-   diffRun.label AS diffLabel
+   stackRun.data_group AS stackDataGroup
 FROM warpRun
      JOIN fakeRun USING(fake_id)
@@ -25 +38 @@
         stackRun.tess_id    = warpRun.tess_id)
      JOIN stackSumSkyfile USING(stack_id)
-     LEFT JOIN diffInputSkyfile ON 
-       (warp_id = diffInputSkyfile.warp1 AND
-        stack_id = diffInputSkyfile.stack2 AND
-        diffInputSkyfile.skycell_id = stackRun.skycell_id AND
-        diffInputSkyfile.tess_id = stackRun.tess_id)
-     LEFT JOIN diffRun USING(diff_id)
 WHERE 
      warpRun.state = 'full'
@@ -41 +48 @@
 -- %s
 GROUP BY exp_id,warp_id,skycell_id
+) AS Inputs
+LEFT JOIN 
+(
+SELECT 
+diff_id,
+diffRun.label AS diffLabel,
+warp1,
+stack2,
+skycell_id,
+diffInputSkyfile.tess_id
+FROM 
+diffRun JOIN diffInputSkyfile USING(diff_id,tess_id)
+WHERE
+diff_mode = 2
+-- %s 
+) AS Diffs ON
+       (warp_id = warp1 AND
+        stack_id = stack2 AND
+        Diffs.skycell_id = Inputs.skycell_id AND
+        Diffs.tess_id = Inputs.tess_id)
+WHERE
+1
+-- %s
+