Index: trunk/ippTools/share/difftool_inputskyfile.sql
===================================================================
--- trunk/ippTools/share/difftool_inputskyfile.sql	(revision 19582)
+++ trunk/ippTools/share/difftool_inputskyfile.sql	(revision 20973)
@@ -1,12 +1,13 @@
 SELECT * FROM
-    (SELECT 
+    (SELECT
+        -- warp input
         diffRun.diff_id,
-        diffRun.skycell_id,
-        diffRun.tess_id,
+        diffInputSkyfile.skycell_id,
+        diffInputSkyfile.tess_id,
         0 as stack_id,
         warpSkyfile.warp_id,
         warpSkyfile.uri,
         warpSkyfile.path_base,
-        diffInputSkyfile.template,
+        0 as template,
         rawExp.camera
     FROM diffRun
@@ -14,9 +15,47 @@
         USING(diff_id)
     JOIN warpSkyfile
-        ON  diffInputSkyfile.warp_id    = warpSkyfile.warp_id
+        ON  diffInputSkyfile.warp1      = warpSkyfile.warp_id
         AND diffInputSkyfile.skycell_id = warpSkyfile.skycell_id
         AND diffInputSkyfile.tess_id    = warpSkyfile.tess_id
     JOIN warpRun
-        ON diffInputSkyfile.warp_id = warpRun.warp_id
+        ON diffInputSkyfile.warp1 = warpRun.warp_id
+    JOIN fakeRun
+        USING(fake_id)
+    JOIN camRun
+        USING(cam_id)
+    JOIN chipRun
+        USING(chip_id)
+    JOIN chipProcessedImfile
+        USING(chip_id)
+    JOIN rawExp
+        ON chipRun.exp_id = rawExp.exp_id
+    WHERE
+        diffRun.state = 'new'
+        AND warpRun.state = 'full'
+        AND fakeRun.state = 'full'
+        AND camRun.state = 'full'
+        AND chipRun.state = 'full'
+        -- where hook %s
+    UNION
+    SELECT
+        -- warp template
+        diffRun.diff_id,
+        diffInputSkyfile.skycell_id,
+        diffInputSkyfile.tess_id,
+        0 as stack_id,
+        warpSkyfile.warp_id,
+        warpSkyfile.uri,
+        warpSkyfile.path_base,
+        0 as template,
+        rawExp.camera
+    FROM diffRun
+    JOIN diffInputSkyfile
+        USING(diff_id)
+    JOIN warpSkyfile
+        ON  diffInputSkyfile.warp2      = warpSkyfile.warp_id
+        AND diffInputSkyfile.skycell_id = warpSkyfile.skycell_id
+        AND diffInputSkyfile.tess_id    = warpSkyfile.tess_id
+    JOIN warpRun
+        ON diffInputSkyfile.warp2 = warpRun.warp_id
     JOIN fakeRun
         USING(fake_id)
@@ -38,12 +77,13 @@
     UNION
     SELECT 
+        -- stack input
         diffRun.diff_id,
-        diffRun.skycell_id,
-        diffRun.tess_id,
+        diffInputSkyfile.skycell_id,
+        diffInputSkyfile.tess_id,
         stackSumSkyfile.stack_id,
         0 as warp_id,
         stackSumSkyfile.uri,
         stackSumSkyfile.path_base,
-        diffInputSkyfile.template,
+        1 as template,
         rawExp.camera
     FROM diffRun
@@ -51,25 +91,31 @@
         USING(diff_id)
     JOIN stackSumSkyfile
-        ON  diffInputSkyfile.stack_id = stackSumSkyfile.stack_id
-    JOIN stackInputSkyfile
-        ON diffInputSkyfile.stack_id = stackInputSkyfile.stack_id
-    JOIN warpRun
-        ON stackInputSkyfile.warp_id = warpRun.warp_id
-    JOIN fakeRun
-        USING(fake_id)
-    JOIN camRun
-        USING(cam_id)
-    JOIN chipRun
-        USING(chip_id)
-    JOIN chipProcessedImfile
-        USING(chip_id)
+        ON  diffInputSkyfile.stack1 = stackSumSkyfile.stack_id
     JOIN rawExp
-        ON chipRun.exp_id = rawExp.exp_id
+        USING(exp_id)
     WHERE
         diffRun.state = 'new'
-        AND warpRun.state = 'full'
-        AND fakeRun.state = 'full'
-        AND camRun.state = 'full'
-        AND chipRun.state = 'full'
+        -- where hook %s
+    UNION
+    SELECT 
+        -- stack template
+        diffRun.diff_id,
+        diffInputSkyfile.skycell_id,
+        diffInputSkyfile.tess_id,
+        stackSumSkyfile.stack_id,
+        0 as warp_id,
+        stackSumSkyfile.uri,
+        stackSumSkyfile.path_base,
+        1 as template,
+        rawExp.camera
+    FROM diffRun
+    JOIN diffInputSkyfile
+        USING(diff_id)
+    JOIN stackSumSkyfile
+        ON  diffInputSkyfile.stack2 = stackSumSkyfile.stack_id
+    JOIN rawExp
+        USING(exp_id)
+    WHERE
+        diffRun.state = 'new'
         -- where hook %s
     ) as Foo