Changeset 18029 for trunk/ippTools/share/difftool_inputskyfile.sql

Timestamp:

Jun 9, 2008, 12:55:57 PM (18 years ago)

Author:

jhoblitt

Message:

merge faketool branch

File:

• trunk/ippTools/share/difftool_inputskyfile.sql (modified) (2 diffs)

trunk/ippTools/share/difftool_inputskyfile.sql

@@ -19 +19 @@
     JOIN warpRun
         ON diffInputSkyfile.warp_id = warpRun.warp_id
-    JOIN camProcessedExp
-        ON warpRun.cam_id = camProcessedExp.cam_id
+    JOIN fakeRun
+        USING(fake_id)
+    JOIN camRun
+        USING(cam_id)
     JOIN chipRun
-        ON camProcessedExp.chip_id = chipRun.chip_id
+        USING(chip_id)
     JOIN chipProcessedImfile
-        ON chipRun.chip_id = chipProcessedImfile.chip_id
+        USING(chip_id)
     JOIN rawExp
-        ON chipProcessedImfile.exp_id = rawExp.exp_id
+        ON chipRun.exp_id = rawExp.exp_id
     WHERE
         diffRun.state = 'run'
+        AND warpRun.state = 'stop'
+        AND fakeRun.state = 'stop'
+        AND camRun.state = 'stop'
+        AND chipRun.state = 'stop'
     UNION
     SELECT 
@@ -49 +55 @@
     JOIN warpRun
         ON stackInputSkyfile.warp_id = warpRun.warp_id
-    JOIN camProcessedExp
-        ON warpRun.cam_id = camProcessedExp.cam_id
+    JOIN fakeRun
+        USING(fake_id)
+    JOIN camRun
+        USING(cam_id)
     JOIN chipRun
-        ON camProcessedExp.chip_id = chipRun.chip_id
+        USING(chip_id)
     JOIN chipProcessedImfile
-        ON chipRun.chip_id = chipProcessedImfile.chip_id
+        USING(chip_id)
     JOIN rawExp
-        ON chipProcessedImfile.exp_id = rawExp.exp_id
+        ON chipRun.exp_id = rawExp.exp_id
     WHERE
         diffRun.state = 'run'
+        AND warpRun.state = 'stop'
+        AND fakeRun.state = 'stop'
+        AND camRun.state = 'stop'
+        AND chipRun.state = 'stop'
     ) as Foo