Changeset 28164 for branches/czw_branch/20100519/dbconfig
- Timestamp:
- May 28, 2010, 3:09:59 PM (16 years ago)
- Location:
- branches/czw_branch/20100519
- Files:
-
- 9 edited
-
. (modified) (1 prop)
-
dbconfig/cam.md (modified) (2 diffs)
-
dbconfig/changes.txt (modified) (2 diffs)
-
dbconfig/chip.md (modified) (1 diff)
-
dbconfig/diff.md (modified) (2 diffs)
-
dbconfig/ipp.m4 (modified) (1 diff)
-
dbconfig/stack.md (modified) (1 diff)
-
dbconfig/staticsky.md (modified) (2 diffs)
-
dbconfig/warp.md (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/czw_branch/20100519
- Property svn:mergeinfo changed
/trunk (added) merged: 28046-28057,28062-28069,28072-28076,28079-28100
- Property svn:mergeinfo changed
-
branches/czw_branch/20100519/dbconfig/cam.md
r28043 r28164 15 15 magicked S64 0 16 16 software_ver STR 16 17 maskfrac_npix S32 0 18 maskfrac_static F32 0.0 19 maskfrac_dynamic F32 0.0 20 maskfrac_magic F32 0.0 21 maskfrac_advisory F32 0.0 17 maskfrac_ref_npix S32 0 18 maskfrac_ref_static F32 0.0 19 maskfrac_ref_dynamic F32 0.0 20 maskfrac_ref_magic F32 0.0 21 maskfrac_ref_advisory F32 0.0 22 maskfrac_max_npix S32 0 23 maskfrac_max_static F32 0.0 24 maskfrac_max_dynamic F32 0.0 25 maskfrac_max_magic F32 0.0 26 maskfrac_max_advisory F32 0.0 22 27 note STR 255 23 28 END … … 98 103 fault S16 0 # Key NOT NULL 99 104 software_ver STR 16 100 maskfrac_npix S32 0 101 maskfrac_static F32 0.0 102 maskfrac_dynamic F32 0.0 103 maskfrac_magic F32 0.0 104 maskfrac_advisory F32 0.0 105 maskfrac_ref_npix S32 0 106 maskfrac_ref_static F32 0.0 107 maskfrac_ref_dynamic F32 0.0 108 maskfrac_ref_magic F32 0.0 109 maskfrac_ref_advisory F32 0.0 110 maskfrac_max_npix S32 0 111 maskfrac_max_static F32 0.0 112 maskfrac_max_dynamic F32 0.0 113 maskfrac_max_magic F32 0.0 114 maskfrac_max_advisory F32 0.0 105 115 quality S16 0 106 116 END -
branches/czw_branch/20100519/dbconfig/changes.txt
r28043 r28164 1541 1541 ALTER TABLE distRun ADD COLUMN alternate TINYINT DEFAULT 0 AFTER no_magic; 1542 1542 1543 -- Tables for static sky analysis 1544 1545 -- A static sky analysis set 1546 CREATE TABLE staticskyRun ( 1547 ss_id BIGINT AUTO_INCREMENT, -- unique identifier 1548 state VARCHAR(64) NOT NULL, -- state of run (new, full, etc.) 1549 workdir VARCHAR(255) NOT NULL, -- working directory 1550 label VARCHAR(64), -- processing label 1551 data_group VARCHAR(64), -- group for data 1552 dist_group VARCHAR(64), -- group for distribution 1553 reduction VARCHAR(64), -- reduction class (for altering recipe) 1554 note VARCHAR(255), -- note 1555 registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered 1556 PRIMARY KEY(ss_id), 1557 KEY(state), 1558 KEY(label), 1559 KEY(data_group), 1560 KEY(dist_group) 1561 ) ENGINE=innodb DEFAULT CHARSET=latin1; 1562 1563 -- Inputs for static sky analysis 1564 CREATE TABLE staticskyInput ( 1565 ss_id BIGINT, -- static sky identifier 1566 stack_id BIGINT, -- stack identifier 1567 PRIMARY KEY(ss_id,stack_id), 1568 KEY(stack_id), 1569 FOREIGN KEY(ss_id) REFERENCES staticskyRun(ss_id), 1570 FOREIGN KEY(stack_id) REFERENCES stackSumSkyfile(stack_id) 1571 ) ENGINE=innodb DEFAULT CHARSET=latin1; 1572 1573 -- Result of static sky analysis 1574 CREATE TABLE staticskyResult ( 1575 ss_id BIGINT, -- static sky identifier 1576 path_base VARCHAR(255) NOT NULL, -- root name for outputs 1577 dtime_phot FLOAT, -- elapsed time for photometry 1578 dtime_script FLOAT, -- elapsed time for script 1579 sources INT, -- number of sources 1580 hostname VARCHAR(64) NOT NULL, -- host that executed script 1581 good_frac FLOAT, -- good fraction of skycell 1582 quality SMALLINT NOT NULL, -- bad quality flag 1583 fault SMALLINT NOT NULL, -- fault code 1584 PRIMARY KEY(ss_id), 1585 KEY(good_frac), 1586 KEY(fault), 1587 KEY(quality), 1588 FOREIGN KEY(ss_id) REFERENCES staticskyRun(ss_id) 1589 ) ENGINE=innodb DEFAULT CHARSET=latin1; 1543 -- staticsky tables were re-configured and the entry moved below 1590 1544 1591 1545 ALTER TABLE pstampDependent ADD COLUMN component VARCHAR(64) after stage_id; … … 1680 1634 ALTER TABLE diffSkyfile ADD COLUMN maskfrac_advisory FLOAT after maskfrac_magic; 1681 1635 1636 ALTER TABLE chipRun CHANGE maskfrac_npix maskfrac_npix FLOAT; 1637 ALTER TABLE camRun CHANGE maskfrac_npix maskfrac_npix FLOAT; 1638 ALTER TABLE warpRun CHANGE maskfrac_npix maskfrac_npix FLOAT; 1639 ALTER TABLE diffRun CHANGE maskfrac_npix maskfrac_npix FLOAT; 1640 1641 ALTER TABLE camRun CHANGE maskfrac_npix maskfrac_ref_npix FLOAT; 1642 ALTER TABLE camRun CHANGE maskfrac_static maskfrac_ref_static FLOAT; 1643 ALTER TABLE camRun CHANGE maskfrac_dynamic maskfrac_ref_dynamic FLOAT; 1644 ALTER TABLE camRun CHANGE maskfrac_magic maskfrac_ref_magic FLOAT; 1645 ALTER TABLE camRun CHANGE maskfrac_advisory maskfrac_ref_advisory FLOAT; 1646 1647 ALTER TABLE camProcessedExp CHANGE maskfrac_npix maskfrac_ref_npix INT; 1648 ALTER TABLE camProcessedExp CHANGE maskfrac_static maskfrac_ref_static FLOAT; 1649 ALTER TABLE camProcessedExp CHANGE maskfrac_dynamic maskfrac_ref_dynamic FLOAT; 1650 ALTER TABLE camProcessedExp CHANGE maskfrac_magic maskfrac_ref_magic FLOAT; 1651 ALTER TABLE camProcessedExp CHANGE maskfrac_advisory maskfrac_ref_advisory FLOAT; 1652 1653 ALTER TABLE camRun ADD COLUMN maskfrac_max_npix FLOAT after maskfrac_ref_advisory; 1654 ALTER TABLE camRun ADD COLUMN maskfrac_max_static FLOAT after maskfrac_max_npix; 1655 ALTER TABLE camRun ADD COLUMN maskfrac_max_dynamic FLOAT after maskfrac_max_static; 1656 ALTER TABLE camRun ADD COLUMN maskfrac_max_magic FLOAT after maskfrac_max_dynamic; 1657 ALTER TABLE camRun ADD COLUMN maskfrac_max_advisory FLOAT after maskfrac_max_magic; 1658 1659 ALTER TABLE camProcessedExp ADD COLUMN maskfrac_max_npix INT after maskfrac_ref_advisory; 1660 ALTER TABLE camProcessedExp ADD COLUMN maskfrac_max_static FLOAT after maskfrac_max_npix; 1661 ALTER TABLE camProcessedExp ADD COLUMN maskfrac_max_dynamic FLOAT after maskfrac_max_static; 1662 ALTER TABLE camProcessedExp ADD COLUMN maskfrac_max_magic FLOAT after maskfrac_max_dynamic; 1663 ALTER TABLE camProcessedExp ADD COLUMN maskfrac_max_advisory FLOAT after maskfrac_max_magic; 1664 1665 -- these tables have not yet been used, and the definitions changed somewhat 1666 1667 -- A static sky analysis set 1668 CREATE TABLE staticskyRun ( 1669 sky_id BIGINT AUTO_INCREMENT, -- unique identifier 1670 state VARCHAR(64) NOT NULL, -- state of run (new, full, etc.) 1671 workdir VARCHAR(255) NOT NULL, -- working directory 1672 label VARCHAR(64), -- processing label 1673 data_group VARCHAR(64), -- group for data 1674 dist_group VARCHAR(64), -- group for distribution 1675 reduction VARCHAR(64), -- reduction class (for altering recipe) 1676 note VARCHAR(255), -- note 1677 registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered 1678 PRIMARY KEY(sky_id), 1679 KEY(state), 1680 KEY(label), 1681 KEY(data_group), 1682 KEY(dist_group) 1683 ) ENGINE=innodb DEFAULT CHARSET=latin1; 1684 1685 -- Inputs for static sky analysis 1686 CREATE TABLE staticskyInput ( 1687 sky_id BIGINT, -- static sky identifier 1688 stack_id BIGINT, -- stack identifier 1689 PRIMARY KEY(sky_id,stack_id), 1690 KEY(stack_id), 1691 FOREIGN KEY(sky_id) REFERENCES staticskyRun(sky_id), 1692 FOREIGN KEY(stack_id) REFERENCES stackSumSkyfile(stack_id) 1693 ) ENGINE=innodb DEFAULT CHARSET=latin1; 1694 1695 -- Result of static sky analysis 1696 CREATE TABLE staticskyResult ( 1697 sky_id BIGINT, -- static sky identifier 1698 path_base VARCHAR(255) NOT NULL, -- root name for outputs 1699 dtime_phot FLOAT, -- elapsed time for photometry 1700 dtime_script FLOAT, -- elapsed time for script 1701 sources INT, -- number of sources 1702 num_inputs INT, -- number inputs used 1703 hostname VARCHAR(64) NOT NULL, -- host that executed script 1704 good_frac FLOAT, -- good fraction of skycell 1705 quality SMALLINT NOT NULL, -- bad quality flag 1706 fault SMALLINT NOT NULL, -- fault code 1707 PRIMARY KEY(sky_id), 1708 KEY(good_frac), 1709 KEY(fault), 1710 KEY(quality), 1711 FOREIGN KEY(sky_id) REFERENCES staticskyRun(sky_id) 1712 ) ENGINE=innodb DEFAULT CHARSET=latin1; 1713 1714 1715 -- Version 1.1.69 1716 CREATE TABLE warpSummary ( 1717 warp_id BIGINT, 1718 tangent_plane VARCHAR(64) NOT NULL, 1719 path_base VARCHAR(255) NOT NULL, 1720 PRIMARY KEY(warp_id), 1721 KEY(tangent_plane), 1722 FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id) 1723 ) ENGINE=innodb DEFAULT CHARSET=latin1; 1724 1725 CREATE TABLE diffSummary ( 1726 diff_id BIGINT, 1727 tangent_plane VARCHAR(64) NOT NULL, 1728 path_base VARCHAR(255) NOT NULL, 1729 PRIMARY KEY(diff_id), 1730 KEY(tangent_plane), 1731 FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id) 1732 ) ENGINE=innodb DEFAULT CHARSET=latin1; 1733 1734 CREATE TABLE stackSummary ( 1735 stack_id BIGINT, 1736 tangent_plane VARCHAR(64) NOT NULL, 1737 path_base VARCHAR(255) NOT NULL, 1738 PRIMARY KEY(stack_id), 1739 KEY(tangent_plane), 1740 FOREIGN KEY(stack_id) REFERENCES stackRun(stack_id) 1741 ) ENGINE=innodb DEFAULT CHARSET=latin1; 1742 1743 CREATE TABLE stackAssociation ( 1744 sass_id BIGINT AUTO_INCREMENT, 1745 data_group VARCHAR(64) NOT NULL, 1746 tangent_plane VARCHAR(64) NOT NULL, 1747 tess_id VARCHAR(64) NOT NULL, 1748 filter VARCHAR(64) NOT NULL, 1749 PRIMARY KEY(sass_id), 1750 KEY(data_group), 1751 KEY(tangent_plane), 1752 KEY(tess_id) 1753 ) ENGINE=innodb DEFAULT CHARSET=latin1; 1754 1755 CREATE TABLE stackAssociationMap ( 1756 sass_id BIGINT, 1757 stack_id BIGINT, 1758 PRIMARY KEY(sass_id, stack_id), 1759 FOREIGN KEY(sass_id) REFERENCES stackAssociation(sass_id), 1760 FOREIGN KEY(stack_id) REFERENCES stackRun(stack_id) 1761 ) ENGINE=innodb DEFAULT CHARSET=latin1; -
branches/czw_branch/20100519/dbconfig/chip.md
r28043 r28164 15 15 magicked S64 0 16 16 software_ver STR 16 17 maskfrac_npix S32017 maskfrac_npix F32 0.0 18 18 maskfrac_static F32 0.0 19 19 maskfrac_dynamic F32 0.0 -
branches/czw_branch/20100519/dbconfig/diff.md
r28043 r28164 16 16 magicked S64 0 17 17 software_ver STR 16 18 maskfrac_npix S32018 maskfrac_npix F32 0.0 19 19 maskfrac_static F32 0.0 20 20 maskfrac_dynamic F32 0.0 … … 75 75 maskfrac_advisory F32 0.0 76 76 END 77 78 diffSummary METADATA 79 diff_id S64 0 # Primary Key fkey(diff_id) ref diffRun(diff_id) 80 tangent_plane STR 32 # Primary Key 81 path_base STR 255 82 END -
branches/czw_branch/20100519/dbconfig/ipp.m4
r27856 r28164 20 20 include(diff.md) 21 21 include(stack.md) 22 include(staticsky.md) 22 23 include(det.md) 23 24 include(label.md) -
branches/czw_branch/20100519/dbconfig/stack.md
r28043 r28164 53 53 quality S16 0 54 54 END 55 56 stackSummary METADATA 57 stack_id S64 0 # Primary Key fkey(stack_id) ref stackRun(stack_id) 58 tangent_plane STR 32 # Primary Key 59 path_base STR 255 60 END 61 62 stackAssociation METADATA 63 sass_id S64 0 # Primary Key AUTO_INCREMENT 64 data_group STR 64 # Key 65 tangent_plane STR 64 # Key 66 tess_id STR 64 # Key 67 filter STR 64 68 END 69 70 stackAssociationMap METADATA 71 sass_id S64 0 # Primary Key fkey(sass_id) ref stackAssociation(sass_id) 72 stack_id S64 0 # Primary Key fkey(stack_id) ref stackRun(stack_id) 73 END -
branches/czw_branch/20100519/dbconfig/staticsky.md
r27962 r28164 1 1 # Tables for static sky analysis 2 # XXX add tess_id and skycell_id here? 2 3 3 4 staticskyRun METADATA … … 24 25 dtime_script F32 0.0 25 26 sources S32 0 27 num_inputs S32 0 26 28 hostname STR 64 27 29 good_frac F32 0.0 # Key -
branches/czw_branch/20100519/dbconfig/warp.md
r28043 r28164 26 26 magicked S64 0 27 27 software_ver STR 16 28 maskfrac_npix S32028 maskfrac_npix F32 0.0 29 29 maskfrac_static F32 0.0 30 30 maskfrac_dynamic F32 0.0 … … 79 79 label STR 64 # Primary Key 80 80 END 81 82 warpSummary METADATA 83 warp_id S64 0 # Primary Key fkey(warp_id) ref warpRun(warp_id) 84 tangent_plane STR 32 # Primary Key 85 path_base STR 255 86 END
Note:
See TracChangeset
for help on using the changeset viewer.
