Changeset 14031

Timestamp:

Jul 5, 2007, 4:08:25 PM (19 years ago)

Author:

jhoblitt

Message:

remove stale use of chipProcessedExp

Location:

trunk/ippTools/share

Files:

• camtool_find_chip_id.sql (modified) (1 diff)
• camtool_find_processedexp.sql (modified) (2 diffs)
• chiptool_processedimfile.sql (modified) (2 diffs)
• difftool_inputskyfile.sql (modified) (2 diffs)
• stacktool_inputskyfile.sql (modified) (2 diffs)

trunk/ippTools/share/camtool_find_chip_id.sql

@@ -8 +8 @@
         chipRun.*
     FROM chipRun
-    JOIN chipProcessedExp
-        USING(chip_id)
     WHERE
         chipRun.state = 'stop') as Foo

trunk/ippTools/share/camtool_find_processedexp.sql

@@ -1 @@
-SELECT
+SELECT DISTINCT
     camProcessedExp.*,
     rawExp.exp_tag,
@@ -7 +7 @@
     rawExp.filelevel
 FROM camProcessedExp
-JOIN chipProcessedExp
+JOIN chipRun
+    USING(chip_id)
+JOIN chipProcessedImfile
     USING(chip_id)
 JOIN rawExp
-    ON chipProcessedExp.exp_id = rawExp.exp_id
+    ON chipProcessedImfile.exp_id = rawExp.exp_id
 WHERE -- bogus condition so there is a pre-existing where to append to
     camProcessedExp.cam_id IS NOT NULL

trunk/ippTools/share/chiptool_processedimfile.sql

@@ -1 @@
-SELECT
-    chipProcessedExp.*,
+SELECT DISTINCT
     chipProcessedImfile.class_id,
     chipProcessedImfile.uri,
@@ -12 +11 @@
     rawExp.telescope,
     rawExp.filelevel
-FROM chipProcessedImfile
-JOIN chipProcessedExp
+FROM chipRun
+JOIN chipProcessedImfile
     USING(chip_id)
 JOIN rawExp
-    ON chipProcessedExp.exp_id = rawExp.exp_id
+    ON chipProcesseImfile.exp_id = rawExp.exp_id
 WHERE
 -- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too

trunk/ippTools/share/difftool_inputskyfile.sql

@@ -1 @@
-SELECT
+SELECT DISTINCT
     warpSkyfile.*,
     diffInputSkyfile.template,
@@ -14 +14 @@
 JOIN camProcessedExp
     ON warpInputExp.cam_id = camProcessedExp.cam_id
-JOIN chipProcessedExp
-    ON camProcessedExp.chip_id = chipProcessedExp.chip_id
+JOIN chipRun
+    ON camProcessedExp.chip_id = chipRun.chip_id
+JOIN chipProcessedImfile
+    ON chipRun.chip_id = chipProcessedImfile.chip_id
 JOIN rawExp
-    ON chipProcessedExp.exp_id = rawExp.exp_id
+    ON chipProcessedImfile.exp_id = rawExp.exp_id
 WHERE
     diffRun.state = 'run'

trunk/ippTools/share/stacktool_inputskyfile.sql

@@ -1 @@
- SELECT
+SELECT DISTINCT
     warpSkyfile.*,
     rawExp.camera
@@ -13 +13 @@
 JOIN camProcessedExp
     ON warpInputExp.cam_id = camProcessedExp.cam_id
-JOIN chipProcessedExp
-    ON camProcessedExp.chip_id = chipProcessedExp.chip_id
+JOIN chipRun
+    ON camProcessedExp.chip_id = chipRun.chip_id
+JOIN chipProcessedImfile
+    ON chipRun.chip_id = chipProcessedImfile.chip_id
 JOIN rawExp
-    ON chipProcessedExp.exp_id = rawExp.exp_id
+    ON chipProcessedImfile.exp_id = rawExp.exp_id
 WHERE
     stackRun.state = 'run'