Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ippTools/share/magicdstool_todestreak.sql

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ippTools/share (modified) (1 prop)
• ippTools/share/magicdstool_todestreak.sql (modified) (13 diffs)

branches/cnb_branches/cnb_branch_20090301/ippTools/share

@@ -1 +1 @@
 Makefile.in
 Makefile
+pxadmin_create_mirror_tables.sql

@@ -1 +1 @@
 Makefile.in
 Makefile
+pxadmin_create_mirror_tables.sql

branches/cnb_branches/cnb_branch_20090301/ippTools/share/magicdstool_todestreak.sql

@@ -5 +5 @@
     magicRun.magic_id,
     magicRun.exp_id,
+    magicDSRun.label,
     camera,
     magicMask.uri as streaks_uri,
@@ -12 +13 @@
     rawImfile.uri as uri,
     NULL as path_base,
+    magicRun.inverse,
     camProcessedExp.path_base as cam_path_base,
     outroot,
@@ -35 +37 @@
     magicDSRun.magic_id,
     chipRun.exp_id,
+    magicDSRun.label,
     camera,
     magicMask.uri as streaks_uri,
@@ -42 +45 @@
     chipProcessedImfile.uri,
     chipProcessedImfile.path_base,
+    magicRun.inverse,
     camProcessedExp.path_base as cam_path_base,
     outroot,
@@ -49 +53 @@
 FROM magicDSRun
 JOIN magicMask USING (magic_id)
+JOIN magicRun USING(magic_id)
 JOIN camProcessedExp USING(cam_id)
 JOIN chipRun ON chip_id = stage_id
@@ -61 +66 @@
     AND chipRun.state = 'full'
     AND chipProcessedImfile.fault = 0
+    AND chipProcessedImfile.quality = 0
     AND magicDSFile.component IS NULL
 UNION
@@ -68 +74 @@
     magicRun.magic_id,
     magicRun.exp_id,
+    magicDSRun.label,
     camera,
     magicMask.uri as streaks_uri,
@@ -75 +82 @@
     warpSkyfile.uri,
     warpSkyfile.path_base,
+    magicRun.inverse,
     NULL as cam_path_base,
     outroot,
@@ -95 +103 @@
     AND warpRun.state = 'full'
     AND warpSkyfile.fault = 0
-    AND warpSkyfile.ignored = 0
+    AND warpSkyfile.quality = 0
     AND magicDSFile.component IS NULL
 UNION
@@ -103 +111 @@
     magicRun.magic_id,
     magicRun.exp_id,
+    magicDSRun.label,
     rawExp.camera,
     magicMask.uri as streaks_uri,
@@ -108 +117 @@
     magicRun.diff_id as stage_id,
     diffSkyfile.skycell_id as component,
-    diffSkyfile.uri,
+    NULL AS uri,
     diffSkyfile.path_base,
+    magicRun.inverse,
     NULL as cam_path_base,
     outroot,
@@ -121 +131 @@
 JOIN magicInputSkyfile USING(magic_id)
 JOIN diffSkyfile
-    ON  magicInputSkyfile.diff_id = diffSkyfile.diff_id
+    ON  magicRun.diff_id = diffSkyfile.diff_id
     AND magicInputSkyfile.node = diffSkyfile.skycell_id
 LEFT JOIN magicDSFile
@@ -130 +140 @@
     AND magicDSRun.stage = 'diff'
     AND diffSkyfile.fault = 0
+    AND diffSkyfile.quality = 0
     AND magicDSFile.component IS NULL
 ) as Foo

@@ -1 +1 @@
 Makefile.in
 Makefile
+pxadmin_create_mirror_tables.sql