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

Timestamp:

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

Author:

jhoblitt

Message:

MERGE from HEAD

File:

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

branches/cleanup/ippTools/share/warptool_towarped.sql

@@ -3 +3 @@
     warpSkyCellMap.skycell_id,
     warpSkyCellMap.tess_id,
-    warpSkyCellMap.cam_id,
+    warpRun.fake_id,
+    camRun.cam_id,
     rawExp.camera,
     warpRun.workdir
@@ -9 +10 @@
 JOIN warpSkyCellMap
     USING(warp_id)
-JOIN camProcessedExp
-    ON warpSkyCellMap.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
 LEFT JOIN warpSkyfile
     ON warpRun.warp_id = warpSkyfile.warp_id
@@ -25 +28 @@
 WHERE
     warpRun.state = 'run'
+    AND fakeRun.state = 'stop'
+    AND camRun.state = 'stop'
+    AND chipRun.state = 'stop'
     AND warpSkyfile.warp_id IS NULL
     AND warpSkyfile.skycell_id IS NULL