Index: trunk/ippTools/share/pxadmin_create_tables.sql
===================================================================
--- trunk/ippTools/share/pxadmin_create_tables.sql	(revision 23659)
+++ trunk/ippTools/share/pxadmin_create_tables.sql	(revision 23688)
@@ -18,6 +18,6 @@
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY(exp_name, camera, telescope),
-    KEY(fault))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    KEY(fault)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE summitImfile (
@@ -34,7 +34,6 @@
     PRIMARY KEY(exp_name, camera, telescope, class, class_id),
     KEY(file_id),
-    FOREIGN KEY (exp_name, camera, telescope)
-        REFERENCES  summitExp(exp_name, camera, telescope))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    FOREIGN KEY(exp_name, camera, telescope) REFERENCES summitExp(exp_name, camera, telescope)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE pzDownloadExp (
@@ -46,7 +45,6 @@
     PRIMARY KEY(exp_name, camera, telescope),
     KEY(state),
-    FOREIGN KEY (exp_name, camera, telescope)
-        REFERENCES  summitExp(exp_name, camera, telescope))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    FOREIGN KEY(exp_name, camera, telescope) REFERENCES summitExp(exp_name, camera, telescope)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE pzDownloadImfile (
@@ -62,8 +60,7 @@
     PRIMARY KEY(exp_name, camera, telescope, class, class_id),
     KEY(fault),
-    FOREIGN KEY (exp_name, camera, telescope)
-        REFERENCES  pzDownloadExp(exp_name, camera, telescope),
-    FOREIGN KEY (exp_name, camera, telescope, class, class_id)
-        REFERENCES  summitImfile(exp_name, camera, telescope, class, class_id)) ENGINE=innodb DEFAULT CHARSET=latin1;
+    FOREIGN KEY (exp_name, camera, telescope) REFERENCES pzDownloadExp(exp_name, camera, telescope),
+    FOREIGN KEY(exp_name, camera, telescope, class, class_id) REFERENCES summitImfile(exp_name, camera, telescope, class, class_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE newExp (
@@ -98,7 +95,6 @@
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY(exp_id, tmp_class_id),
-    FOREIGN KEY (exp_id)
-        REFERENCES  newExp(exp_id))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    FOREIGN KEY(exp_id) REFERENCES newExp(exp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE rawExp (
@@ -172,7 +168,6 @@
     KEY(end_stage),
     KEY(fault),
-    FOREIGN KEY (exp_id)
-        REFERENCES  newExp(exp_id))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    FOREIGN KEY(exp_id) REFERENCES newExp(exp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE rawImfile (
@@ -237,4 +232,5 @@
     ignored TINYINT DEFAULT 0,
     hostname VARCHAR(64),
+    quality SMALLINT NOT NULL DEFAULT 0,
     fault SMALLINT NOT NULL,
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
@@ -245,10 +241,8 @@
     KEY(fault),
     KEY(raw_image_id),
+    KEY(quality),
     UNIQUE KEY(exp_id, tmp_class_id),
-    FOREIGN KEY (exp_id, tmp_class_id)
-        REFERENCES newImfile(exp_id, tmp_class_id))
-ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE guidePendingExp (guide_id BIGINT AUTO_INCREMENT, exp_id BIGINT, recipe VARCHAR(64), PRIMARY KEY(guide_id), KEY(guide_id), KEY(exp_id)) ENGINE=innodb DEFAULT CHARSET=latin1;
+    FOREIGN KEY(exp_id, tmp_class_id) REFERENCES newImfile(exp_id, tmp_class_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE chipRun (
@@ -273,7 +267,6 @@
     KEY(end_stage),
     INDEX(chip_id, exp_id),
-    FOREIGN KEY (exp_id)
-        REFERENCES rawExp(exp_id))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE chipImfile (
@@ -283,6 +276,6 @@
     PRIMARY KEY(chip_id, class_id),
     KEY(chip_imfile_id),
-    FOREIGN KEY (chip_id) REFERENCES  chipRun(chip_id))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE chipProcessedImfile (
@@ -343,4 +336,5 @@
     n_cr INT,
     path_base VARCHAR(255),
+    quality SMALLINT NOT NULL DEFAULT 0,
     fault SMALLINT NOT NULL,
     magicked BIGINT,
@@ -348,14 +342,13 @@
     KEY(data_state),
     KEY(fault),
-    FOREIGN KEY (chip_id, exp_id)
-        REFERENCES  chipRun(chip_id, exp_id),
-    FOREIGN KEY (exp_id, class_id)
-        REFERENCES  rawImfile(exp_id, class_id))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    KEY(quality),
+    FOREIGN KEY(chip_id, exp_id) REFERENCES chipRun(chip_id, exp_id),
+    FOREIGN KEY(exp_id, class_id) REFERENCES rawImfile(exp_id, class_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE chipMask (
     label VARCHAR(64),
-    PRIMARY KEY(label))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    PRIMARY KEY(label)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE camRun (
@@ -380,7 +373,6 @@
     KEY(end_stage),
     INDEX(cam_id, chip_id),
-    FOREIGN KEY (chip_id)
-        REFERENCES chipRun(chip_id))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE camProcessedExp (
@@ -444,15 +436,16 @@
     n_astrom INT,
     path_base VARCHAR(255),
+    quality SMALLINT NOT NULL DEFAULT 0,
     fault SMALLINT NOT NULL,
     PRIMARY KEY(cam_id),
     KEY(fault),
-    FOREIGN KEY (cam_id)
-        REFERENCES camRun(cam_id))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    KEY(quality),
+    FOREIGN KEY(cam_id) REFERENCES camRun(cam_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE camMask (
     label VARCHAR(64),
-    PRIMARY KEY(label))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    PRIMARY KEY(label)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE fakeRun (
@@ -475,7 +468,6 @@
     KEY(end_stage),
     INDEX(fake_id, cam_id),
-    FOREIGN KEY (cam_id)
-        REFERENCES camRun(cam_id))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    FOREIGN KEY(cam_id) REFERENCES camRun(cam_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE fakeProcessedImfile (
@@ -493,14 +485,12 @@
     PRIMARY KEY(fake_id, exp_id, class_id),
     KEY(fault),
-    FOREIGN KEY (fake_id)
-        REFERENCES fakeRun(fake_id),
-    FOREIGN KEY (exp_id, class_id)
-        REFERENCES rawImfile(exp_id, class_id))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    FOREIGN KEY(fake_id) REFERENCES fakeRun(fake_id),
+    FOREIGN KEY(exp_id, class_id) REFERENCES rawImfile(exp_id, class_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE fakeMask (
     label VARCHAR(64),
-    PRIMARY KEY(label))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    PRIMARY KEY(label)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE detRun (
@@ -535,5 +525,4 @@
     ref_det_id BIGINT,
     ref_iter INT,
-    -- parent INT, :: dropping this
     PRIMARY KEY(det_id),
     KEY(det_id),
@@ -543,21 +532,18 @@
     KEY(state),
     KEY(label),
-    -- KEY(parent), :: dropping this
-    INDEX(det_id, iteration))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    INDEX(det_id, iteration)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE detInputExp (
-det_id BIGINT,
-iteration INT,
-exp_id BIGINT,
-include TINYINT,
-PRIMARY KEY(det_id, iteration, exp_id),
-INDEX(det_id, exp_id),
-INDEX(det_id, iteration),
-FOREIGN KEY (det_id)
-REFERENCES  detRun(det_id),
-FOREIGN KEY (exp_id)
-REFERENCES  rawExp(exp_id))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    det_id BIGINT,
+    iteration INT,
+    exp_id BIGINT,
+    include TINYINT,
+    PRIMARY KEY(det_id, iteration, exp_id),
+    INDEX(det_id, exp_id),
+    INDEX(det_id, iteration),
+    FOREIGN KEY(det_id) REFERENCES detRun(det_id),
+    FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE detProcessedImfile (
@@ -585,8 +571,6 @@
     INDEX(det_id, class_id),
     INDEX(det_id, exp_id),
-    FOREIGN KEY (det_id, exp_id)
-        REFERENCES  detInputExp(det_id, exp_id),
-    FOREIGN KEY (exp_id, class_id)
-        REFERENCES  rawImfile(exp_id, class_id)
+    FOREIGN KEY(det_id, exp_id) REFERENCES detInputExp(det_id, exp_id),
+    FOREIGN KEY(exp_id, class_id) REFERENCES rawImfile(exp_id, class_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -611,8 +595,6 @@
     PRIMARY KEY(det_id, exp_id),
     KEY(fault),
-    FOREIGN KEY (det_id, exp_id)
-        REFERENCES  detInputExp(det_id, exp_id),
-    FOREIGN KEY (det_id, exp_id)
-        REFERENCES  detProcessedImfile(det_id, exp_id)
+    FOREIGN KEY(det_id, exp_id) REFERENCES detInputExp(det_id, exp_id),
+    FOREIGN KEY(det_id, exp_id) REFERENCES detProcessedImfile(det_id, exp_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -635,8 +617,6 @@
     PRIMARY KEY(det_id, iteration, class_id),
     KEY(fault),
-    FOREIGN KEY (det_id, iteration)
-        REFERENCES  detInputExp(det_id, iteration),
-    FOREIGN KEY (det_id, class_id)
-        REFERENCES  detProcessedImfile(det_id, class_id)
+    FOREIGN KEY(det_id, iteration) REFERENCES detInputExp(det_id, iteration),
+    FOREIGN KEY(det_id, class_id) REFERENCES detProcessedImfile(det_id, class_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -650,8 +630,6 @@
     PRIMARY KEY(det_id, iteration, class_id),
     KEY(fault),
-    FOREIGN KEY (det_id, iteration)
-    REFERENCES  detInputExp(det_id, iteration),
-    FOREIGN KEY (det_id, iteration, class_id)
-    REFERENCES  detStackedImfile(det_id, iteration, class_id)
+    FOREIGN KEY(det_id, iteration) REFERENCES detInputExp(det_id, iteration),
+    FOREIGN KEY(det_id, iteration, class_id) REFERENCES  detStackedImfile(det_id, iteration, class_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -675,8 +653,6 @@
     KEY(fault),
     INDEX(det_id, iteration),
-    FOREIGN KEY (det_id)
-    REFERENCES  detInputExp(det_id),
-    FOREIGN KEY (det_id, iteration, class_id)
-    REFERENCES  detNormalizedStatImfile(det_id, iteration, class_id)
+    FOREIGN KEY(det_id) REFERENCES detInputExp(det_id),
+    FOREIGN KEY(det_id, iteration, class_id) REFERENCES detNormalizedStatImfile(det_id, iteration, class_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -698,8 +674,6 @@
     PRIMARY KEY(det_id, iteration),
     KEY(fault),
-    FOREIGN KEY (det_id, iteration)
-    REFERENCES  detInputExp(det_id, iteration),
-    FOREIGN KEY (det_id, iteration)
-    REFERENCES  detNormalizedImfile(det_id, iteration)
+    FOREIGN KEY(det_id, iteration) REFERENCES detInputExp(det_id, iteration),
+    FOREIGN KEY(det_id, iteration) REFERENCES detNormalizedImfile(det_id, iteration)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -736,8 +710,6 @@
     KEY(fault),
     INDEX(det_id, iteration, exp_id),
-    FOREIGN KEY (det_id, iteration, exp_id)
-    REFERENCES  detInputExp(det_id, iteration, exp_id),
-    FOREIGN KEY (det_id, exp_id, class_id)
-    REFERENCES  detProcessedImfile(det_id, exp_id, class_id)
+    FOREIGN KEY (det_id, iteration, exp_id) REFERENCES detInputExp(det_id, iteration, exp_id),
+    FOREIGN KEY (det_id, exp_id, class_id) REFERENCES detProcessedImfile(det_id, exp_id, class_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -771,8 +743,6 @@
        KEY(fault),
        INDEX(det_id, iteration),
-       FOREIGN KEY (det_id, iteration, exp_id)
-       REFERENCES  detInputExp(det_id, iteration, exp_id),
-       FOREIGN KEY (det_id, iteration, exp_id)
-       REFERENCES  detResidImfile(det_id, iteration, exp_id)
+       FOREIGN KEY(det_id, iteration, exp_id) REFERENCES detInputExp(det_id, iteration, exp_id),
+       FOREIGN KEY(det_id, iteration, exp_id) REFERENCES detResidImfile(det_id, iteration, exp_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -788,8 +758,6 @@
        PRIMARY KEY(det_id, iteration),
        KEY(fault),
-       FOREIGN KEY (det_id, iteration)
-         REFERENCES  detInputExp(det_id, iteration),
-       FOREIGN KEY (det_id, iteration)
-         REFERENCES  detResidExp(det_id, iteration)
+       FOREIGN KEY(det_id, iteration) REFERENCES detInputExp(det_id, iteration),
+       FOREIGN KEY(det_id, iteration) REFERENCES detResidExp(det_id, iteration)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -812,6 +780,5 @@
        PRIMARY KEY(det_id, iteration, class_id),
        KEY(fault),
-       FOREIGN KEY (det_id, iteration)
-         REFERENCES  detRun(det_id, iteration)
+       FOREIGN KEY(det_id, iteration) REFERENCES detRun(det_id, iteration)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -838,6 +805,5 @@
     KEY(end_stage),
     INDEX(warp_id, fake_id),
-    FOREIGN KEY (fake_id)
-        REFERENCES fakeRun(fake_id)
+    FOREIGN KEY(fake_id) REFERENCES fakeRun(fake_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -850,6 +816,5 @@
     PRIMARY KEY(warp_id, skycell_id, tess_id, class_id),
     KEY(fault),
-    FOREIGN KEY (warp_id)
-        REFERENCES warpRun(warp_id)
+    FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -860,6 +825,6 @@
     PRIMARY KEY(warp_id, skycell_id),
     KEY(warp_skyfile_id),
-    FOREIGN KEY (warp_id) REFERENCES  warpRun(warp_id))
-ENGINE=innodb DEFAULT CHARSET=latin1;
+    FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 
@@ -881,12 +846,12 @@
     ymin INT,
     ymax INT,
-    ignored TINYINT,
+    quality SMALLINT NOT NULL DEFAULT 0,
     fault SMALLINT,
     magicked TINYINT,
     PRIMARY KEY(warp_id, skycell_id, tess_id),
     KEY(good_frac),
-    KEY(ignored), KEY(fault),
-    FOREIGN KEY (warp_id, skycell_id, tess_id)
-        REFERENCES warpSkyCellMap(warp_id, skycell_id, tess_id)
+    KEY(fault),
+    KEY(quality),
+    FOREIGN KEY(warp_id, skycell_id, tess_id) REFERENCES warpSkyCellMap(warp_id, skycell_id, tess_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -918,6 +883,6 @@
         warp_id BIGINT,
         PRIMARY KEY(stack_id, warp_id),
-        FOREIGN KEY (stack_id)  REFERENCES  stackRun(stack_id),
-        FOREIGN KEY (warp_id)  REFERENCES  warpSkyfile(warp_id)
+        FOREIGN KEY(stack_id) REFERENCES stackRun(stack_id),
+        FOREIGN KEY(warp_id) REFERENCES warpSkyfile(warp_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -948,4 +913,5 @@
         hostname VARCHAR(64),
         good_frac FLOAT,
+        quality SMALLINT NOT NULL DEFAULT 0,
         fault SMALLINT,
         PRIMARY KEY(stack_id),
@@ -953,5 +919,6 @@
         KEY(good_frac),
         KEY(fault),
-        FOREIGN KEY (stack_id)  REFERENCES  stackRun(stack_id)
+        KEY(quality),
+        FOREIGN KEY(stack_id) REFERENCES stackRun(stack_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -971,5 +938,5 @@
         KEY(state),
         KEY(tess_id),
-        FOREIGN KEY (exp_id) REFERENCES rawExp(exp_id)
+        FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -991,9 +958,9 @@
         KEY(skycell_id),
         KEY(tess_id),
-        FOREIGN KEY (diff_id)  REFERENCES  diffRun(diff_id),
-        FOREIGN KEY (warp1, skycell_id, tess_id)  REFERENCES  warpSkyfile(warp_id, skycell_id, tess_id),
-        FOREIGN KEY (warp2, skycell_id, tess_id)  REFERENCES  warpSkyfile(warp_id, skycell_id, tess_id),
-        FOREIGN KEY (stack1)  REFERENCES  stackSumSkyfile(stack_id),
-        FOREIGN KEY (stack2)  REFERENCES  stackSumSkyfile(stack_id)
+        FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id),
+        FOREIGN KEY(warp1, skycell_id, tess_id) REFERENCES warpSkyfile(warp_id, skycell_id, tess_id),
+        FOREIGN KEY(warp2, skycell_id, tess_id) REFERENCES warpSkyfile(warp_id, skycell_id, tess_id),
+        FOREIGN KEY(stack1) REFERENCES stackSumSkyfile(stack_id),
+        FOREIGN KEY(stack2) REFERENCES stackSumSkyfile(stack_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1022,4 +989,5 @@
         hostname VARCHAR(64),
         good_frac FLOAT,
+        quality SMALLINT NOT NULL DEFAULT 0,
         fault SMALLINT,
         magicked TINYINT,
@@ -1027,5 +995,6 @@
         KEY(good_frac),
         KEY(fault),
-        FOREIGN KEY (diff_id)  REFERENCES  diffRun(diff_id)
+        KEY(quality),
+        FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1047,6 +1016,6 @@
         KEY(label),
         KEY(fault),
-        FOREIGN KEY (exp_id)  REFERENCES rawExp(exp_id),
-        FOREIGN KEY (diff_id) REFERENCES diffRun(diff_id)
+        FOREIGN KEY(exp_id)  REFERENCES rawExp(exp_id),
+        FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1056,6 +1025,6 @@
         node VARCHAR(64),
         PRIMARY KEY(magic_id, diff_id, node),
-        FOREIGN KEY (magic_id)  REFERENCES  magicRun(magic_id),
-        FOREIGN KEY (diff_id) REFERENCES diffRun(diff_id)
+        FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id),
+        FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1068,5 +1037,5 @@
         KEY(dep),
         INDEX(magic_id, node),
-        FOREIGN KEY (magic_id)  REFERENCES  magicRun(magic_id)
+        FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1077,6 +1046,6 @@
         fault SMALLINT,
         PRIMARY KEY(magic_id, node),
-        FOREIGN KEY (magic_id)  REFERENCES  magicRun(magic_id),
-        FOREIGN KEY (magic_id, node)  REFERENCES  magicTree(magic_id, node),
+        FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id),
+        FOREIGN KEY(magic_id, node) REFERENCES magicTree(magic_id, node),
         KEY(fault)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
@@ -1088,5 +1057,5 @@
         fault SMALLINT,
         PRIMARY KEY(magic_id),
-        FOREIGN KEY (magic_id)  REFERENCES  magicRun(magic_id),
+        FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id),
         KEY(fault)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
@@ -1109,5 +1078,5 @@
         KEY(magic_id),
         KEY(label),
-        FOREIGN KEY (magic_id)  REFERENCES  magicRun(magic_id)
+        FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1120,5 +1089,5 @@
     PRIMARY KEY(magic_ds_id, component),
     KEY(fault),
-    FOREIGN KEY (magic_ds_id) REFERENCES magicDSRun(magic_ds_id)
+    FOREIGN KEY(magic_ds_id) REFERENCES magicDSRun(magic_ds_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1139,5 +1108,5 @@
         KEY(cal_id),
         KEY(last_step),
-        FOREIGN KEY (cal_id)  REFERENCES  calDB(cal_id)
+        FOREIGN KEY(cal_id) REFERENCES calDB(cal_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1167,6 +1136,6 @@
         include TINYINT,
         PRIMARY KEY(corr_id, chip_id),
-        FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),
-        FOREIGN KEY (chip_id)  REFERENCES  chipRun(chip_id)
+        FOREIGN KEY(corr_id) REFERENCES flatcorrRun(corr_id),
+        FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1177,7 +1146,7 @@
         include TINYINT,
         PRIMARY KEY(corr_id, cam_id),
-        FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),
-        FOREIGN KEY (chip_id)  REFERENCES  chipRun(chip_id),
-        FOREIGN KEY (cam_id)  REFERENCES  camRun(cam_id)
+        FOREIGN KEY(corr_id) REFERENCES flatcorrRun(corr_id),
+        FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id),
+        FOREIGN KEY(cam_id) REFERENCES camRun(cam_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1231,9 +1200,9 @@
         PRIMARY KEY(job_id, req_id),
         KEY(job_id),
-        FOREIGN KEY (req_id)  REFERENCES  pstampRequest(req_id)
+        FOREIGN KEY(req_id) REFERENCES pstampRequest(req_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 CREATE TABLE distTarget (
-    target_id   BIGINT AUTO_INCREMENT, 
+    target_id   BIGINT AUTO_INCREMENT,
     obs_mode    VARCHAR(64),
     stage       VARCHAR(64),
@@ -1263,5 +1232,5 @@
 
 CREATE TABLE distComponent (
-    dist_id     BIGINT, 
+    dist_id     BIGINT,
     component   VARCHAR(64),
     bytes       INT,
@@ -1335,4 +1304,4 @@
 
 
--- This comment line is here to avoid empty query error. 
+-- This comment line is here to avoid empty query error.
 -- Another way to avoid that problem is to omit the semicolon above but I think that is untidy.