Changeset 35672 for trunk/ippTools/share

Timestamp:

Jun 18, 2013, 1:46:43 PM (13 years ago)

Author:

bills

Message:

fix errors in defining and running warp_bg and chip_bg runs

Location:

trunk/ippTools/share

Files:

• bgtool_advancechip.sql (modified) (1 diff)
• bgtool_definewarp.sql (modified) (1 diff)
• bgtool_tochip.sql (modified) (3 diffs)

trunk/ippTools/share/bgtool_advancechip.sql

@@ -3 +3 @@
     chipBackgroundImfile.magicked
 FROM chipBackgroundRun
-JOIN chipProcessedImfile USING(chip_id)
-LEFT JOIN chipBackgroundImfile USING(chip_bg_id, class_id)
+JOIN camRun using(cam_id)
+JOIN chipProcessedImfile ON chipBackgroundRun.chip_id = chipProcessedImfile.chip_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)
 WHERE chipBackgroundRun.state = 'new'
     AND chipProcessedImfile.quality = 0
     AND chipProcessedImfile.fault = 0
+    AND bgsub_chipProcessedImfile.quality = 0
 -- WHERE hook %s
-GROUP BY chip_bg_id
+GROUP BY chipBackgroundRun.chip_bg_id
 HAVING
     COUNT(chipBackgroundImfile.class_id) = COUNT(chipProcessedImfile.class_id)

trunk/ippTools/share/bgtool_definewarp.sql

@@ -15 +15 @@
 JOIN chipBackgroundRun ON chipRun.chip_id = chipBackgroundRun.chip_id 
     AND (chipBackgroundRun.cam_id = camRun.cam_id OR chipBackgroundRun.cam_id = 0)
-LEFT JOIN warpBackgroundRun ON chipBackgroundRun.chip_bg_id = warpBackgroundRun.warp_bg_id -- label hook %s
+LEFT JOIN warpBackgroundRun ON chipBackgroundRun.chip_bg_id = warpBackgroundRun.chip_bg_id -- label hook %s
 WHERE chipBackgroundRun.state = 'full'
     AND warpRun.state IN ('full', 'cleaned', 'goto_cleaned') -- need warp to have completed so warpSkyCellMap is populated

trunk/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