Index: branches/czw_branch/20100427/dbconfig/cam.md =================================================================== --- branches/czw_branch/20100427/dbconfig/cam.md (revision 27784) +++ branches/czw_branch/20100427/dbconfig/cam.md (revision 28017) @@ -14,4 +14,10 @@ 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,4 +97,10 @@ 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 Index: branches/czw_branch/20100427/dbconfig/changes.txt =================================================================== --- branches/czw_branch/20100427/dbconfig/changes.txt (revision 27784) +++ branches/czw_branch/20100427/dbconfig/changes.txt (revision 28017) @@ -1592,7 +1592,10 @@ 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,2 +1605,77 @@ 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; + Index: branches/czw_branch/20100427/dbconfig/chip.md =================================================================== --- branches/czw_branch/20100427/dbconfig/chip.md (revision 27784) +++ branches/czw_branch/20100427/dbconfig/chip.md (revision 28017) @@ -14,4 +14,10 @@ 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,4 +99,10 @@ 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 Index: branches/czw_branch/20100427/dbconfig/diff.md =================================================================== --- branches/czw_branch/20100427/dbconfig/diff.md (revision 27784) +++ branches/czw_branch/20100427/dbconfig/diff.md (revision 28017) @@ -15,4 +15,10 @@ 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,3 +68,9 @@ 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 Index: branches/czw_branch/20100427/dbconfig/ipp.m4 =================================================================== --- branches/czw_branch/20100427/dbconfig/ipp.m4 (revision 27784) +++ branches/czw_branch/20100427/dbconfig/ipp.m4 (revision 28017) @@ -21,4 +21,5 @@ include(stack.md) include(det.md) +include(label.md) include(magic.md) include(calibration.md) Index: branches/czw_branch/20100427/dbconfig/label.md =================================================================== --- branches/czw_branch/20100427/dbconfig/label.md (revision 28017) +++ branches/czw_branch/20100427/dbconfig/label.md (revision 28017) @@ -0,0 +1,6 @@ +Label METADATA + label STR 64 # Primary Key + priority S32 0 + active BOOL t + comment STR 80 +END Index: branches/czw_branch/20100427/dbconfig/pstamp.md =================================================================== --- branches/czw_branch/20100427/dbconfig/pstamp.md (revision 27784) +++ branches/czw_branch/20100427/dbconfig/pstamp.md (revision 28017) @@ -30,4 +30,5 @@ outProduct STR 64 uri STR 255 + outdir STR 255 fault S32 0 END @@ -55,4 +56,5 @@ rlabel STR 64 need_magic BOOL f + outdir STR 255 fault S16 0 END Index: branches/czw_branch/20100427/dbconfig/stack.md =================================================================== --- branches/czw_branch/20100427/dbconfig/stack.md (revision 27784) +++ branches/czw_branch/20100427/dbconfig/stack.md (revision 28017) @@ -14,4 +14,5 @@ tess_id STR 64 # Key filter STR 64 + software_ver STR 16 note STR 255 END @@ -49,4 +50,5 @@ good_frac F32 0.0 # Key fault S16 0 # Key + software_ver STR 16 quality S16 0 END Index: branches/czw_branch/20100427/dbconfig/staticsky.md =================================================================== --- branches/czw_branch/20100427/dbconfig/staticsky.md (revision 27784) +++ branches/czw_branch/20100427/dbconfig/staticsky.md (revision 28017) @@ -2,5 +2,5 @@ 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,10 +14,10 @@ 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 Index: branches/czw_branch/20100427/dbconfig/warp.md =================================================================== --- branches/czw_branch/20100427/dbconfig/warp.md (revision 27784) +++ branches/czw_branch/20100427/dbconfig/warp.md (revision 28017) @@ -25,4 +25,10 @@ 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,4 +68,10 @@ 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