Changeset 23688 for trunk/dbconfig

Timestamp:

Apr 2, 2009, 2:51:37 PM (17 years ago)

Author:

Paul Price

Message:

Merging in branches/pap/ from r23685. Some conflicts, most notably in ippTools, but these resolved fairly simply. Only question mark is on regtool reversion, but I think I got it right. Everything builds fine.

Location:

trunk

Files:

• . (modified) (1 prop)
• dbconfig/cam.md (modified) (1 diff)
• dbconfig/changes.txt (modified) (4 diffs)
• dbconfig/chip.md (modified) (1 diff)
• dbconfig/config.md (modified) (1 diff)
• dbconfig/diff.md (modified) (1 diff)
• dbconfig/guide.md (deleted)
• dbconfig/ipp.m4 (modified) (1 diff)
• dbconfig/new.md (copied) (copied from branches/pap/dbconfig/new.md )
• dbconfig/raw.md (copied) (copied from branches/pap/dbconfig/raw.md )
• dbconfig/stack.md (modified) (1 diff)
• dbconfig/summitcopy.md (copied) (copied from branches/pap/dbconfig/summitcopy.md )
• dbconfig/tasks.md (deleted)
• dbconfig/warp.md (modified) (1 diff)

trunk/dbconfig/cam.md

@@ -87 +87 @@
     path_base      STR      255
     fault          S16      0       # Key NOT NULL
+    quality        S16      0
 END
 

trunk/dbconfig/changes.txt

@@ -899 +899 @@
 update chipRun SET magicked = 1 where chip_id = 11955;
 
+
+-- Version 1.1.51
+
+-- Distribution updates
 CREATE TABLE distTarget (
     target_id   BIGINT AUTO_INCREMENT,
@@ -908 +912 @@
     PRIMARY KEY(target_id)
 )  ENGINE=innodb DEFAULT CHARSET=latin1;
-
 
 CREATE TABLE rcDSProduct (
@@ -931 +934 @@
 )  ENGINE=innodb DEFAULT CHARSET=latin1;
 
-
 CREATE TABLE rcInterest (
     int_id      BIGINT AUTO_INCREMENT,
@@ -967 +969 @@
 )  ENGINE=innodb DEFAULT CHARSET=latin1;
 
--- 1.1.51
-
 ALTER TABLE distRun ADD COLUMN no_magic TINYINT AFTER clean;
+
+
+-- Adding data quality flags
+DROP TABLE guidePendingExp;
+ALTER TABLE diffSkyfile ADD COLUMN quality SMALLINT NOT NULL DEFAULT 0 AFTER fault;
+ALTER TABLE stackSumSkyfile ADD COLUMN quality SMALLINT NOT NULL DEFAULT 0 AFTER fault;
+ALTER TABLE warpSkyfile ADD COLUMN quality SMALLINT NOT NULL DEFAULT 0 AFTER fault;
+ALTER TABLE camProcessedExp ADD COLUMN quality SMALLINT NOT NULL DEFAULT 0 AFTER fault;
+ALTER TABLE chipProcessedImfile ADD COLUMN quality SMALLINT NOT NULL DEFAULT 0 AFTER fault;
+ALTER TABLE rawImfile ADD COLUMN quality SMALLINT NOT NULL DEFAULT 0 AFTER fault;
+
+ALTER TABLE warpSkyfile DROP COLUMN ignored;
+
+ALTER TABLE diffSkyfile ADD KEY(quality);
+ALTER TABLE stackSumSkyfile ADD KEY(quality);
+ALTER TABLE warpSkyfile ADD KEY(quality);
+ALTER TABLE camProcessedExp ADD KEY(quality);
+ALTER TABLE chipProcessedImfile ADD KEY(quality);
+ALTER TABLE rawImfile ADD KEY(quality);
+
+-- Version 1.1.52

trunk/dbconfig/chip.md

@@ -88 +88 @@
     path_base       STR     255
     fault           S16     0       # Key NOT NULL
+    quality         S16     0
     magicked        BOOL    f
 END

trunk/dbconfig/config.md

@@ -2 +2 @@
     pkg_name        STR     ippdb
     pkg_namespace   STR     ippdb
-    pkg_version     STR     1.1.50
+    pkg_version     STR     1.1.52
 END

trunk/dbconfig/diff.md

@@ -54 +54 @@
     good_frac    F32        0.0     # Key
     fault        S16        0       # Key
+    quality      S16        0
     magicked     BOOL       f
 END

trunk/dbconfig/ipp.m4

@@ -9 +9 @@
 dnl include(telescope.md)
 dnl include(skycell.md)
-include(tasks.md)
-include(guide.md)
+include(summitcopy.md)
+include(new.md)
+include(raw.md)
 include(chip.md)
 include(cam.md)

trunk/dbconfig/stack.md

@@ -46 +46 @@
     good_frac          F32    0.0     # Key
     fault              S16    0       # Key
+    quality            S16    0
 END

trunk/dbconfig/warp.md

@@ -55 +55 @@
     ymin           S32      0
     ymax           S32      0
-    ignored        BOOL     f       # Key
     fault          S16      0       # Key
+    quality        S16      0
     magicked       BOOL     f
 END