Index: trunk/ippTools/share/difftool_definebyquery.sql
===================================================================
--- trunk/ippTools/share/difftool_definebyquery.sql	(revision 19249)
+++ trunk/ippTools/share/difftool_definebyquery.sql	(revision 19258)
@@ -24,14 +24,13 @@
         diffTemplates.stack_id AS current_stack_id
     FROM warpSkyfile
-    JOIN warpRun USING(warp_id, tess_id)
-    JOIN fakeRun USING(fake_id, tess_id)
-    JOIN camRun USING(cam_id, tess_id)
-    JOIN chipRun USING(chip_id, tess_id)
-    JOIN rawExp USING(exp_id, tess_id)
+    JOIN warpRun USING(warp_id)
+    JOIN fakeRun USING(fake_id)
+    JOIN camRun USING(cam_id)
+    JOIN chipRun USING(chip_id)
+    JOIN rawExp USING(exp_id)
     -- Check if it has an associated diff
     LEFT JOIN diffInputSkyfile AS diffInputs
         ON diffInputs.warp_id = warpSkyfile.warp_id
         AND diffInputs.skycell_id = warpSkyfile.skycell_id
-        AND diffInputs.tess_id = warpSkyfile.tess_id
         AND diffInputs.template = 0 -- only join input files
     -- Get the stack_id currently used as a template, if any
@@ -56,5 +55,4 @@
     GROUP BY
         skycell_id,
-        tess_id,
         filter
-    ) AS stacksForDiff USING(skycell_id, tess_id, filter)
+    ) AS stacksForDiff USING(skycell_id, filter)
Index: trunk/ippTools/share/faketool_find_camrun.sql
===================================================================
--- trunk/ippTools/share/faketool_find_camrun.sql	(revision 19249)
+++ trunk/ippTools/share/faketool_find_camrun.sql	(revision 19258)
@@ -25,5 +25,6 @@
         rawExp.posang,
         rawExp.object,
-        rawExp.solang
+        rawExp.solang,
+        rawExp.comment
     FROM camRun
     JOIN chipRun
Index: trunk/ippTools/share/magictool_definebyquery.sql
===================================================================
--- trunk/ippTools/share/magictool_definebyquery.sql	(revision 19249)
+++ trunk/ippTools/share/magictool_definebyquery.sql	(revision 19258)
@@ -8,4 +8,5 @@
 --------------------------------------------------------------------
 -- NOTE: THIS FILE IS NOT USED BY magictool
+-- NOTE : thi sfile contains examples of tess_id as a join qualifier which are wrong
 --------------------------------------------------------------------
 
Index: trunk/ippTools/share/magictool_definebyquery_select_part1.sql
===================================================================
--- trunk/ippTools/share/magictool_definebyquery_select_part1.sql	(revision 19249)
+++ trunk/ippTools/share/magictool_definebyquery_select_part1.sql	(revision 19258)
@@ -13,10 +13,10 @@
         COUNT(skycell_id) AS num_todo
     FROM rawExp
-    JOIN chipRun USING(exp_id, tess_id)
-    JOIN camRun USING(chip_id, tess_id)
-    JOIN fakeRun USING(cam_id, tess_id)
-    JOIN warpRun USING(fake_id, tess_id)
-    JOIN warpSkyCellMap USING(warp_id, tess_id)
-    JOIN warpSkyfile USING(warp_id, skycell_id, tess_id)
+    JOIN chipRun USING(exp_id)
+    JOIN camRun USING(chip_id)
+    JOIN fakeRun USING(cam_id)
+    JOIN warpRun USING(fake_id)
+    JOIN warpSkyCellMap USING(warp_id)
+    JOIN warpSkyfile USING(warp_id, skycell_id)
     WHERE
         warpSkyfile.ignored = 0
Index: trunk/ippTools/share/magictool_definebyquery_select_test.sql
===================================================================
--- trunk/ippTools/share/magictool_definebyquery_select_test.sql	(revision 19249)
+++ trunk/ippTools/share/magictool_definebyquery_select_test.sql	(revision 19258)
@@ -18,10 +18,10 @@
         COUNT(skycell_id) AS num_todo
     FROM rawExp
-    JOIN chipRun USING(exp_id, tess_id)
-    JOIN camRun USING(chip_id, tess_id)
-    JOIN fakeRun USING(cam_id, tess_id)
-    JOIN warpRun USING(fake_id, tess_id)
-    JOIN warpSkyCellMap USING(warp_id, tess_id)
-    JOIN warpSkyfile USING(warp_id, skycell_id, tess_id)
+    JOIN chipRun USING(exp_id)
+    JOIN camRun USING(chip_id)
+    JOIN fakeRun USING(cam_id)
+    JOIN warpRun USING(fake_id)
+    JOIN warpSkyCellMap USING(warp_id)
+    JOIN warpSkyfile USING(warp_id, skycell_id)
     WHERE
         warpSkyfile.ignored = 0
Index: trunk/ippTools/share/magictool_definebyquery_temp_insert.sql
===================================================================
--- trunk/ippTools/share/magictool_definebyquery_temp_insert.sql	(revision 19249)
+++ trunk/ippTools/share/magictool_definebyquery_temp_insert.sql	(revision 19258)
@@ -7,14 +7,13 @@
     MAX(diffSkyfile.diff_id) AS diff_id
 FROM rawExp
-JOIN chipRun USING(exp_id, tess_id)
-JOIN camRun USING(chip_id, tess_id)
-JOIN fakeRun USING(cam_id, tess_id)
-JOIN warpRun USING(fake_id, tess_id)
-JOIN warpSkyCellMap USING(warp_id, tess_id)
-JOIN warpSkyfile USING(warp_id, skycell_id, tess_id)
+JOIN chipRun USING(exp_id)
+JOIN camRun USING(chip_id)
+JOIN fakeRun USING(cam_id)
+JOIN warpRun USING(fake_id)
+JOIN warpSkyCellMap USING(warp_id)
+JOIN warpSkyfile USING(warp_id, skycell_id)
 JOIN diffInputSkyfile
     ON diffInputSkyfile.warp_id = warpSkyfile.warp_id
     AND diffInputSkyfile.skycell_id = warpSkyfile.skycell_id
-    AND diffInputSkyfile.tess_id = warpSkyfile.tess_id
     AND diffInputSkyfile.template = 0 -- selecting inputs only
 JOIN diffSkyfile USING(diff_id)
Index: trunk/ippTools/share/stacktool_definebyquery_insert.sql
===================================================================
--- trunk/ippTools/share/stacktool_definebyquery_insert.sql	(revision 19249)
+++ trunk/ippTools/share/stacktool_definebyquery_insert.sql	(revision 19258)
@@ -18,5 +18,5 @@
 WHERE
     warpSkyfile.skycell_id = '%s'
-    AND warpRun.tess_id = '%s'
+    AND warpRun.state = 'full'
     AND rawExp.filter = '%s'
     AND warpSkyfile.fault = 0
Index: trunk/ippTools/share/stacktool_definebyquery_insert_random_part1.sql
===================================================================
--- trunk/ippTools/share/stacktool_definebyquery_insert_random_part1.sql	(revision 19249)
+++ trunk/ippTools/share/stacktool_definebyquery_insert_random_part1.sql	(revision 19258)
@@ -14,17 +14,17 @@
     FROM warpSkyfile
     JOIN warpRun
-        USING(warp_id, tess_id)
+        USING(warp_id)
     JOIN fakeRun
-        USING(fake_id, tess_id)
+        USING(fake_id)
     JOIN camRun
-        USING(cam_id, tess_id)
+        USING(cam_id)
     JOIN chipRun
-        USING(chip_id, tess_id)
+        USING(chip_id)
     JOIN rawExp
-        USING(exp_id, tess_id)
+        USING(exp_id)
     WHERE
         skycell_id = '%s'
-        AND tess_id = '%s'
-        AND rawExp.filter = '%s'
+        AND warpRun.state = 'full'
+        AND rawExp.filter = '%s' -- the result of the query is grouped by filter and inserted for one at a time
         AND warpSkyfile.fault = 0
         AND warpSkyfile.ignored = 0
Index: trunk/ippTools/share/stacktool_definebyquery_part1.sql
===================================================================
--- trunk/ippTools/share/stacktool_definebyquery_part1.sql	(revision 19249)
+++ trunk/ippTools/share/stacktool_definebyquery_part1.sql	(revision 19258)
@@ -5,6 +5,6 @@
 SELECT
     skycell_id,
+    filter,
     tess_id,
-    filter,
     num_warp,
     MAX(num_stack) AS num_stack
@@ -13,5 +13,5 @@
     SELECT
         skycell_id,
-        warpSkyfile.tess_id,
+        warpSkyfile.tess_id as tess_id,
         rawExp.filter,
         COUNT(warpSkyfile.skycell_id) AS num_warp -- number of warps that can be stacked
Index: trunk/ippTools/share/stacktool_definebyquery_part2.sql
===================================================================
--- trunk/ippTools/share/stacktool_definebyquery_part2.sql	(revision 19249)
+++ trunk/ippTools/share/stacktool_definebyquery_part2.sql	(revision 19258)
@@ -13,5 +13,5 @@
     SELECT
         skycell_id,
-        tess_id,
+	stackRun.tess_id as stack_tess_id,
         filter,
         COUNT(stackInputSkyfile.warp_id) as num_stack -- number of warps in a stack
@@ -22,8 +22,7 @@
         ) AS stackSizes
     -- JOINing the warpsToStack and stackSizes tables
-        USING(skycell_id, tess_id, filter)
+        USING(skycell_id, filter)
         )
     GROUP BY
         skycell_id,
-        tess_id,
         filter
Index: trunk/ippTools/share/stacktool_definebyquery_test.sql
===================================================================
--- trunk/ippTools/share/stacktool_definebyquery_test.sql	(revision 19249)
+++ trunk/ippTools/share/stacktool_definebyquery_test.sql	(revision 19258)
@@ -24,9 +24,9 @@
         COUNT(warpSkyfile.skycell_id) AS num_warp -- number of warps that can be stacked
     FROM warpRun
-        JOIN warpSkyfile USING(warp_id, tess_id)
-        JOIN fakeRun USING(fake_id, tess_id)
-        JOIN camRun USING(cam_id, tess_id)
-        JOIN chipRun USING(chip_id, tess_id)
-        JOIN rawExp USING(exp_id, tess_id)
+        JOIN warpSkyfile USING(warp_id)
+        JOIN fakeRun USING(fake_id)
+        JOIN camRun USING(cam_id)
+        JOIN chipRun USING(chip_id)
+        JOIN rawExp USING(exp_id)
     WHERE
         warpRun.state = 'full'
@@ -52,9 +52,8 @@
         ) AS stackSizes
     -- JOINing the warpsToStack and stackSizes tables
-        USING(skycell_id, tess_id, filter)
+        USING(skycell_id, filter)
         )
     GROUP BY
         skycell_id,
-        tess_id,
         filter
 ;
Index: trunk/ippTools/share/stacktool_find_complete_warps.sql
===================================================================
--- trunk/ippTools/share/stacktool_find_complete_warps.sql	(revision 19249)
+++ trunk/ippTools/share/stacktool_find_complete_warps.sql	(revision 19258)
@@ -7,18 +7,17 @@
 FROM warpRun
 JOIN warpSkyfile 
-    USING(warp_id, tess_id)
+    USING(warp_id)
 JOIN fakeRun
-    USING(fake_id, tess_id)
+    USING(fake_id)
 JOIN camRun
-    USING(cam_id, tess_id)
+    USING(cam_id)
 JOIN chipRun
-    USING(chip_id, tess_id)
+    USING(chip_id)
 JOIN rawExp
-    USING(exp_id, tess_id)
+    USING(exp_id)
 LEFT JOIN stackInputSkyfile
     ON warpSkyfile.warp_id = stackInputSkyfile.warp_id
 LEFT JOIN stackRun
-    ON stackRun.tess_id = warpSkyfile.tess_id
-    AND stackRun.skycell_id = warpSkyfile.skycell_id
+    ON stackRun.skycell_id = warpSkyfile.skycell_id
     AND stackRun.stack_id = stackInputSkyfile.stack_id
 WHERE
@@ -26,5 +25,5 @@
     AND warpSkyfile.ignored = 0
 GROUP BY
-    warpSkyfile.skycell_id, warpSkyfile.tess_id, stackRun.stack_id
+    warpSkyfile.skycell_id, stackRun.stack_id
 HAVING
     num_avail > num_extant