Index: branches/eam_branches/ipp-20220316/ippTools/share/Makefile.am
===================================================================
--- branches/eam_branches/ipp-20220316/ippTools/share/Makefile.am	(revision 42197)
+++ branches/eam_branches/ipp-20220316/ippTools/share/Makefile.am	(revision 42207)
@@ -549,4 +549,6 @@
 	fpcamtool_find_processedexp.sql \
 	fpcamtool_pendingexp.sql \
+	fpcamtool_inputchips.sql \
+	fpcamtool_inputastrom.sql \
 	fpcamtool_queue_cam_id.sql \
 	fpcamtool_revertprocessedexp.sql \
Index: branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_cam_and_chip_id.sql
===================================================================
--- branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_cam_and_chip_id.sql	(revision 42197)
+++ branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_find_cam_and_chip_id.sql	(revision 42207)
@@ -5,5 +5,5 @@
  SELECT
      exp_id,
-     chip_id,
+     chip_id
  FROM chipRun
  JOIN rawExp
Index: branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_inputastrom.sql
===================================================================
--- branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_inputastrom.sql	(revision 42207)
+++ branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_inputastrom.sql	(revision 42207)
@@ -0,0 +1,8 @@
+SELECT
+    fpcam_id,
+    cam_id,
+    quality,
+    path_base
+FROM fpcamRun
+JOIN camProcessedExp
+    USING(cam_id)
Index: branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_inputchips.sql
===================================================================
--- branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_inputchips.sql	(revision 42207)
+++ branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_inputchips.sql	(revision 42207)
@@ -0,0 +1,10 @@
+SELECT
+    exp_id,
+    chip_id,
+    fpcam_id,
+    path_base,
+    quality,
+    class_id
+FROM fpcamRun
+JOIN chipProcessedImfile
+    USING(chip_id)
Index: branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_pendingexp.sql
===================================================================
--- branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_pendingexp.sql	(revision 42197)
+++ branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_pendingexp.sql	(revision 42207)
@@ -18,6 +18,4 @@
 LEFT JOIN fpcamProcessedExp
     USING(fpcam_id)
-LEFT JOIN fpcamMask
-    ON fpcamRun.label = fpcamMask.label
 LEFT JOIN Label
     ON fpcamRun.label = Label.label
@@ -25,6 +23,5 @@
     chipRun.state = 'full'
     AND camRun.state = 'full'
-    AND ((fpcamRun.state = 'new'    AND fpcamProcessedExp.cam_id IS NULL) OR
+    AND ((fpcamRun.state = 'new'    AND fpcamProcessedExp.fpcam_id IS NULL) OR
          (fpcamRun.state = 'update' AND fpcamProcessedExp.fault = 0 AND fpcamProcessedExp.quality = 0))
-    AND fpcamMask.label IS NULL
     AND (Label.active OR Label.active IS NULL)
Index: branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_revertprocessedexp.sql
===================================================================
--- branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_revertprocessedexp.sql	(revision 42197)
+++ branches/eam_branches/ipp-20220316/ippTools/share/fpcamtool_revertprocessedexp.sql	(revision 42207)
@@ -2,5 +2,5 @@
 USING fpcamProcessedExp, fpcamRun, camRun, chipRun, rawExp
 WHERE
-    fpcamRun.cam_id      = fpcamProcessedExp.cam_id
+    fpcamRun.fpcam_id      = fpcamProcessedExp.fpcam_id
     AND fpcamRun.cam_id  = camRun.cam_id
     AND fpcamRun.chip_id = chipRun.chip_id
Index: branches/eam_branches/ipp-20220316/ippTools/share/pxadmin_create_tables.sql
===================================================================
--- branches/eam_branches/ipp-20220316/ippTools/share/pxadmin_create_tables.sql	(revision 42197)
+++ branches/eam_branches/ipp-20220316/ippTools/share/pxadmin_create_tables.sql	(revision 42207)
@@ -2474,9 +2474,9 @@
     deteff_uq    FLOAT,
 
-    quality      SMALLINT
+    quality      SMALLINT,
 
     PRIMARY KEY(fpcam_id),
     KEY(fault),
-    FOREIGN KEY (fpcam_id) REFERENCES fpcamRun(fpcam_id),
+    FOREIGN KEY (fpcam_id) REFERENCES fpcamRun(fpcam_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
Index: branches/eam_branches/ipp-20220316/ippTools/share/pxadmin_drop_tables.sql
===================================================================
--- branches/eam_branches/ipp-20220316/ippTools/share/pxadmin_drop_tables.sql	(revision 42197)
+++ branches/eam_branches/ipp-20220316/ippTools/share/pxadmin_drop_tables.sql	(revision 42207)
@@ -129,5 +129,6 @@
 DROP TABLE IF EXISTS remoteComponent;
 DROP TABLE IF EXISTS remoteRun;
-
+DROP TABLE IF EXISTS fpcamProcessedExp;
+DROP TABLE IF EXISTS fpcamRun;
 
 SET FOREIGN_KEY_CHECKS=1