Changeset 35747 for branches/eam_branches/ipp-20130509/ippTools/share/bgtool_tochip.sql

Timestamp:

Jul 3, 2013, 1:43:50 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130509/ippTools/share

Files:

• . (modified) (1 prop)
• bgtool_tochip.sql (modified) (3 diffs)

branches/eam_branches/ipp-20130509/ippTools/share/bgtool_tochip.sql

@@ -1 +1 @@
 SELECT
     chipBackgroundRun.*,
-    class_id,
+    chipProcessedImfile.class_id,
     rawExp.exp_tag,
     rawExp.camera
@@ -8 +8 @@
 JOIN rawExp USING(exp_id)
 JOIN chipProcessedImfile USING(chip_id)
-LEFT JOIN chipBackgroundImfile USING(chip_bg_id, class_id)
+JOIN camRun using(cam_id)
+JOIN chipRun AS bgsub_chipRun on camRun.chip_id = bgsub_chipRun.chip_id
+JOIN chipProcessedImfile AS bgsub_chipProcessedImfile 
+    ON (bgsub_chipRun.chip_id = bgsub_chipProcessedImfile.chip_id 
+        AND bgsub_chipProcessedImfile.class_id = chipProcessedImfile.class_id)
+LEFT JOIN chipBackgroundImfile  
+    ON (chipBackgroundRun.chip_bg_id = chipBackgroundImfile.chip_bg_id 
+        AND chipBackgroundImfile.class_id = chipProcessedImfile.class_id)
 LEFT JOIN Label ON chipBackgroundRun.label = Label.label
 WHERE chipBackgroundImfile.chip_bg_id IS NULL
@@ -14 +21 @@
     AND chipProcessedImfile.fault = 0
     AND chipProcessedImfile.quality = 0
+    AND bgsub_chipProcessedImfile.quality = 0
     AND (Label.active OR Label.active IS NULL)
 -- WHERE hook %s