Index: trunk/ippTools/share/difftool_skyfile.sql
===================================================================
--- trunk/ippTools/share/difftool_skyfile.sql	(revision 24512)
+++ trunk/ippTools/share/difftool_skyfile.sql	(revision 25071)
@@ -6,25 +6,41 @@
     diffRun.workdir,
     diffRun.bothways,
-    camProcessedExp.zpt_obs,
-    camProcessedExp.zpt_stdev,
-    camProcessedExp.zpt_lq,
-    camProcessedExp.zpt_uq,
-    rawExp.exp_time,
-    rawExp.camera,
     warp1,
     stack1,
     warp2,
-    stack2
+    stack2,
+    -- The following are only valid for warps
+    -- XXX This needs to be more clever to handle diffs between stacks
+    camProcessedInput.zpt_obs,
+    camProcessedInput.zpt_stdev,
+    camProcessedInput.zpt_lq,
+    camProcessedInput.zpt_uq,
+    rawInput.exp_time,
+    rawInput.camera,
+    rawInput.exp_id AS exp1,
+    rawTemplate.exp_id AS exp2
 FROM diffRun
 JOIN diffSkyfile USING(diff_id)
 JOIN diffInputSkyfile USING(diff_id, skycell_id)
-JOIN warpRun
--- NOTE: joining input only!
--- This is so that we can get the correct zero point
--- XXX This needs to be more clever to handle diffs between stacks
-    ON warpRun.warp_id = diffInputSkyfile.warp1
-JOIN fakeRun USING(fake_id)
-JOIN camRun USING(cam_id)
-JOIN camProcessedExp USING(cam_id)
-JOIN chipRun USING(chip_id)
-JOIN rawExp USING(exp_id)
+LEFT JOIN warpRun AS warpInput
+    ON warpInput.warp_id = diffInputSkyfile.warp1
+LEFT JOIN fakeRun AS fakeInput
+    ON fakeInput.fake_id = warpInput.fake_id
+LEFT JOIN camRun AS camInput
+    ON camInput.cam_id = fakeInput.cam_id
+LEFT JOIN camProcessedExp AS camProcessedInput
+    ON camProcessedInput.cam_id = camInput.cam_id
+LEFT JOIN chipRun AS chipInput
+    ON chipInput.chip_id = camInput.chip_id
+LEFT JOIN rawExp AS rawInput
+    ON rawInput.exp_id = chipInput.exp_id
+LEFT JOIN warpRun AS warpTemplate
+    ON warpTemplate.warp_id = diffInputSkyfile.warp2
+LEFT JOIN fakeRun AS fakeTemplate
+    ON fakeTemplate.fake_id = warpTemplate.fake_id
+LEFT JOIN camRun AS camTemplate
+    ON camTemplate.cam_id = fakeTemplate.cam_id
+LEFT JOIN chipRun AS chipTemplate
+    ON chipTemplate.chip_id = camTemplate.chip_id
+LEFT JOIN rawExp AS rawTemplate
+    ON rawTemplate.exp_id = chipTemplate.exp_id