Changeset 18076 for branches/cleanup/ippTools/share/warptool_imfile.sql

Timestamp:

Jun 10, 2008, 4:02:14 PM (18 years ago)

Author:

jhoblitt

Message:

MERGE from HEAD

File:

• branches/cleanup/ippTools/share/warptool_imfile.sql (modified) (1 diff)

branches/cleanup/ippTools/share/warptool_imfile.sql

@@ -1 +1 @@
 SELECT DISTINCT
     rawImfile.*,
-    warpRun.cam_id,
+    warpRun.fake_id,
     chipProcessedImfile.uri as chip_uri,
     chipProcessedImfile.path_base as chip_path_base,
     camProcessedExp.path_base as cam_path_base
 FROM warpRun
+JOIN fakeRun
+    USING(fake_id)
+JOIN camRun
+    USING(cam_id)
 JOIN camProcessedExp
     USING(cam_id)
 JOIN chipRun
-    ON camProcessedExp.chip_id = chipRun.chip_id
+    ON camRun.chip_id = chipRun.chip_id
 JOIN chipProcessedImfile
-    ON camProcessedExp.chip_id = chipProcessedImfile.chip_id
+    ON chipRun.chip_id = chipProcessedImfile.chip_id
 JOIN rawImfile -- is there any reason not to refer back to rawimfiles?
-    ON chipProcessedImfile.exp_id = rawImfile.exp_id AND chipProcessedImfile.class_id = rawImfile.class_id 
+    ON chipProcessedImfile.exp_id = rawImfile.exp_id
+    AND chipProcessedImfile.class_id = rawImfile.class_id 
 WHERE
     warpRun.state = 'run'
+    AND fakeRun.state = 'stop'
+    AND camRun.state = 'stop'
+    AND chipRun.state = 'stop'