Index: trunk/ippTools/share/magictool_chipprocessedimfile.sql
===================================================================
--- trunk/ippTools/share/magictool_chipprocessedimfile.sql	(revision 20690)
+++ trunk/ippTools/share/magictool_chipprocessedimfile.sql	(revision 20691)
@@ -1,3 +1,3 @@
-SELECT
+SELECT DISTINCT
     chip_id,
     class_id,
@@ -9,9 +9,12 @@
 JOIN diffInputSkyfile
     ON diffInputSkyfile.diff_id = diffRun.diff_id
+    AND diffInputSkyfile.skycell_id = diffRun.skycell_id
     -- Want input warps only
     AND diffInputSkyfile.warp_id IS NOT NULL
     AND diffInputSkyfile.template = 0
 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)
Index: trunk/ippTools/share/magictool_diffskyfile.sql
===================================================================
--- trunk/ippTools/share/magictool_diffskyfile.sql	(revision 20690)
+++ trunk/ippTools/share/magictool_diffskyfile.sql	(revision 20691)
@@ -1,4 +1,5 @@
 SELECT
-    diff_id,
+    diffSkyfile.diff_id,
+    diffRun.skycell_id,
     diffSkyfile.uri,
     diffSkyfile.path_base
@@ -7,4 +8,17 @@
 JOIN diffRun USING(diff_id)
 JOIN diffSkyfile USING(diff_id)
+JOIN diffInputSkyfile
+    ON diffInputSkyfile.diff_id = diffRun.diff_id
+    AND diffInputSkyfile.skycell_id = diffRun.skycell_id
+    -- Want input warps only
+    AND diffInputSkyfile.warp_id IS NOT NULL
+    AND diffInputSkyfile.template = 0
+JOIN warpSkyCellMap
+    ON warpSkyCellMap.warp_id = diffInputSkyfile.warp_id
+    AND warpSkyCellMap.skycell_id = diffInputSkyfile.skycell_id
+JOIN warpSkyfile
+    ON warpSkyfile.warp_id = warpSkyCellMap.warp_id
+    AND warpSkyfile.skycell_id = warpSkyCellMap.skycell_id
+    AND warpSkyfile.ignored = 0
 WHERE
     diffRun.state = 'full'
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)
Index: trunk/ippTools/share/magictool_warpskyfile.sql
===================================================================
--- trunk/ippTools/share/magictool_warpskyfile.sql	(revision 20690)
+++ trunk/ippTools/share/magictool_warpskyfile.sql	(revision 20691)
@@ -1,5 +1,5 @@
 SELECT
-    warp_id,
-    skycell_id,
+    warpSkyfile.warp_id,
+    warpSkyfile.skycell_id,
     warpSkyfile.uri,
     warpSkyfile.path_base
@@ -9,9 +9,13 @@
 JOIN diffInputSkyfile
     ON diffInputSkyfile.diff_id = diffRun.diff_id
+    AND diffInputSkyfile.skycell_id = diffRun.skycell_id
     -- Want input warps only
     AND diffInputSkyfile.warp_id IS NOT NULL
     AND diffInputSkyfile.template = 0
-JOIN warpSkyfile USING(warp_id,skycell_id)
-JOIN warpRun USING(warp_id)
+JOIN warpSkyfile
+    ON warpSkyfile.warp_id = diffInputSkyfile.warp_id
+    AND warpSkyfile.skycell_id = diffRun.skycell_id
+JOIN warpRun
+    ON warpRun.warp_id = warpSkyfile.warp_id
 WHERE
     warpRun.state = 'full'