Changeset 27526 for branches/eam_branches/20100225/ippTools/share/magicdstool_getskycells.sql

Timestamp:

Mar 30, 2010, 9:40:04 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ippTools/share/magicdstool_getskycells.sql (modified) (4 diffs)

branches/eam_branches/20100225/ippTools/share/magicdstool_getskycells.sql

@@ +1 @@
+-- Input warps
 SELECT DISTINCT
     diffSkyfile.diff_id,
-    diffRun.tess_id, 
+    diffRun.tess_id,
     diffSkyfile.skycell_id,
     diffSkyfile.path_base,
@@ -8 +9 @@
 JOIN magicRun USING(magic_id)
 JOIN magicInputSkyfile USING(magic_id)
-JOIN diffRun ON magicRun.diff_id = diffRun.diff_id
+JOIN diffRun USING(diff_id)
 JOIN diffSkyfile
     ON magicRun.diff_id = diffSkyfile.diff_id
@@ -17 +18 @@
     -- Want input warps only
     AND diffInputSkyfile.warp1 IS NOT NULL
+    AND magicRun.inverse = 0
 JOIN warpSkyCellMap
     ON warpSkyCellMap.warp_id = diffInputSkyfile.warp1
@@ -27 +29 @@
     diffSkyfile.fault = 0
     AND diffSkyfile.quality = 0
-    AND magic_ds_id = %lld
+    -- WHERE hook %s
+UNION
+-- Reference warps
+SELECT DISTINCT
+    diffSkyfile.diff_id,
+    diffRun.tess_id,
+    diffSkyfile.skycell_id,
+    diffSkyfile.path_base,
+    diffSkyfile.data_state
+FROM magicDSRun
+JOIN magicRun USING(magic_id)
+JOIN magicInputSkyfile USING(magic_id)
+JOIN diffRun USING(diff_id)
+JOIN diffSkyfile
+    ON magicRun.diff_id = diffSkyfile.diff_id
+    AND magicInputSkyfile.node = diffSkyfile.skycell_id
+JOIN diffInputSkyfile
+    ON diffInputSkyfile.diff_id = diffSkyfile.diff_id
+    AND diffInputSkyfile.skycell_id = diffSkyfile.skycell_id
+    AND diffInputSkyfile.warp2 IS NOT NULL
+    AND magicRun.inverse = 1
+JOIN warpSkyCellMap
+    ON warpSkyCellMap.warp_id = diffInputSkyfile.warp2
+    AND warpSkyCellMap.skycell_id = diffInputSkyfile.skycell_id
+JOIN warpSkyfile
+    ON warpSkyfile.warp_id = warpSkyCellMap.warp_id
+    AND warpSkyfile.skycell_id = warpSkyCellMap.skycell_id
+    AND warpSkyfile.quality = 0
+WHERE
+    diffSkyfile.fault = 0
+    AND diffSkyfile.quality = 0
+    -- WHERE hook %s