Index: /trunk/ippTools/share/difftool_skyfile.sql
===================================================================
--- /trunk/ippTools/share/difftool_skyfile.sql	(revision 20070)
+++ /trunk/ippTools/share/difftool_skyfile.sql	(revision 20071)
@@ -4,22 +4,16 @@
     diffRun.state,
     diffSkyfile.*,
-    rawExp.exp_id,
-    rawExp.camera,
-    warpRun.warp_id
+    (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
     USING(diff_id)
--- WS: my new stuff begins here
 JOIN diffInputSkyfile
     ON diffInputSkyfile.diff_id = diffRun.diff_id
     AND diffInputSkyfile.template = 0
-JOIN warpRun
-    ON diffInputSkyfile.warp_id = warpRun.warp_id
-JOIN fakeRun
-    ON warpRun.fake_id = fakeRun.fake_id
-JOIN camRun
-    ON camRun.cam_id = fakeRun.cam_id
-JOIN chipRun
-    ON camRun.chip_id = chipRun.chip_id
-JOIN rawExp
-    ON chipRun.exp_id = rawExp.exp_id