Changeset 25027 for branches/pap/ippTools/share/disttool_pendingcomponent.sql

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippTools/share/disttool_pendingcomponent.sql (modified) (3 diffs)

branches/pap/ippTools/share/disttool_pendingcomponent.sql

@@ -18 +18 @@
     rawImfile.magicked
 FROM distRun
-JOIN rawExp ON exp_id = stage_id
-JOIN (                      -- find the last satisfactory chip run 
-                            -- note this requires that a chip run have been completed even when 
-                            -- magic is not required for the run
-    SELECT
-        exp_id,
-        MAX(chip_id) AS chip_id
-    FROM chipRun
-    JOIN distRun ON stage_id = exp_id AND stage = 'raw'
-    WHERE 
-        chipRun.state = 'full'
-        AND chipRun.exp_id = exp_id
-        AND (chipRun.magicked OR distRun.no_magic)
-        GROUP BY exp_id
-    ) AS bestChipRun 
-    USING(exp_id)
+JOIN rawExp ON rawExp.exp_id = stage_id
 JOIN rawImfile USING(exp_id)
+JOIN chipRun ON chipRun.exp_id = rawExp.exp_id and chipRun.magicked
 JOIN chipProcessedImfile
-    USING(exp_id, chip_id, class_id)
+    USING(chip_id, class_id)
 LEFT JOIN distComponent 
     ON distRun.dist_id = distComponent.dist_id 
@@ -139 +125 @@
     AND distRun.stage = 'camera'
     AND distComponent.dist_id IS NULL
-    AND (distRun.clean OR chipRun.magicked OR distRun.no_magic)
+    AND (distRun.clean OR (chipRun.magicked AND camRun.magicked) OR distRun.no_magic)
     AND (camRun.state = 'full' OR (distRun.clean AND camRun.state = 'cleaned'))
     -- where hook 4 %s
@@ -229 +215 @@
 JOIN diffRun ON stage_id = diff_id
 JOIN diffSkyfile using(diff_id)
-JOIN rawExp using(exp_id)
+JOIN diffInputSkyfile USING(diff_id, skycell_id)
+JOIN warpRun
+    ON warpRun.warp_id = diffInputSkyfile.warp1
+JOIN fakeRun USING(fake_id)
+JOIN camRun USING(cam_id)
+JOIN chipRun USING(chip_id)
+JOIN rawExp USING(exp_id)
 LEFT JOIN distComponent 
     ON distRun.dist_id = distComponent.dist_id