Index: trunk/ippTools/share/warptool_exp.sql
===================================================================
--- trunk/ippTools/share/warptool_exp.sql	(revision 16719)
+++ trunk/ippTools/share/warptool_exp.sql	(revision 16733)
@@ -2,8 +2,6 @@
     camProcessedExp.*
 FROM warpRun
-JOIN warpInputExp
-    USING(warp_id)
 JOIN camProcessedExp
-    ON warpInputExp.cam_id = camProcessedExp.cam_id
+    USING(cam_id)
 WHERE
     warpRun.state = 'run'
Index: trunk/ippTools/share/warptool_imfile.sql
===================================================================
--- trunk/ippTools/share/warptool_imfile.sql	(revision 16719)
+++ trunk/ippTools/share/warptool_imfile.sql	(revision 16733)
@@ -1,13 +1,11 @@
 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
Index: trunk/ippTools/share/warptool_tooverlap.sql
===================================================================
--- trunk/ippTools/share/warptool_tooverlap.sql	(revision 16719)
+++ trunk/ippTools/share/warptool_tooverlap.sql	(revision 16733)
@@ -6,15 +6,12 @@
     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'