Index: /branches/faketool/ippTools/scripts/warptest.sh
===================================================================
--- /branches/faketool/ippTools/scripts/warptest.sh	(revision 17950)
+++ /branches/faketool/ippTools/scripts/warptest.sh	(revision 17951)
@@ -5,5 +5,6 @@
 faketest.sh || exit 1
 
-#warptool -definerun -mode warp -workdir file:///foo || exit 1
+#warp tool -definerun -fake_id 1 -mode warp -workdir file:///foo 
+
 #warptool -addinputexp -warp_id 1 -cam_id 1 || exit 1
 #warptool -addinputexp -warp_id 1 -cam_id 2 || exit 1
Index: /branches/faketool/ippTools/share/camtool_find_pendingexp.sql
===================================================================
--- /branches/faketool/ippTools/share/camtool_find_pendingexp.sql	(revision 17950)
+++ /branches/faketool/ippTools/share/camtool_find_pendingexp.sql	(revision 17951)
@@ -20,5 +20,5 @@
 --      ON chipProcessedImfile.exp_id = rawExp.exp_id
     LEFT JOIN camProcessedExp
-        ON camRun.cam_id = camProcessedExp.cam_id
+        USING(cam_id)
     LEFT JOIN camMask
         ON camRun.label = camMask.label
Index: /branches/faketool/ippTools/share/camtool_find_pendingimfile.sql
===================================================================
--- /branches/faketool/ippTools/share/camtool_find_pendingimfile.sql	(revision 17950)
+++ /branches/faketool/ippTools/share/camtool_find_pendingimfile.sql	(revision 17951)
@@ -34,5 +34,5 @@
         ON chipProcessedImfile.exp_id = rawExp.exp_id
     LEFT JOIN camProcessedExp
-        ON camRun.cam_id = camProcessedExp.cam_id
+        USING(cam_id)
     LEFT JOIN camMask
         ON camRun.label = camMask.label
Index: /branches/faketool/ippTools/share/camtool_find_processedexp.sql
===================================================================
--- /branches/faketool/ippTools/share/camtool_find_processedexp.sql	(revision 17950)
+++ /branches/faketool/ippTools/share/camtool_find_processedexp.sql	(revision 17951)
@@ -6,5 +6,7 @@
     rawExp.telescope,
     rawExp.filelevel
-FROM camProcessedExp
+FROM camRun
+JOIN camProcessedExp
+    USING(cam_id)
 JOIN chipRun
     USING(chip_id)
Index: /branches/faketool/ippTools/share/difftool_inputskyfile.sql
===================================================================
--- /branches/faketool/ippTools/share/difftool_inputskyfile.sql	(revision 17950)
+++ /branches/faketool/ippTools/share/difftool_inputskyfile.sql	(revision 17951)
@@ -19,14 +19,20 @@
     JOIN warpRun
         ON diffInputSkyfile.warp_id = warpRun.warp_id
-    JOIN camProcessedExp
-        ON warpRun.cam_id = camProcessedExp.cam_id
+    JOIN fakeRun
+        USING(fake_id)
+    JOIN camRun
+        USING(cam_id)
     JOIN chipRun
-        ON camProcessedExp.chip_id = chipRun.chip_id
+        USING(chip_id)
     JOIN chipProcessedImfile
-        ON chipRun.chip_id = chipProcessedImfile.chip_id
+        USING(chip_id)
     JOIN rawExp
-        ON chipProcessedImfile.exp_id = rawExp.exp_id
+        ON chipRun.exp_id = rawExp.exp_id
     WHERE
         diffRun.state = 'run'
+        AND warpRun.state = 'stop'
+        AND fakeRun.state = 'stop'
+        AND camRun.state = 'stop'
+        AND chipRun.state = 'stop'
     UNION
     SELECT 
@@ -49,13 +55,19 @@
     JOIN warpRun
         ON stackInputSkyfile.warp_id = warpRun.warp_id
-    JOIN camProcessedExp
-        ON warpRun.cam_id = camProcessedExp.cam_id
+    JOIN fakeRun
+        USING(fake_id)
+    JOIN camRun
+        USING(cam_id)
     JOIN chipRun
-        ON camProcessedExp.chip_id = chipRun.chip_id
+        USING(chip_id)
     JOIN chipProcessedImfile
-        ON chipRun.chip_id = chipProcessedImfile.chip_id
+        USING(chip_id)
     JOIN rawExp
-        ON chipProcessedImfile.exp_id = rawExp.exp_id
+        ON chipRun.exp_id = rawExp.exp_id
     WHERE
         diffRun.state = 'run'
+        AND warpRun.state = 'stop'
+        AND fakeRun.state = 'stop'
+        AND camRun.state = 'stop'
+        AND chipRun.state = 'stop'
     ) as Foo
Index: /branches/faketool/ippTools/share/difftool_todiffskyfile.sql
===================================================================
--- /branches/faketool/ippTools/share/difftool_todiffskyfile.sql	(revision 17950)
+++ /branches/faketool/ippTools/share/difftool_todiffskyfile.sql	(revision 17951)
@@ -14,4 +14,6 @@
 JOIN warpRun
     ON warpRun.warp_id = warpSkyfile.warp_id
+JOIN fakeRun
+    USING(fake_id)
 JOIN camRun
     USING(cam_id)
@@ -24,3 +26,7 @@
 WHERE
   diffRun.state = 'run'
+  AND warpRun.state = 'stop'
+  AND fakeRun.state = 'stop'
+  AND camRun.state = 'stop'
+  AND chipRun.state = 'stop'
   AND diffSkyfile.diff_id IS NULL
Index: /branches/faketool/ippTools/share/pxadmin_create_tables.sql
===================================================================
--- /branches/faketool/ippTools/share/pxadmin_create_tables.sql	(revision 17950)
+++ /branches/faketool/ippTools/share/pxadmin_create_tables.sql	(revision 17951)
@@ -328,5 +328,4 @@
 CREATE TABLE camProcessedExp (
     cam_id BIGINT,
-    chip_id BIGINT, 
     uri VARCHAR(255), 
     bg FLOAT, 
@@ -356,8 +355,8 @@
     path_base VARCHAR(255), 
     fault SMALLINT NOT NULL, 
-    PRIMARY KEY(cam_id, chip_id), 
-    KEY(fault), 
-    FOREIGN KEY (cam_id, chip_id)  
-    REFERENCES camRun(cam_id, chip_id)) 
+    PRIMARY KEY(cam_id), 
+    KEY(fault), 
+    FOREIGN KEY (cam_id)  
+        REFERENCES camRun(cam_id)) 
 ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -677,11 +676,10 @@
     skycell_id VARCHAR(64),
     tess_id VARCHAR(64),
-    fake_id BIGINT,
     class_id VARCHAR(64),
     fault SMALLINT,
-    PRIMARY KEY(warp_id, skycell_id, tess_id, fake_id, class_id),
+    PRIMARY KEY(warp_id, skycell_id, tess_id, class_id),
     KEY(fault),
-    FOREIGN KEY (warp_id, fake_id)
-        REFERENCES  warpRun(warp_id, fake_id)
+    FOREIGN KEY (warp_id)
+        REFERENCES warpRun(warp_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
Index: /branches/faketool/ippTools/share/stacktool_find_complete_warps.sql
===================================================================
--- /branches/faketool/ippTools/share/stacktool_find_complete_warps.sql	(revision 17950)
+++ /branches/faketool/ippTools/share/stacktool_find_complete_warps.sql	(revision 17951)
@@ -6,4 +6,6 @@
     JOIN warpSkyfile 
         USING(warp_id)
+    JOIN fakeRun
+        USING(fake_id)
     JOIN camRun
         USING(cam_id)
Index: /branches/faketool/ippTools/share/stacktool_inputskyfile.sql
===================================================================
--- /branches/faketool/ippTools/share/stacktool_inputskyfile.sql	(revision 17950)
+++ /branches/faketool/ippTools/share/stacktool_inputskyfile.sql	(revision 17951)
@@ -11,10 +11,12 @@
 JOIN warpRun
     ON stackInputSkyfile.warp_id = warpRun.warp_id
-JOIN camProcessedExp
-    ON warpRun.cam_id = camProcessedExp.cam_id
+JOIN fakeRun
+    USING(fake_id)
+JOIN camRun
+    USING(cam_id)
 JOIN chipRun
-    ON camProcessedExp.chip_id = chipRun.chip_id
+    USING(chip_id)
 JOIN chipProcessedImfile
-    ON chipRun.chip_id = chipProcessedImfile.chip_id
+    USING(chip_id)
 JOIN rawExp
     ON chipProcessedImfile.exp_id = rawExp.exp_id
Index: /branches/faketool/ippTools/share/warptool_revertwarped.sql
===================================================================
--- /branches/faketool/ippTools/share/warptool_revertwarped.sql	(revision 17950)
+++ /branches/faketool/ippTools/share/warptool_revertwarped.sql	(revision 17951)
@@ -1,7 +1,8 @@
 DELETE FROM warpSkyfile
-USING warpSkyfile, warpRun, camRun, chipRun, rawExp
+USING warpSkyfile, warpRun, fakeRun, camRun, chipRun, rawExp
 WHERE
     warpSkyfile.warp_id = warpRun.warp_id
-    AND warpRun.cam_id = camRun.cam_id
+    AND warpRun.fake_id = fakeRun.fake_id
+    AND fakeRun.cam_id = camRun.cam_id
     AND camRun.chip_id = chipRun.chip_id
     AND chipRun.exp_id = rawExp.exp_id
Index: /branches/faketool/ippTools/share/warptool_scmap.sql
===================================================================
--- /branches/faketool/ippTools/share/warptool_scmap.sql	(revision 17950)
+++ /branches/faketool/ippTools/share/warptool_scmap.sql	(revision 17951)
@@ -7,10 +7,18 @@
 JOIN warpSkyCellMap
     USING(warp_id)
+JOIN fakeRun
+    USING(fake_id)
+JOIN camRun
+    USING(cam_id)
 JOIN camProcessedExp
-    ON warpSkyCellMap.cam_id = camProcessedExp.cam_id
+    USING(cam_id)
+JOIN chipRun
+    USING(chip_id)
 JOIN chipProcessedImfile
-    ON camProcessedExp.chip_id = chipProcessedImfile.chip_id
+    ON chipRun.chip_id = chipProcessedImfile.chip_id
     AND warpSkyCellMap.class_id = chipProcessedImfile.class_id
--- move this as an option into the code
--- WHERE
+WHERE
 --    warpRun.state = 'run'
+    fakeRun.state = 'stop'
+    AND camRun.state = 'stop'
+    AND chipRun.state = 'stop'
Index: /branches/faketool/ippTools/share/warptool_tooverlap.sql
===================================================================
--- /branches/faketool/ippTools/share/warptool_tooverlap.sql	(revision 17950)
+++ /branches/faketool/ippTools/share/warptool_tooverlap.sql	(revision 17951)
@@ -18,5 +18,5 @@
     USING(exp_id)
 LEFT JOIN warpSkyCellMap
-    USING(warp_id, fake_id)
+    USING(warp_id)
 LEFT JOIN warpMask
     ON warpRun.label = warpMask.label
@@ -27,4 +27,3 @@
     AND chipRun.state = 'stop'
     AND warpSkyCellMap.warp_id IS NULL
-    AND warpSkyCellMap.fake_id IS NULL
     AND warpMask.label IS NULL
Index: /branches/faketool/ippTools/share/warptool_towarped.sql
===================================================================
--- /branches/faketool/ippTools/share/warptool_towarped.sql	(revision 17950)
+++ /branches/faketool/ippTools/share/warptool_towarped.sql	(revision 17951)
@@ -3,5 +3,6 @@
     warpSkyCellMap.skycell_id,
     warpSkyCellMap.tess_id,
-    warpSkyCellMap.cam_id,
+    warpRun.fake_id,
+    camRun.cam_id,
     rawExp.camera,
     warpRun.workdir
@@ -9,12 +10,14 @@
 JOIN warpSkyCellMap
     USING(warp_id)
-JOIN camProcessedExp
-    ON warpSkyCellMap.cam_id = camProcessedExp.cam_id
+JOIN fakeRun
+    USING(fake_id)
+JOIN camRun
+    USING(cam_id)
 JOIN chipRun
-    ON camProcessedExp.chip_id = chipRun.chip_id
+    USING(chip_id)
 JOIN chipProcessedImfile
-    ON chipRun.chip_id = chipProcessedImfile.chip_id
+    USING(chip_id)
 JOIN rawExp
-    ON chipProcessedImfile.exp_id = rawExp.exp_id
+    ON chipRun.exp_id = rawExp.exp_id
 LEFT JOIN warpSkyfile
     ON warpRun.warp_id = warpSkyfile.warp_id
@@ -25,4 +28,7 @@
 WHERE
     warpRun.state = 'run'
+    AND fakeRun.state = 'stop'
+    AND camRun.state = 'stop'
+    AND chipRun.state = 'stop'
     AND warpSkyfile.warp_id IS NULL
     AND warpSkyfile.skycell_id IS NULL
Index: /branches/faketool/ippTools/src/camtool.c
===================================================================
--- /branches/faketool/ippTools/src/camtool.c	(revision 17950)
+++ /branches/faketool/ippTools/src/camtool.c	(revision 17951)
@@ -599,5 +599,4 @@
     camProcessedExpRow *row = camProcessedExpRowAlloc(
             pendingRow->cam_id,
-            pendingRow->chip_id,
             uri,
             bg,