Changeset 28017 for branches/czw_branch/20100427/dbconfig

Timestamp:

May 18, 2010, 5:06:01 PM (16 years ago)

Author:

watersc1

Message:

Almost working version of the mask-stats/software revision code.

Almost.

Location:

branches/czw_branch/20100427

Files:

• . (modified) (1 prop)
• dbconfig/cam.md (modified) (2 diffs)
• dbconfig/changes.txt (modified) (2 diffs)
• dbconfig/chip.md (modified) (2 diffs)
• dbconfig/diff.md (modified) (2 diffs)
• dbconfig/ipp.m4 (modified) (1 diff)
• dbconfig/label.md (copied) (copied from trunk/dbconfig/label.md )
• dbconfig/pstamp.md (modified) (2 diffs)
• dbconfig/stack.md (modified) (2 diffs)
• dbconfig/staticsky.md (modified) (2 diffs)
• dbconfig/warp.md (modified) (2 diffs)

branches/czw_branch/20100427/dbconfig/cam.md

@@ -14 +14 @@
     end_stage   STR         64      # Key
     magicked    S64         0
+    software_ver    STR         16
+    maskfrac_npix S32       0
+    maskfrac_static F32     0.0
+    maskfrac_dynamic F32    0.0
+    maskfrac_magic  F32     0.0
+    maskfrac_advisory F32   0.0
     note        STR         255
 END
@@ -91 +97 @@
     path_base      STR      255
     fault          S16      0       # Key NOT NULL
+    software_ver    STR         16
+    maskfrac_npix S32       0
+    maskfrac_static F32     0.0
+    maskfrac_dynamic F32    0.0
+    maskfrac_magic  F32     0.0
+    maskfrac_advisory F32   0.0
     quality        S16      0
 END

branches/czw_branch/20100427/dbconfig/changes.txt

@@ -1592 +1592 @@
 ALTER TABLE pstampDependent CHANGE COLUMN no_magic need_magic TINYINT;
 ALTER TABLE pstampDependent ADD COLUMN fault SMALLINT after need_magic;
+ALTER TABLE pstampDependent ADD COLUMN outdir VARCHAR(255) after imagedb;
 ALTER TABLE pstampDependent ADD KEY (state);
 ALTER TABLE pstampDependent ADD KEY (stage);
 ALTER TABLE pstampDependent ADD KEY (stage_id);
+ALTER TABLE pstampDependent ADD KEY (component);
+ALTER TABLE pstampDependent ADD KEY (imagedb);
 
 ALTER TABLE magicDSRun ADD KEY(stage);
@@ -1602 +1605 @@
 ALTER TABLE distTarget ADD KEY(stage), ADD KEY(dist_group), ADD KEY(filter), ADD KEY(state);
 
+-- Version 1.1.67
+
+CREATE TABLE Label (
+    label       VARCHAR(64),
+    priority    INT,
+    active      TINYINT,
+    comment     VARCHAR(80),
+    PRIMARY KEY(label),
+    KEY(priority),
+    KEY(active)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+ALTER TABLE pstampRequest ADD COLUMN outdir VARCHAR(64) after uri;
+
+-- Version 1.1.68
+ALTER TABLE chipRun ADD COLUMN software_ver VARCHAR(16) after magicked;
+ALTER TABLE chipRun ADD COLUMN maskfrac_npix INT after software_ver;
+ALTER TABLE chipRun ADD COLUMN maskfrac_static FLOAT after maskfrac_npix;
+ALTER TABLE chipRun ADD COLUMN maskfrac_dynamic FLOAT after maskfrac_static;
+ALTER TABLE chipRun ADD COLUMN maskfrac_magic FLOAT after maskfrac_dynamic;
+ALTER TABLE chipRun ADD COLUMN maskfrac_advisory FLOAT after maskfrac_magic;
+
+ALTER TABLE chipProcessedImfile ADD COLUMN software_ver VARCHAR(16) after magicked;
+ALTER TABLE chipProcessedImfile ADD COLUMN maskfrac_npix INT after software_ver;
+ALTER TABLE chipProcessedImfile ADD COLUMN maskfrac_static FLOAT after maskfrac_npix;
+ALTER TABLE chipProcessedImfile ADD COLUMN maskfrac_dynamic FLOAT after maskfrac_static;
+ALTER TABLE chipProcessedImfile ADD COLUMN maskfrac_magic FLOAT after maskfrac_dynamic;
+ALTER TABLE chipProcessedImfile ADD COLUMN maskfrac_advisory FLOAT after maskfrac_magic;
+
+ALTER TABLE camRun ADD COLUMN software_ver VARCHAR(16) after magicked;
+ALTER TABLE camRun ADD COLUMN maskfrac_npix INT after software_ver;
+ALTER TABLE camRun ADD COLUMN maskfrac_static FLOAT after maskfrac_npix;
+ALTER TABLE camRun ADD COLUMN maskfrac_dynamic FLOAT after maskfrac_static;
+ALTER TABLE camRun ADD COLUMN maskfrac_magic FLOAT after maskfrac_dynamic;
+ALTER TABLE camRun ADD COLUMN maskfrac_advisory FLOAT after maskfrac_magic;
+
+ALTER TABLE camProcessedExp ADD COLUMN software_ver VARCHAR(16) after fault;
+ALTER TABLE camProcessedExp ADD COLUMN maskfrac_npix INT after software_ver;
+ALTER TABLE camProcessedExp ADD COLUMN maskfrac_static FLOAT after maskfrac_npix;
+ALTER TABLE camProcessedExp ADD COLUMN maskfrac_dynamic FLOAT after maskfrac_static;
+ALTER TABLE camProcessedExp ADD COLUMN maskfrac_magic FLOAT after maskfrac_dynamic;
+ALTER TABLE camProcessedExp ADD COLUMN maskfrac_advisory FLOAT after maskfrac_magic;
+
+ALTER TABLE warpRun ADD COLUMN software_ver VARCHAR(16) after magicked;
+ALTER TABLE warpRun ADD COLUMN maskfrac_npix INT after software_ver;
+ALTER TABLE warpRun ADD COLUMN maskfrac_static FLOAT after maskfrac_npix;
+ALTER TABLE warpRun ADD COLUMN maskfrac_dynamic FLOAT after maskfrac_static;
+ALTER TABLE warpRun ADD COLUMN maskfrac_magic FLOAT after maskfrac_dynamic;
+ALTER TABLE warpRun ADD COLUMN maskfrac_advisory FLOAT after maskfrac_magic;
+
+ALTER TABLE warpSkyfile ADD COLUMN software_ver VARCHAR(16) after magicked;
+ALTER TABLE warpSkyfile ADD COLUMN maskfrac_npix INT after software_ver;
+ALTER TABLE warpSkyfile ADD COLUMN maskfrac_static FLOAT after maskfrac_npix;
+ALTER TABLE warpSkyfile ADD COLUMN maskfrac_dynamic FLOAT after maskfrac_static;
+ALTER TABLE warpSkyfile ADD COLUMN maskfrac_magic FLOAT after maskfrac_dynamic;
+ALTER TABLE warpSkyfile ADD COLUMN maskfrac_advisory FLOAT after maskfrac_magic;
+
+ALTER TABLE stackRun ADD COLUMN software_ver VARCHAR(16) after filter;
+
+ALTER TABLE stackSumSkyfile ADD COLUMN software_ver VARCHAR(16) after fault;
+
+ALTER TABLE diffRun ADD COLUMN software_ver VARCHAR(16) after magicked;
+ALTER TABLE diffRun ADD COLUMN maskfrac_npix INT after software_ver;
+ALTER TABLE diffRun ADD COLUMN maskfrac_static FLOAT after maskfrac_npix;
+ALTER TABLE diffRun ADD COLUMN maskfrac_dynamic FLOAT after maskfrac_static;
+ALTER TABLE diffRun ADD COLUMN maskfrac_magic FLOAT after maskfrac_dynamic;
+ALTER TABLE diffRun ADD COLUMN maskfrac_advisory FLOAT after maskfrac_magic;
+
+ALTER TABLE diffSkyfile ADD COLUMN software_ver VARCHAR(16) after magicked;
+ALTER TABLE diffSkyfile ADD COLUMN maskfrac_npix INT after software_ver;
+ALTER TABLE diffSkyfile ADD COLUMN maskfrac_static FLOAT after maskfrac_npix;
+ALTER TABLE diffSkyfile ADD COLUMN maskfrac_dynamic FLOAT after maskfrac_static;
+ALTER TABLE diffSkyfile ADD COLUMN maskfrac_magic FLOAT after maskfrac_dynamic;
+ALTER TABLE diffSkyfile ADD COLUMN maskfrac_advisory FLOAT after maskfrac_magic;
+

branches/czw_branch/20100427/dbconfig/chip.md

@@ -14 +14 @@
     end_stage   STR         64      # Key
     magicked    S64         0
+    software_ver    STR         16
+    maskfrac_npix S32       0
+    maskfrac_static F32     0.0
+    maskfrac_dynamic F32    0.0
+    maskfrac_magic  F32     0.0
+    maskfrac_advisory F32   0.0
     note        STR         255
 END
@@ -93 +99 @@
     quality         S16     0
     magicked        S64     0
+    software_ver    STR         16
+    maskfrac_npix S32       0
+    maskfrac_static F32     0.0
+    maskfrac_dynamic F32    0.0
+    maskfrac_magic  F32     0.0
+    maskfrac_advisory F32   0.0
 END
 

branches/czw_branch/20100427/dbconfig/diff.md

@@ -15 +15 @@
     exposure    BOOL        f
     magicked    S64         0
+    software_ver    STR         16
+    maskfrac_npix S32       0
+    maskfrac_static F32     0.0
+    maskfrac_dynamic F32    0.0
+    maskfrac_magic  F32     0.0
+    maskfrac_advisory F32   0.0
     diff_mode   S16         0
     note        STR         255
@@ -62 +68 @@
     quality      S16        0
     magicked    S64         0
+    software_ver     STR        16
+    maskfrac_npix S32       0
+    maskfrac_static F32     0.0
+    maskfrac_dynamic F32    0.0
+    maskfrac_magic  F32     0.0
+    maskfrac_advisory F32   0.0
 END

branches/czw_branch/20100427/dbconfig/ipp.m4

@@ -21 +21 @@
 include(stack.md)
 include(det.md)
+include(label.md)
 include(magic.md)
 include(calibration.md)

branches/czw_branch/20100427/dbconfig/pstamp.md

@@ -30 +30 @@
     outProduct  STR         64
     uri         STR         255
+    outdir      STR         255
     fault       S32         0
 END
@@ -55 +56 @@
     rlabel      STR         64
     need_magic  BOOL        f
+    outdir      STR         255
     fault       S16         0
 END

branches/czw_branch/20100427/dbconfig/stack.md

@@ -14 +14 @@
     tess_id     STR         64      # Key
     filter      STR         64
+    software_ver    STR         16
     note        STR         255
 END
@@ -49 +50 @@
     good_frac          F32    0.0     # Key
     fault              S16    0       # Key
+    software_ver    STR         16
     quality            S16    0
 END

branches/czw_branch/20100427/dbconfig/staticsky.md

@@ -2 +2 @@
 
 staticskyRun METADATA
-    ss_id       S64         0       # Primary Key AUTO_INCREMENT
+    sky_id      S64         0       # Primary Key AUTO_INCREMENT
     state       STR         64      # Key
     workdir     STR         255
@@ -14 +14 @@
 
 staticskyInput METADATA
-    ss_id       S64         0       # Primary Key fkey(ss_id) ref staticskyRun(ss_id)
+    sky_id      S64         0       # Primary Key fkey(sky_id) ref staticskyRun(sky_id)
     stack_id    S64         0       # Primary Key fkey(stack_id) ref stackSumSkyfile(stack_id)
 END
 
-staticSkyResult METADATA
-    ss_id              S64    0       # Primary Key fkey(ss_id) ref staticskyRun(ss_id)
+staticskyResult METADATA
+    sky_id             S64    0       # Primary Key fkey(sky_id) ref staticskyRun(sky_id)
     path_base          STR    255
     dtime_phot         F32    0.0

branches/czw_branch/20100427/dbconfig/warp.md

@@ -25 +25 @@
     registered  TAI         NULL
     magicked    S64         0
+    software_ver    STR         16
+    maskfrac_npix S32       0
+    maskfrac_static F32     0.0
+    maskfrac_dynamic F32    0.0
+    maskfrac_magic  F32     0.0
+    maskfrac_advisory F32   0.0
     note        STR         255
 END
@@ -62 +68 @@
     quality        S16      0
     magicked       S64      0
+    software_ver    STR         16
+    maskfrac_npix S32       0
+    maskfrac_static F32     0.0
+    maskfrac_dynamic F32    0.0
+    maskfrac_magic  F32     0.0
+    maskfrac_advisory F32   0.0
 END