Changeset 16733 for trunk/ippTools/share

Timestamp:

Feb 28, 2008, 3:06:02 PM (18 years ago)

Author:

jhoblitt

Message:

require ippdb 1.1.31
remove warpInputExp table
remove warptool -runone & -addinputexp modes
add -cam_id & -magiced options to warptool -definerun

Location:

trunk/ippTools/share

Files:

• warptool_exp.sql (modified) (1 diff)
• warptool_imfile.sql (modified) (1 diff)
• warptool_tooverlap.sql (modified) (1 diff)

trunk/ippTools/share/warptool_exp.sql

@@ -2 +2 @@
     camProcessedExp.*
 FROM warpRun
-JOIN warpInputExp
-    USING(warp_id)
 JOIN camProcessedExp
-    ON warpInputExp.cam_id = camProcessedExp.cam_id
+    USING(cam_id)
 WHERE
     warpRun.state = 'run'

trunk/ippTools/share/warptool_imfile.sql

@@ -1 +1 @@
 SELECT DISTINCT
     rawImfile.*,
-    warpInputExp.cam_id,
+    warpRun.cam_id,
     chipProcessedImfile.uri as chip_uri,
     chipProcessedImfile.path_base as chip_path_base,
     camProcessedExp.path_base as cam_path_base
 FROM warpRun
-JOIN warpInputExp
-    USING(warp_id)
 JOIN camProcessedExp
-    ON warpInputExp.cam_id = camProcessedExp.cam_id
+    USING(cam_id)
 JOIN chipRun
     ON camProcessedExp.chip_id = chipRun.chip_id

trunk/ippTools/share/warptool_tooverlap.sql

@@ -6 +6 @@
     rawExp.camera
 FROM warpRun
-JOIN warpInputExp
-    USING(warp_id)
 JOIN camProcessedExp
-    ON warpInputExp.cam_id = camProcessedExp.cam_id
+    USING(cam_id)
 JOIN chipRun
-    ON camProcessedExp.chip_id = chipRun.chip_id
+    USING(chip_id)
 JOIN rawExp
-    ON chipRun.exp_id = rawExp.exp_id
+    USING(exp_id)
 LEFT JOIN warpSkyCellMap
-    ON warpInputExp.warp_id = warpSkyCellMap.warp_id
-    AND warpInputExp.cam_id = warpSkyCellMap.cam_id
+    USING(warp_id, cam_id)
 WHERE
     warpRun.state = 'run'