Index: trunk/ippTools/share/magicdstool_getskycells.sql
===================================================================
--- trunk/ippTools/share/magicdstool_getskycells.sql	(revision 20782)
+++ trunk/ippTools/share/magicdstool_getskycells.sql	(revision 20973)
@@ -1,20 +1,20 @@
 SELECT DISTINCT
     diffSkyfile.diff_id,
-    diffRun.skycell_id,
+    diffSkyfile.skycell_id,
     diffSkyfile.uri,
     diffSkyfile.path_base
 FROM magicDSRun
 JOIN magicRun USING(magic_id)
-JOIN magicInputSkyfile USING(magic_id)
-JOIN diffRun USING(diff_id)
-JOIN diffSkyfile USING(diff_id)
+JOIN magicInputSkyfile USING(magic_id, diff_id)
+JOIN diffSkyfile
+    ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
+    AND magicInputSkyfile.node = diffSkyfile.skycell_id
 JOIN diffInputSkyfile
-    ON diffInputSkyfile.diff_id = diffRun.diff_id
-    AND diffInputSkyfile.skycell_id = diffRun.skycell_id
+    ON diffInputSkyfile.diff_id = diffSkyfile.diff_id
+    AND diffInputSkyfile.skycell_id = diffSkyfile.skycell_id
     -- Want input warps only
-    AND diffInputSkyfile.warp_id IS NOT NULL
-    AND diffInputSkyfile.template = 0
+    AND diffInputSkyfile.warp1 IS NOT NULL
 JOIN warpSkyCellMap
-    ON warpSkyCellMap.warp_id = diffInputSkyfile.warp_id
+    ON warpSkyCellMap.warp_id = diffInputSkyfile.warp1
     AND warpSkyCellMap.skycell_id = diffInputSkyfile.skycell_id
 JOIN warpSkyfile
@@ -23,5 +23,4 @@
     AND warpSkyfile.ignored = 0
 WHERE
-    diffRun.state = 'full'
-    AND diffSkyfile.fault = 0
+    diffSkyfile.fault = 0
     AND magic_ds_id = %lld