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

Timestamp:

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

Author:

jhoblitt

Message:

MERGE from HEAD

File:

• branches/cleanup/ippTools/share/warptool_tooverlap.sql (modified) (3 diffs)

branches/cleanup/ippTools/share/warptool_tooverlap.sql

@@ -1 +1 @@
 SELECT
     warpRun.warp_id,
-    warpRun.cam_id,
+    warpRun.fake_id,
     warpRun.workdir,
     warpRun.tess_id,
@@ -9 +9 @@
     warpRun.magiced
 FROM warpRun
-JOIN camProcessedExp
+JOIN fakeRun
+    USING(fake_id)
+JOIN camRun
     USING(cam_id)
 JOIN chipRun
@@ -16 +18 @@
     USING(exp_id)
 LEFT JOIN warpSkyCellMap
-    USING(warp_id, cam_id)
+    USING(warp_id)
 LEFT JOIN warpMask
     ON warpRun.label = warpMask.label
 WHERE
     warpRun.state = 'run'
-    AND camProcessedExp.fault = 0
+    AND fakeRun.state = 'stop'
+    AND camRun.state = 'stop'
+    AND chipRun.state = 'stop'
     AND warpSkyCellMap.warp_id IS NULL
-    AND warpSkyCellMap.cam_id IS NULL
     AND warpMask.label IS NULL