Changeset 25816 for trunk/dbconfig

Timestamp:

Oct 8, 2009, 5:09:53 PM (17 years ago)

Author:

eugene

Message:

updates to the addstar stage; modify flatcorr to interact correctly with the addstar stage

Location:

trunk/dbconfig

Files:

• add.md (modified) (3 diffs)
• changes.txt (modified) (2 diffs)
• flatcorr.md (modified) (1 diff)

trunk/dbconfig/add.md

@@ +1 @@
+# XXX rename these 'addstarRun', etc... (add_id -> addstar_id)
 addRun METADATA
     add_id          S64     0       # Primary Key AUTO_INCREMENT
@@ -5 +6 @@
     workdir         STR     255
     workdir_state   STR     64
+    reduction       STR     64
     label           STR     64
     dvodb           STR     255
-    magicked        S64     0
+    image_only      BOOL    f
 END
 
@@ -13 +15 @@
     add_id          S64     0       # Primary Key AUTO_INCREMENT
     dtime_addstar   F32     0.0
-
-    n_stars         S32     0
-    
     path_base       STR     255
     fault           S16     0       # Key NOT NULL

trunk/dbconfig/changes.txt

@@ -1300 +1300 @@
 
 ALTER TABLE pstampJob ADD COLUMN options BIGINT;
+
+ALTER TABLE addRun ADD COLUMN reduction VARCHAR(64) AFTER workdir_state;
+ALTER TABLE addRun DROP COLUMN magicked;
+ALTER TABLE addRun ADD COLUMN image_only tinyint after dvodb;
+ALTER TABLE addProcessedExp DROP COLUMN n_stars;
+
+CREATE TABLE flatcorrAddstarLink (
+        corr_id BIGINT,
+        cam_id BIGINT,
+        add_id BIGINT,
+        include TINYINT,
+        PRIMARY KEY(corr_id, cam_id, add_id),
+        FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),
+        FOREIGN KEY (cam_id)  REFERENCES  camRun(cam_id),
+        FOREIGN KEY (add_id)  REFERENCES  addRun(add_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 ALTER TABLE pstampJob ADD COLUMN dep_id BIGINT;
 CREATE TABLE pstampDependent (
@@ -1311 +1328 @@
         PRIMARY KEY(dep_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
-

trunk/dbconfig/flatcorr.md

@@ -33 +33 @@
 END
 
+# table of exposures sent to addstar
+flatcorrAddstarLink METADATA
+    corr_id     S64         0       # Primary Key fkey(corr_id) ref flatcorrRun(corr_id)
+    cam_id      S64         0       # Primary Key fkey(chip_id) ref chipRun(chip_id)
+    add_id      S64         0       # Primary Key fkey(chip_id) ref chipRun(chip_id)
+    include     BOOL        t
+END
+