Skip to content

Commit

Permalink
Merge branch 'tickets/DM-34814'
Browse files Browse the repository at this point in the history
  • Loading branch information
fritzm committed May 27, 2022
2 parents 5f00ee2 + 17a467c commit 390a576
Show file tree
Hide file tree
Showing 8 changed files with 1,217 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tap-schema/build-all
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
./build stable ../yml/hsc.yaml ../yml/wise_01.yml ../yml/dp01_dc2.yaml ../yml/dp02_dc2_preops-863.yaml
./build int ../yml/hsc.yaml ../yml/wise_01.yml ../yml/dp01_dc2.yaml ../yml/dp02_dc2_preops-863.yaml
./build idfprod ../yml/dp01_dc2.yaml
./build idfint ../yml/dp01_dc2.yaml ../yml/dp02_dc2_preops-863.yaml ../yml/dp02_dc2.yaml
./build idfint ../yml/dp01_dc2.yaml ../yml/dp02_dc2_preops-863.yaml ../yml/dp02_dc2.yaml ../yml/dp02_obscore.yaml
312 changes: 312 additions & 0 deletions yml/dp02_obscore.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,312 @@
---
name: ivoa
"@id": "#ivoa_obscore"
description: ObsCore v1.1 attributes in ObsTAP realization
tables:
- name: ObsCore
"@id": "#ObsCore"
description: Observation metadata in the ObsTAP relational realization of
the IVOA ObsCore data model
columns:
- name: dataproduct_type
"@id": "ObsCore.dataproduct_type"
description: Data product (file content) primary type
nullable: true
ivoa:ucd: meta.code.class
votable:utype: ObsDataset.dataProductType
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: char
votable:arraysize: 128
- name: dataproduct_subtype
"@id": "ObsCore.dataproduct_subtype"
description: Data product specific type
nullable: true
ivoa:ucd: meta.code.class
votable:utype: ObsDataset.dataProductSubtype
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: char
votable:arraysize: 64
- name: facility_name
"@id": "ObsCore.facility_name"
description: The name of the facility, telescope, or space craft used for the observation
nullable: true
ivoa:ucd: meta.id;instr.tel
votable:utype: Provenance.ObsConfig.Facility.name
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: char
votable:arraysize: 128
- name: calib_level
"@id": "ObsCore.calib_level"
description: "Calibration level of the observation: in {0, 1, 2, 3, 4}"
nullable: false
ivoa:ucd: meta.code;obs.calib
votable:utype: ObsDataset.calibLevel
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: int
- name: target_name
"@id": "ObsCore.target_name"
description: Object of interest
nullable: true
ivoa:ucd: meta.id;src
votable:utype: Target.name
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: char
votable:arraysize: 32
- name: obs_id
"@id": "ObsCore.obs_id"
description: Internal ID given by the ObsTAP service
nullable: false
ivoa:ucd: meta.id
votable:utype: DataID.observationID
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: char
votable:arraysize: 128
- name: obs_collection
"@id": "ObsCore.obs_collection"
description: Name of the data collection
nullable: false
ivoa:ucd: meta.id
votable:utype: DataID.collection
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: char
votable:arraysize: 128
- name: obs_publisher_did
"@id": "ObsCore.obs_publisher_did"
description: ID for the Dataset given by the publisher
nullable: false
ivoa:ucd: meta.ref.ivoid
votable:utype: Curation.publisherDID
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: char
votable:arraysize: 256
- name: access_url
"@id": "ObsCore.access_url"
description: URL used to access dataset
nullable: true
ivoa:ucd: meta.ref.url
votable:utype: Access.reference
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: char
votable:arraysize: "*"
- name: access_format
"@id": "ObsCore.access_format"
description: Content format of the dataset
nullable: true
ivoa:ucd: meta.code.mime
votable:utype: Access.format
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: char
votable:arraysize: 128
- name: s_ra
"@id": "ObsCore.s_ra"
description: Central Spatial Position in ICRS; Right ascension
nullable: true
ivoa:ucd: pos.eq.ra
votable:utype: Char.SpatialAxis.Coverage.Location.Coord.Position2D.Value2.C1
tap:std: 1
tap:principal: 1
ivoa:unit: deg
datatype: double
- name: s_dec
"@id": "ObsCore.s_dec"
description: Central Spatial Position in ICRS; Declination
nullable: true
ivoa:ucd: pos.eq.dec
votable:utype: Char.SpatialAxis.Coverage.Location.Coord.Position2D.Value2.C2
tap:std: 1
tap:principal: 1
ivoa:unit: deg
datatype: double
- name: s_fov
"@id": "ObsCore.s_fov"
description: Estimated size of the covered region as the diameter of a containing circle
nullable: true
ivoa:ucd: phys.angSize;instr.fov
votable:utype: Char.SpatialAxis.Coverage.Bounds.Extent.diameter
tap:std: 1
tap:principal: 1
ivoa:unit: deg
datatype: double
- name: s_region
"@id": "ObsCore.s_region"
description: Sky region covered by the data product (expressed in ICRS frame)
nullable: true
ivoa:ucd: pos.outline;obs.field
votable:utype: Char.SpatialAxis.Coverage.Support.Area
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: char
votable:arraysize: 512
- name: s_resolution
"@id": "ObsCore.s_resolution"
description: Spatial resolution of data as FWHM of PSF
nullable: true
ivoa:ucd: pos.angResolution
votable:utype: Char.SpatialAxis.Resolution.Refval.value
tap:std: 1
tap:principal: 1
ivoa:unit: arcsec
datatype: double
- name: s_xel1
"@id": "ObsCore.s_xel1"
description: Number of elements along the first coordinate of the spatial axis
nullable: true
ivoa:ucd: meta.number
votable:utype: Char.SpatialAxis.numBins1
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: long
- name: s_xel2
"@id": "ObsCore.s_xel2"
description: Number of elements along the second coordinate of the spatial axis
nullable: true
ivoa:ucd: meta.number
votable:utype: Char.SpatialAxis.numBins2
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: long
- name: t_xel
"@id": "ObsCore.t_xel"
description: Number of elements along the time axis
nullable: true
ivoa:ucd: meta.number
votable:utype: Char.TimeAxis.numBins
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: long
- name: t_min
"@id": "ObsCore.t_min"
description: Start time in MJD
nullable: true
ivoa:ucd: time.start;obs.exposure
votable:utype: Char.TimeAxis.Coverage.Bounds.Limits.StartTime
tap:std: 1
tap:principal: 1
ivoa:unit: d
datatype: double
- name: t_max
"@id": "ObsCore.t_max"
description: Stop time in MJD
nullable: true
ivoa:ucd: time.end;obs.exposure
votable:utype: Char.TimeAxis.Coverage.Bounds.Limits.StopTime
tap:std: 1
tap:principal: 1
ivoa:unit: d
datatype: double
- name: t_exptime
"@id": "ObsCore.t_exptime"
description: Total exposure time
nullable: true
ivoa:ucd: time.duration;obs.exposure
votable:utype: Char.TimeAxis.Coverage.Support.Extent
tap:std: 1
tap:principal: 1
ivoa:unit: s
datatype: double
- name: t_resolution
"@id": "ObsCore.t_resolution"
description: Temporal resolution FWHM
nullable: true
ivoa:ucd: time.resolution
votable:utype: Char.TimeAxis.Resolution.Refval.value
tap:std: 1
tap:principal: 1
ivoa:unit: s
datatype: double
- name: em_xel
"@id": "ObsCore.em_xel"
description: Number of elements along the spectral axis
nullable: true
ivoa:ucd: meta.number
votable:utype: Char.SpectralAxis.numBins
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: long
- name: em_min
"@id": "ObsCore.em_min"
description: start in spectral coordinates
nullable: true
ivoa:ucd: em.wl;stat.min
votable:utype: Char.SpectralAxis.Coverage.Bounds.Limits.LoLimit
tap:std: 1
tap:principal: 1
ivoa:unit: m
datatype: double
- name: em_max
"@id": "ObsCore.em_max"
description: stop in spectral coordinates
nullable: true
ivoa:ucd: em.wl;stat.max
votable:utype: Char.SpectralAxis.Coverage.Bounds.Limits.HiLimit
tap:std: 1
tap:principal: 1
ivoa:unit: m
datatype: double
- name: em_res_power
"@id": "ObsCore.em_res_power"
description: Value of the resolving power along the spectral axis (R)
nullable: true
ivoa:ucd: spect.resolution
votable:utype: Char.SpectralAxis.Resolution.ResolPower.refVal
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: double
- name: o_ucd
"@id": "ObsCore.o_ucd"
description: Nature of the observable axis
nullable: true
ivoa:ucd: meta.ucd
votable:utype: Char.ObservableAxis.ucd
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: char
votable:arraysize: 32
- name: pol_xel
"@id": "ObsCore.pol_xel"
description: Number of elements along the polarization axis
nullable: true
ivoa:ucd: meta.number
votable:utype: Char.PolarizationAxis.numBins
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: long
- name: instrument_name
"@id": "ObsCore.instrument_name"
description: The name of the instrument used for the observation
nullable: true
ivoa:ucd: meta.id;instr
votable:utype: Provenance.ObsConfig.Instrument.name
tap:std: 1
tap:principal: 1
ivoa:unit:
datatype: char
votable:arraysize: 128
61 changes: 61 additions & 0 deletions yml/ivoa/ObsCore-v1.1-descriptions.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
Column Name,Utype,Unit,Type,Description,MAN
dataproduct_type,ObsDataset.dataProductType,unitless,enum string,Data product (file content) primary type,YES
dataproduct_subtype,ObsDataset.dataProductSubtype,unitless,string,Data product specific type,NO
calib_level,ObsDataset.calibLevel,unitless,"enum int","Calibration level of the observation: in {0, 1, 2, 3, 4}",YES
target_name,Target.name,unitless,string,Object of interest,YES
target_class,Target.class,unitless,string,Class of the Target object as in SSA,NO
obs_id,DataID.observationID,unitless,string,Internal ID given by the ObsTAP service,YES
obs_title,DataID.title,unitless,string,Brief description of dataset in free format,NO
obs_collection,DataID.collection,unitless,string,Name of the data collection,YES
obs_creation_date,DataID.date,unitless,date,Date when the dataset was created,NO
obs_creator_name,DataID.creator,unitless,string,Name of the creator of the data,NO
obs_creator_did,DataID.creatorDID,unitless,string,IVOA dataset identifier given by the creator,NO
obs_release_date,Curation.releaseDate,unitless,date,Observation release date (ISO 8601),NO
obs_publisher_did,Curation.publisherDID,unitless,string,ID for the Dataset given by the publisher,YES
publisher_id,Curation.publisherID,unitless,string,IVOA-ID for the Publisher,NO
bib_reference,Curation.reference,unitless,string,Service bibliographic reference,NO
data_rights,Curation.rights,unitless,enum string,Public/Secure/Proprietary/,NO
access_url,Access.reference,unitless,string,URL used to access dataset,YES
access_format,Access.format,unitless,string,Content format of the dataset,YES
access_estsize,Access.size,kbyte,int,Estimated size of dataset: in kilobytes,YES
s_ra,Char.SpatialAxis.Coverage.Location.Coord.Position2D.Value2.C1,deg,double,"Central Spatial Position in ICRS; Right ascension",YES
s_dec,Char.SpatialAxis.Coverage.Location.Coord.Position2D.Value2.C2,deg,double,"Central Spatial Position in ICRS; Declination",YES
s_fov,Char.SpatialAxis.Coverage.Bounds.Extent.diameter,deg,double,Estimated size of the covered region as the diameter of a containing circle,YES
s_region,Char.SpatialAxis.Coverage.Support.Area,unitless,string,Sky region covered by the data product (expressed in ICRS frame),YES
s_resolution,Char.SpatialAxis.Resolution.Refval.value,arcsec,double,Spatial resolution of data as FWHM of PSF,YES
s_xel1,Char.SpatialAxis.numBins1,unitless,integer,Number of elements along the first coordinate of the spatial axis,YES
s_xel2,Char.SpatialAxis.numBins2,unitless,integer,Number of elements along the second coordinate of the spatial axis,YES
s_ucd,Char.SpatialAxis.ucd,unitless,string,"UCD for the nature of the spatial axis (pos or u,v data)",NO
s_unit,Char.SpatialAxis.unit,unitless,string,Unit used for spatial axis,NO
s_resolution_min,Char.SpatialAxis.Resolution.Bounds.Limits.LoLimit,arcsec,double,Resolution min value on spatial axis (FHWM of PSF),NO
s_resolution_max,Char.SpatialAxis.Resolution.Bounds.Limits.HiLimit,arcsec,double,Resolution max value on spatial axis,NO
s_calib_status,Char.SpatialAxis.calibrationStatus,unitless,Enum string,Type of calibration along the spatial axis,NO
s_stat_error,Char.SpatialAxis.Accuracy.StatError.Refval.value,arcsec,double,Astrometric precision along the spatial axis,NO
s_pixel_scale,Char.SpatialAxis.Sampling.RefVal.SamplingPeriod,arcsec,double,Sampling period in world coordinate units along the spatial axis,NO
t_xel,Char.TimeAxis.numBins,unitless,integer,Number of elements along the time axis,YES
t_min,Char.TimeAxis.Coverage.Bounds.Limits.StartTime,d,double,Start time in MJD,YES
t_max,Char.TimeAxis.Coverage.Bounds.Limits.StopTime,d,double,Stop time in MJD,YES
t_exptime,Char.TimeAxis.Coverage.Support.Extent,s,double,Total exposure time,YES
t_resolution,Char.TimeAxis.Resolution.Refval.value,s,double,Temporal resolution FWHM,YES
t_calib_status,Char.TimeAxis.calibrationStatus,unitless,Enum string,Type of time coordinate calibration,NO
t_stat_error,Char.TimeAxis.Accuracy.StatError.Refval.value,s,double,Time coord statistical error,NO
em_xel,Char.SpectralAxis.numBins,unitless,integer,Number of elements along the spectral axis,YES
em_ucd,Char.SpectralAxis.ucd,unitless,string,Nature of the spectral axis,NO
em_unit,Char.SpectralAxis.unit,unitless,string,Units along the spectral axis,NO
em_calib_status,Char.SpectralAxis.calibrationStatus,unitless,Enum string,Type of spectral coord calibration,NO
em_min,Char.SpectralAxis.Coverage.Bounds.Limits.LoLimit,m,double,start in spectral coordinates,YES
em_max,Char.SpectralAxis.Coverage.Bounds.Limits.HiLimit,m,double,stop in spectral coordinates,YES
em_res_power,Char.SpectralAxis.Resolution.ResolPower.refVal,unitless,double,Value of the resolving power along the spectral axis (R),YES
em_res_power_min,Char.SpectralAxis.Resolution.ResolPower.LoLimit,unitless,double,Resolving power min value on spectral axis,NO
em_res_power_max,Char.SpectralAxis.Resolution.ResolPower.HiLimit,unitless,double,Resolving power max value on spectral axis,NO
em_resolution,Char.SpectralAxis.Resolution.Refval.value,m,double,Value of Resolution along the spectral axis,NO
em_stat_error,Char.SpectralAxis.Accuracy.StatError.Refval.value,m,double,Spectral coord statistical error,NO
o_ucd,Char.ObservableAxis.ucd,unitless,String,Nature of the observable axis,YES
o_unit,Char.ObservableAxis.unit,unitless,string,Units used for the observable values,NO
o_calib_status,Char.ObservableAxis.calibrationStatus,unitless,Enum string,Type of calibration for the observable coordinate,NO
o_stat_error,Char.ObservableAxis.Accuracy.StatError.Refval.value,units specified by o_unit,double,Statistical error on the Observable axis,NO
pol_xel,Char.PolarizationAxis.numBins,unitless,integer,Number of elements along the polarization axis,YES
pol_states,Char.PolarizationAxis.stateList,unitless,Enum string,List of polarization states present in the data file,YES
facility_name,Provenance.ObsConfig.Facility.name,unitless,string,"The name of the facility, telescope, or space craft used for the observation",YES
instrument_name,Provenance.ObsConfig.Instrument.name,unitless,string,The name of the instrument used for the observation,YES
proposal_id,Provenance.Proposal.identifier,unitless,string,Identifier of proposal to which observation belongs,NO
Loading

0 comments on commit 390a576

Please sign in to comment.