Changeset 19325 for trunk/ippTools/share

Timestamp:

Sep 2, 2008, 9:37:06 AM (18 years ago)

Author:

eugene

Message:

substantial work on flatcorr; reworked the sequence somewhat

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• flatcorr_chiprundone.sql (added)
• flatcorr_pendingprocess.sql (added)
• pxadmin_create_tables.sql (modified) (2 diffs)

trunk/ippTools/share/Makefile.am

@@ -88 +88 @@
      faketool_revertprocessedimfile.sql \
      faketool_unmasked.sql \
-     flatcorr_completely_processed_chiprun.sql \
-     flatcorr_create_tmp_chiprundone.sql \
-     flatcorr_find_completed_floatcorruns.sql \
-     flatcorr_find_processedimfiles.sql \
-     flatcorr_pending.sql \
+     flatcorr_chiprundone.sql \
+     flatcorr_pendingprocess.sql \
      magictool_addmask.sql \
      magictool_create_tmp_warpcomplete.sql \

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -976 +976 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
-CREATE TABLE flatcorrExp (
+-- XXX deprecate this table
+-- CREATE TABLE flatcorrExp (
+--         corr_id BIGINT,
+--         chip_id BIGINT,
+--         PRIMARY KEY(corr_id, chip_id),
+--         FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),
+--         FOREIGN KEY (chip_id)  REFERENCES  chipRun(chip_id)
+-- ) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+-- these two tables link the flatcorrRun to the associated chip and camera runs
+CREATE TABLE flatcorrChipLink (
         corr_id BIGINT,
         chip_id BIGINT,
@@ -982 +992 @@
         FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),
         FOREIGN KEY (chip_id)  REFERENCES  chipRun(chip_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE flatcorrCamLink (
+        corr_id BIGINT,
+        cam_id BIGINT,
+        PRIMARY KEY(corr_id, cam_id),
+        FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),
+        FOREIGN KEY (cam_id)  REFERENCES  camRun(cam_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;