Index: trunk/ippTools/share/magictool_rawimfile.sql
===================================================================
--- trunk/ippTools/share/magictool_rawimfile.sql	(revision 20690)
+++ trunk/ippTools/share/magictool_rawimfile.sql	(revision 20691)
@@ -1,3 +1,3 @@
-SELECT
+SELECT DISTINCT
     exp_id,
     class_id,
@@ -11,10 +11,11 @@
     AND diffInputSkyfile.warp_id IS NOT NULL
     AND diffInputSkyfile.template = 0
-JOIN warpSkyfile USING(warp_id,skycell_id)
 JOIN warpRun USING(warp_id)
-JOIN warpSkyCellMap USING(warp_id,skycell_id)
+JOIN warpSkyCellMap
+    ON warpSkyCellMap.warp_id = warpRun.warp_id
+    AND warpSkyCellMap.skycell_id = diffRun.skycell_id
 JOIN fakeRun USING(fake_id)
 JOIN camRun USING(cam_id)
-JOIN chipRun USING(chip_id)
+JOIN chipRun USING(chip_id,exp_id)
 JOIN rawExp USING(exp_id)
 JOIN rawImfile USING(exp_id,class_id)