Index: branches/czw_branch/20100519/dbconfig/cam.md =================================================================== --- branches/czw_branch/20100519/dbconfig/cam.md (revision 28044) +++ branches/czw_branch/20100519/dbconfig/cam.md (revision 28164) @@ -15,9 +15,14 @@ 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 + maskfrac_ref_npix S32 0 + maskfrac_ref_static F32 0.0 + maskfrac_ref_dynamic F32 0.0 + maskfrac_ref_magic F32 0.0 + maskfrac_ref_advisory F32 0.0 + maskfrac_max_npix S32 0 + maskfrac_max_static F32 0.0 + maskfrac_max_dynamic F32 0.0 + maskfrac_max_magic F32 0.0 + maskfrac_max_advisory F32 0.0 note STR 255 END @@ -98,9 +103,14 @@ 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 + maskfrac_ref_npix S32 0 + maskfrac_ref_static F32 0.0 + maskfrac_ref_dynamic F32 0.0 + maskfrac_ref_magic F32 0.0 + maskfrac_ref_advisory F32 0.0 + maskfrac_max_npix S32 0 + maskfrac_max_static F32 0.0 + maskfrac_max_dynamic F32 0.0 + maskfrac_max_magic F32 0.0 + maskfrac_max_advisory F32 0.0 quality S16 0 END Index: branches/czw_branch/20100519/dbconfig/changes.txt =================================================================== --- branches/czw_branch/20100519/dbconfig/changes.txt (revision 28044) +++ branches/czw_branch/20100519/dbconfig/changes.txt (revision 28164) @@ -1541,51 +1541,5 @@ ALTER TABLE distRun ADD COLUMN alternate TINYINT DEFAULT 0 AFTER no_magic; --- Tables for static sky analysis - --- A static sky analysis set -CREATE TABLE staticskyRun ( - ss_id BIGINT AUTO_INCREMENT, -- unique identifier - state VARCHAR(64) NOT NULL, -- state of run (new, full, etc.) - workdir VARCHAR(255) NOT NULL, -- working directory - label VARCHAR(64), -- processing label - data_group VARCHAR(64), -- group for data - dist_group VARCHAR(64), -- group for distribution - reduction VARCHAR(64), -- reduction class (for altering recipe) - note VARCHAR(255), -- note - registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered - PRIMARY KEY(ss_id), - KEY(state), - KEY(label), - KEY(data_group), - KEY(dist_group) -) ENGINE=innodb DEFAULT CHARSET=latin1; - --- Inputs for static sky analysis -CREATE TABLE staticskyInput ( - ss_id BIGINT, -- static sky identifier - stack_id BIGINT, -- stack identifier - PRIMARY KEY(ss_id,stack_id), - KEY(stack_id), - FOREIGN KEY(ss_id) REFERENCES staticskyRun(ss_id), - FOREIGN KEY(stack_id) REFERENCES stackSumSkyfile(stack_id) -) ENGINE=innodb DEFAULT CHARSET=latin1; - --- Result of static sky analysis -CREATE TABLE staticskyResult ( - ss_id BIGINT, -- static sky identifier - path_base VARCHAR(255) NOT NULL, -- root name for outputs - dtime_phot FLOAT, -- elapsed time for photometry - dtime_script FLOAT, -- elapsed time for script - sources INT, -- number of sources - hostname VARCHAR(64) NOT NULL, -- host that executed script - good_frac FLOAT, -- good fraction of skycell - quality SMALLINT NOT NULL, -- bad quality flag - fault SMALLINT NOT NULL, -- fault code - PRIMARY KEY(ss_id), - KEY(good_frac), - KEY(fault), - KEY(quality), - FOREIGN KEY(ss_id) REFERENCES staticskyRun(ss_id) -) ENGINE=innodb DEFAULT CHARSET=latin1; +-- staticsky tables were re-configured and the entry moved below ALTER TABLE pstampDependent ADD COLUMN component VARCHAR(64) after stage_id; @@ -1680,2 +1634,128 @@ ALTER TABLE diffSkyfile ADD COLUMN maskfrac_advisory FLOAT after maskfrac_magic; +ALTER TABLE chipRun CHANGE maskfrac_npix maskfrac_npix FLOAT; +ALTER TABLE camRun CHANGE maskfrac_npix maskfrac_npix FLOAT; +ALTER TABLE warpRun CHANGE maskfrac_npix maskfrac_npix FLOAT; +ALTER TABLE diffRun CHANGE maskfrac_npix maskfrac_npix FLOAT; + +ALTER TABLE camRun CHANGE maskfrac_npix maskfrac_ref_npix FLOAT; +ALTER TABLE camRun CHANGE maskfrac_static maskfrac_ref_static FLOAT; +ALTER TABLE camRun CHANGE maskfrac_dynamic maskfrac_ref_dynamic FLOAT; +ALTER TABLE camRun CHANGE maskfrac_magic maskfrac_ref_magic FLOAT; +ALTER TABLE camRun CHANGE maskfrac_advisory maskfrac_ref_advisory FLOAT; + +ALTER TABLE camProcessedExp CHANGE maskfrac_npix maskfrac_ref_npix INT; +ALTER TABLE camProcessedExp CHANGE maskfrac_static maskfrac_ref_static FLOAT; +ALTER TABLE camProcessedExp CHANGE maskfrac_dynamic maskfrac_ref_dynamic FLOAT; +ALTER TABLE camProcessedExp CHANGE maskfrac_magic maskfrac_ref_magic FLOAT; +ALTER TABLE camProcessedExp CHANGE maskfrac_advisory maskfrac_ref_advisory FLOAT; + +ALTER TABLE camRun ADD COLUMN maskfrac_max_npix FLOAT after maskfrac_ref_advisory; +ALTER TABLE camRun ADD COLUMN maskfrac_max_static FLOAT after maskfrac_max_npix; +ALTER TABLE camRun ADD COLUMN maskfrac_max_dynamic FLOAT after maskfrac_max_static; +ALTER TABLE camRun ADD COLUMN maskfrac_max_magic FLOAT after maskfrac_max_dynamic; +ALTER TABLE camRun ADD COLUMN maskfrac_max_advisory FLOAT after maskfrac_max_magic; + +ALTER TABLE camProcessedExp ADD COLUMN maskfrac_max_npix INT after maskfrac_ref_advisory; +ALTER TABLE camProcessedExp ADD COLUMN maskfrac_max_static FLOAT after maskfrac_max_npix; +ALTER TABLE camProcessedExp ADD COLUMN maskfrac_max_dynamic FLOAT after maskfrac_max_static; +ALTER TABLE camProcessedExp ADD COLUMN maskfrac_max_magic FLOAT after maskfrac_max_dynamic; +ALTER TABLE camProcessedExp ADD COLUMN maskfrac_max_advisory FLOAT after maskfrac_max_magic; + +-- these tables have not yet been used, and the definitions changed somewhat + +-- A static sky analysis set +CREATE TABLE staticskyRun ( + sky_id BIGINT AUTO_INCREMENT, -- unique identifier + state VARCHAR(64) NOT NULL, -- state of run (new, full, etc.) + workdir VARCHAR(255) NOT NULL, -- working directory + label VARCHAR(64), -- processing label + data_group VARCHAR(64), -- group for data + dist_group VARCHAR(64), -- group for distribution + reduction VARCHAR(64), -- reduction class (for altering recipe) + note VARCHAR(255), -- note + registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered + PRIMARY KEY(sky_id), + KEY(state), + KEY(label), + KEY(data_group), + KEY(dist_group) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +-- Inputs for static sky analysis +CREATE TABLE staticskyInput ( + sky_id BIGINT, -- static sky identifier + stack_id BIGINT, -- stack identifier + PRIMARY KEY(sky_id,stack_id), + KEY(stack_id), + FOREIGN KEY(sky_id) REFERENCES staticskyRun(sky_id), + FOREIGN KEY(stack_id) REFERENCES stackSumSkyfile(stack_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +-- Result of static sky analysis +CREATE TABLE staticskyResult ( + sky_id BIGINT, -- static sky identifier + path_base VARCHAR(255) NOT NULL, -- root name for outputs + dtime_phot FLOAT, -- elapsed time for photometry + dtime_script FLOAT, -- elapsed time for script + sources INT, -- number of sources + num_inputs INT, -- number inputs used + hostname VARCHAR(64) NOT NULL, -- host that executed script + good_frac FLOAT, -- good fraction of skycell + quality SMALLINT NOT NULL, -- bad quality flag + fault SMALLINT NOT NULL, -- fault code + PRIMARY KEY(sky_id), + KEY(good_frac), + KEY(fault), + KEY(quality), + FOREIGN KEY(sky_id) REFERENCES staticskyRun(sky_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + + +-- Version 1.1.69 +CREATE TABLE warpSummary ( + warp_id BIGINT, + tangent_plane VARCHAR(64) NOT NULL, + path_base VARCHAR(255) NOT NULL, + PRIMARY KEY(warp_id), + KEY(tangent_plane), + FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +CREATE TABLE diffSummary ( + diff_id BIGINT, + tangent_plane VARCHAR(64) NOT NULL, + path_base VARCHAR(255) NOT NULL, + PRIMARY KEY(diff_id), + KEY(tangent_plane), + FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +CREATE TABLE stackSummary ( + stack_id BIGINT, + tangent_plane VARCHAR(64) NOT NULL, + path_base VARCHAR(255) NOT NULL, + PRIMARY KEY(stack_id), + KEY(tangent_plane), + FOREIGN KEY(stack_id) REFERENCES stackRun(stack_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +CREATE TABLE stackAssociation ( + sass_id BIGINT AUTO_INCREMENT, + data_group VARCHAR(64) NOT NULL, + tangent_plane VARCHAR(64) NOT NULL, + tess_id VARCHAR(64) NOT NULL, + filter VARCHAR(64) NOT NULL, + PRIMARY KEY(sass_id), + KEY(data_group), + KEY(tangent_plane), + KEY(tess_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +CREATE TABLE stackAssociationMap ( + sass_id BIGINT, + stack_id BIGINT, + PRIMARY KEY(sass_id, stack_id), + FOREIGN KEY(sass_id) REFERENCES stackAssociation(sass_id), + FOREIGN KEY(stack_id) REFERENCES stackRun(stack_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; Index: branches/czw_branch/20100519/dbconfig/chip.md =================================================================== --- branches/czw_branch/20100519/dbconfig/chip.md (revision 28044) +++ branches/czw_branch/20100519/dbconfig/chip.md (revision 28164) @@ -15,5 +15,5 @@ magicked S64 0 software_ver STR 16 - maskfrac_npix S32 0 + maskfrac_npix F32 0.0 maskfrac_static F32 0.0 maskfrac_dynamic F32 0.0 Index: branches/czw_branch/20100519/dbconfig/diff.md =================================================================== --- branches/czw_branch/20100519/dbconfig/diff.md (revision 28044) +++ branches/czw_branch/20100519/dbconfig/diff.md (revision 28164) @@ -16,5 +16,5 @@ magicked S64 0 software_ver STR 16 - maskfrac_npix S32 0 + maskfrac_npix F32 0.0 maskfrac_static F32 0.0 maskfrac_dynamic F32 0.0 @@ -75,2 +75,8 @@ maskfrac_advisory F32 0.0 END + +diffSummary METADATA + diff_id S64 0 # Primary Key fkey(diff_id) ref diffRun(diff_id) + tangent_plane STR 32 # Primary Key + path_base STR 255 +END Index: branches/czw_branch/20100519/dbconfig/ipp.m4 =================================================================== --- branches/czw_branch/20100519/dbconfig/ipp.m4 (revision 28044) +++ branches/czw_branch/20100519/dbconfig/ipp.m4 (revision 28164) @@ -20,4 +20,5 @@ include(diff.md) include(stack.md) +include(staticsky.md) include(det.md) include(label.md) Index: branches/czw_branch/20100519/dbconfig/stack.md =================================================================== --- branches/czw_branch/20100519/dbconfig/stack.md (revision 28044) +++ branches/czw_branch/20100519/dbconfig/stack.md (revision 28164) @@ -53,2 +53,21 @@ quality S16 0 END + +stackSummary METADATA + stack_id S64 0 # Primary Key fkey(stack_id) ref stackRun(stack_id) + tangent_plane STR 32 # Primary Key + path_base STR 255 +END + +stackAssociation METADATA + sass_id S64 0 # Primary Key AUTO_INCREMENT + data_group STR 64 # Key + tangent_plane STR 64 # Key + tess_id STR 64 # Key + filter STR 64 +END + +stackAssociationMap METADATA + sass_id S64 0 # Primary Key fkey(sass_id) ref stackAssociation(sass_id) + stack_id S64 0 # Primary Key fkey(stack_id) ref stackRun(stack_id) +END Index: branches/czw_branch/20100519/dbconfig/staticsky.md =================================================================== --- branches/czw_branch/20100519/dbconfig/staticsky.md (revision 28044) +++ branches/czw_branch/20100519/dbconfig/staticsky.md (revision 28164) @@ -1,3 +1,4 @@ # Tables for static sky analysis +# XXX add tess_id and skycell_id here? staticskyRun METADATA @@ -24,4 +25,5 @@ dtime_script F32 0.0 sources S32 0 + num_inputs S32 0 hostname STR 64 good_frac F32 0.0 # Key Index: branches/czw_branch/20100519/dbconfig/warp.md =================================================================== --- branches/czw_branch/20100519/dbconfig/warp.md (revision 28044) +++ branches/czw_branch/20100519/dbconfig/warp.md (revision 28164) @@ -26,5 +26,5 @@ magicked S64 0 software_ver STR 16 - maskfrac_npix S32 0 + maskfrac_npix F32 0.0 maskfrac_static F32 0.0 maskfrac_dynamic F32 0.0 @@ -79,2 +79,8 @@ label STR 64 # Primary Key END + +warpSummary METADATA + warp_id S64 0 # Primary Key fkey(warp_id) ref warpRun(warp_id) + tangent_plane STR 32 # Primary Key + path_base STR 255 +END