Index: trunk/ippTools/share/difftool_skyfile.sql
===================================================================
--- trunk/ippTools/share/difftool_skyfile.sql	(revision 20694)
+++ trunk/ippTools/share/difftool_skyfile.sql	(revision 20973)
@@ -1,15 +1,18 @@
 SELECT
-    diffRun.skycell_id,
+    diffSkyfile.*,
     diffRun.tess_id,
     diffRun.state,
-    diffSkyfile.*,
-    (SELECT warp_id FROM diffInputSkyfile WHERE diffInputSkyfile.diff_id = diffRun.diff_id
-        AND diffInputSkyfile.template = 0 ) AS warp_id_temp_0,
-    (SELECT stack_id FROM diffInputSkyfile WHERE diffInputSkyfile.diff_id = diffRun.diff_id
-        AND diffInputSkyfile.template = 0 ) AS stack_id_temp_0,
-    (SELECT warp_id FROM diffInputSkyfile WHERE diffInputSkyfile.diff_id = diffRun.diff_id
-        AND diffInputSkyfile.template = 1 ) AS warp_id_temp_1,
-    (SELECT stack_id FROM diffInputSkyfile WHERE diffInputSkyfile.diff_id = diffRun.diff_id
-        AND diffInputSkyfile.template = 1 ) AS stack_id_temp_1
+    warp1,
+    stack1,
+    warp2,
+    stack2
+--    (SELECT warp_id FROM diffInputSkyfile WHERE diffInputSkyfile.diff_id = diffRun.diff_id
+--        AND diffInputSkyfile.template = 0 ) AS warp_id_temp_0,
+--    (SELECT stack_id FROM diffInputSkyfile WHERE diffInputSkyfile.diff_id = diffRun.diff_id
+--        AND diffInputSkyfile.template = 0 ) AS stack_id_temp_0,
+--    (SELECT warp_id FROM diffInputSkyfile WHERE diffInputSkyfile.diff_id = diffRun.diff_id
+--        AND diffInputSkyfile.template = 1 ) AS warp_id_temp_1,
+--    (SELECT stack_id FROM diffInputSkyfile WHERE diffInputSkyfile.diff_id = diffRun.diff_id
+--        AND diffInputSkyfile.template = 1 ) AS stack_id_temp_1
 FROM diffRun
 JOIN diffSkyfile
@@ -17,13 +20,6 @@
 JOIN diffInputSkyfile
     ON diffInputSkyfile.diff_id = diffRun.diff_id
-    AND diffInputSkyfile.template = 0
 JOIN warpRun
-    USING(warp_id)
-JOIN fakeRun
-    USING(fake_id)
-JOIN camRun
-    USING(cam_id)
-JOIN chipRun
-    USING(chip_id)
+    ON warpRun.warp_id = diffInputSkyfile.warp1
 JOIN rawExp
     USING(exp_id)