Index: trunk/ippTools/share/difftool_todiffskyfile.sql
===================================================================
--- trunk/ippTools/share/difftool_todiffskyfile.sql	(revision 19605)
+++ trunk/ippTools/share/difftool_todiffskyfile.sql	(revision 19606)
@@ -8,5 +8,6 @@
     diffRun.tess_id,
     diffRun.label,
-    diffRun.state
+    diffRun.state,
+    warpRun.*
 FROM diffRun
 -- Get list of templates for each diffRun
@@ -23,24 +24,20 @@
 LEFT JOIN warpRun AS warpTemplateRun
     ON warpTemplateRun.warp_id = diffTemplateSkyfile.warp_id
-    AND diffTemplateSkyfile.stack_id IS NULL
+    AND diffTemplateSkyfile.warp_id IS NOT NULL
 LEFT JOIN warpSkyfile AS warpTemplateSkyfile
-    ON warpTemplateSkyfile.warp_id = diffTemplateSkyfile.warp_id
-    AND warpTemplateSkyfile.skycell_Id = diffTemplateSkyfile.skycell_id
-    AND diffTemplateSkyfile.stack_id IS NULL
+    ON warpTemplateSkyfile.warp_id = warpTemplateRun.warp_id
+    AND warpTemplateSkyfile.skycell_id = diffTemplateSkyfile.skycell_id
 -- Get warp inputs
 LEFT JOIN warpRun
-    ON warpRun.warp_id = diffTemplateSkyfile.warp_id
-    AND diffInputSkyfile.stack_id IS NULL
+    ON warpRun.warp_id = diffInputSkyfile.warp_id
+    AND diffInputSkyfile.warp_id IS NOT NULL
 LEFT JOIN warpSkyfile
-    ON warpSkyfile.warp_id = diffInputSkyfile.warp_id
-    AND warpSkyfile.skycell_id = diffInputSkyfile.warp_id
-    AND diffInputSkyfile.stack_id IS NULL
+    ON warpSkyfile.warp_id = warpRun.warp_id
+    AND warpSkyfile.skycell_id = diffInputSkyfile.skycell_id
 -- Get stack templates
 LEFT JOIN stackRun AS stackTemplateRun
     ON stackTemplateRun.stack_id = diffTemplateSkyfile.stack_id
-    AND diffTemplateSkyfile.warp_id IS NULL
 LEFT JOIN stackSumSkyfile AS stackTemplateSkyfile
-    ON stackTemplateSkyfile.stack_id = diffTemplateSkyfile.stack_id
-    AND diffTemplateSkyfile.warp_id IS NULL
+    ON stackTemplateSkyfile.stack_id = stackTemplateRun.stack_id
 -- Get stack inputs
 LEFT JOIN stackRun
@@ -48,5 +45,5 @@
     AND diffInputSkyfile.warp_id IS NULL
 LEFT JOIN stackSumSkyfile
-    ON stackSumSkyfile.stack_id = diffInputSkyfile.stack_id
+    ON stackSumSkyfile.stack_id = stackRun.stack_id
     AND diffInputSkyfile.warp_id IS NULL
 -- Get what's already been processed
@@ -79,2 +76,4 @@
     AND stackTemplateSkyfile.fault = 0))
 
+
+