Skip to content

Commit

Permalink
Merge pull request #187 from lsst/tickets/DM-43011
Browse files Browse the repository at this point in the history
DM-43011: Set TAP table indices and supply missing column descriptions for DP0.3 schemas
  • Loading branch information
JeremyMcCormick committed Feb 26, 2024
2 parents eb1d092 + 38ff23a commit ed0c229
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 28 deletions.
36 changes: 22 additions & 14 deletions yml/dp03_10yr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ tables:
primaryKey: "#SSObject.ssObjectId"
mysql:engine: MyISAM
mysql:charset: utf8mb4
tap:table_index: 1
columns:
- name: ssObjectId
"@id": "#SSObject.ssObjectId"
Expand Down Expand Up @@ -359,8 +360,8 @@ tables:
ivoa:ucd: meta.code
- name: DiaSource
"@id": "#DiaSource"
description: Table to store 'difference image sources' - sources detected at SNR
>=5 on difference images.
description: "Table to store 'difference image sources' - sources detected at SNR >=5 on difference images."
tap:table_index: 3
columns:
- name: diaSourceId
"@id": "#DiaSource.diaSourceId"
Expand Down Expand Up @@ -395,6 +396,7 @@ tables:
- name: nameTrue
"@id": "#DiaSource.nameTrue"
datatype: char
description: MPC or simulation designation of the moving object
length: 20
mysql:datatype: CHAR(20)
- name: ssObjectReassocTime
Expand Down Expand Up @@ -455,6 +457,7 @@ tables:
- name: band
"@id": "#DiaSource.band"
datatype: char
description: Name of the band used to take the exposure where this source was measured
length: 1
mysql:datatype: CHAR(1)
- name: mag
Expand All @@ -470,14 +473,17 @@ tables:
- name: magTrueVband
"@id": "#DiaSource.magTrueVband"
datatype: float
description: True (noiseless) V-band magnitude of the simulated diaSource
mysql:datatype: FLOAT
- name: raTrue
"@id": "#DiaSource.raTrue"
datatype: double
description: True (noiseless) right ascension of the simulated diaSource
mysql:datatype: DOUBLE
- name: decTrue
"@id": "#DiaSource.decTrue"
datatype: double
description: True (noiseless) declination of the simulated diaSource
mysql:datatype: DOUBLE
primaryKey: "#DiaSource.diaSourceId"
indexes:
Expand Down Expand Up @@ -511,6 +517,7 @@ tables:
primaryKey: "#SSSource.ssObjectId"
mysql:engine: MyISAM
mysql:charset: utf8mb4
tap:table_index: 4
columns:
- name: ssObjectId
"@id": "#SSSource.ssObjectId"
Expand Down Expand Up @@ -616,73 +623,73 @@ tables:
- name: heliocentricX
"@id": "#SSSource.heliocentricX"
datatype: float
description: Cartesian heliocentric coordinates (at the emit time)
description: Cartesian heliocentric X coordinate (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: heliocentricY
"@id": "#SSSource.heliocentricY"
datatype: float
description: ''
description: Cartesian heliocentric Y coordinate (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: heliocentricZ
"@id": "#SSSource.heliocentricZ"
datatype: float
description: ''
description: Cartesian heliocentric Z coordinate (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: heliocentricVX
"@id": "#SSSource.heliocentricVX"
datatype: float
description: Cartesian heliocentric velocities (at the emit time)
description: Cartesian heliocentric X velocity (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: heliocentricVY
"@id": "#SSSource.heliocentricVY"
datatype: float
description: ''
description: Cartesian heliocentric Y velocity (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: heliocentricVZ
"@id": "#SSSource.heliocentricVZ"
datatype: float
description: ''
description: Cartesian heliocentric Z velocity (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: topocentricX
"@id": "#SSSource.topocentricX"
datatype: float
description: Cartesian topocentric coordinates (at the emit time)
description: Cartesian topocentric X coordinate (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: topocentricY
"@id": "#SSSource.topocentricY"
datatype: float
description: ''
description: Cartesian topocentric Y coordinate (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: topocentricZ
"@id": "#SSSource.topocentricZ"
datatype: float
description: ''
description: Cartesian topocentric Z coordinate (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: topocentricVX
"@id": "#SSSource.topocentricVX"
datatype: float
description: Cartesian topocentric velocities (at the emit time)
description: Cartesian topocentric X velocity (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: topocentricVY
"@id": "#SSSource.topocentricVY"
datatype: float
description: ''
description: Cartesian topocentric Y velocity (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: topocentricVZ
"@id": "#SSSource.topocentricVZ"
datatype: float
description: ''
description: Cartesian topocentric Z velocity (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
constraints:
Expand All @@ -701,6 +708,7 @@ tables:
primaryKey: "#MPCORB.mpcDesignation"
mysql:engine: MyISAM
mysql:charset: utf8mb4
tap:table_index: 2
columns:
- name: mpcDesignation
"@id": "#MPCORB.mpcDesignation"
Expand Down
36 changes: 22 additions & 14 deletions yml/dp03_1yr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ tables:
primaryKey: "#SSObject.ssObjectId"
mysql:engine: MyISAM
mysql:charset: utf8mb4
tap:table_index: 1
columns:
- name: ssObjectId
"@id": "#SSObject.ssObjectId"
Expand Down Expand Up @@ -359,8 +360,8 @@ tables:
ivoa:ucd: meta.code
- name: DiaSource
"@id": "#DiaSource"
description: Table to store 'difference image sources'; - sources detected at SNR
>=5 on difference images.
description: "Table to store 'difference image sources'; - sources detected at SNR >=5 on difference images."
tap:table_index: 3
columns:
- name: diaSourceId
"@id": "#DiaSource.diaSourceId"
Expand Down Expand Up @@ -395,6 +396,7 @@ tables:
- name: nameTrue
"@id": "#DiaSource.nameTrue"
datatype: char
description: MPC or simulation designation of the moving object
length: 20
mysql:datatype: CHAR(20)
- name: ssObjectReassocTime
Expand Down Expand Up @@ -455,6 +457,7 @@ tables:
- name: band
"@id": "#DiaSource.band"
datatype: char
description: Name of the band used to take the exposure where this source was measured
length: 1
mysql:datatype: CHAR(1)
- name: mag
Expand All @@ -470,14 +473,17 @@ tables:
- name: magTrueVband
"@id": "#DiaSource.magTrueVband"
datatype: float
description: True (noiseless) V-band magnitude of the simulated diaSource
mysql:datatype: FLOAT
- name: raTrue
"@id": "#DiaSource.raTrue"
datatype: double
description: True (noiseless) right ascension of the simulated diaSource
mysql:datatype: DOUBLE
- name: decTrue
"@id": "#DiaSource.decTrue"
datatype: double
description: True (noiseless) declination of the simulated diaSource
mysql:datatype: DOUBLE
primaryKey: "#DiaSource.diaSourceId"
indexes:
Expand All @@ -502,6 +508,7 @@ tables:
primaryKey: "#SSSource.ssObjectId"
mysql:engine: MyISAM
mysql:charset: utf8mb4
tap:table_index: 4
columns:
- name: ssObjectId
"@id": "#SSSource.ssObjectId"
Expand Down Expand Up @@ -607,73 +614,73 @@ tables:
- name: heliocentricX
"@id": "#SSSource.heliocentricX"
datatype: float
description: Cartesian heliocentric coordinates (at the emit time)
description: Cartesian heliocentric X coordinate (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: heliocentricY
"@id": "#SSSource.heliocentricY"
datatype: float
description: ''
description: Cartesian heliocentric Y coordinate (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: heliocentricZ
"@id": "#SSSource.heliocentricZ"
datatype: float
description: ''
description: Cartesian heliocentric Z coordinate (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: heliocentricVX
"@id": "#SSSource.heliocentricVX"
datatype: float
description: Cartesian heliocentric velocities (at the emit time)
description: Cartesian heliocentric X velocity (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: heliocentricVY
"@id": "#SSSource.heliocentricVY"
datatype: float
description: ''
description: Cartesian heliocentric Y velocity (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: heliocentricVZ
"@id": "#SSSource.heliocentricVZ"
datatype: float
description: ''
description: Cartesian heliocentric Z velocity (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: topocentricX
"@id": "#SSSource.topocentricX"
datatype: float
description: Cartesian topocentric coordinates (at the emit time)
description: Cartesian topocentric X coordinate (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: topocentricY
"@id": "#SSSource.topocentricY"
datatype: float
description: ''
description: Cartesian topocentric Y coordinate (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: topocentricZ
"@id": "#SSSource.topocentricZ"
datatype: float
description: ''
description: Cartesian topocentric Z coordinate (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: topocentricVX
"@id": "#SSSource.topocentricVX"
datatype: float
description: Cartesian topocentric velocities (at the emit time)
description: Cartesian topocentric X velocity (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: topocentricVY
"@id": "#SSSource.topocentricVY"
datatype: float
description: ''
description: Cartesian topocentric Y velocity (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: topocentricVZ
"@id": "#SSSource.topocentricVZ"
datatype: float
description: ''
description: Cartesian topocentric Z velocity (at the emit time)
mysql:datatype: FLOAT
fits:tunit: AU
- name: MPCORB
Expand All @@ -683,6 +690,7 @@ tables:
primaryKey: "#MPCORB.mpcDesignation"
mysql:engine: MyISAM
mysql:charset: utf8mb4
tap:table_index: 2
columns:
- name: mpcDesignation
"@id": "#MPCORB.mpcDesignation"
Expand Down

0 comments on commit ed0c229

Please sign in to comment.