Merge pull request #221 from lsst/tickets/DM-44429

DM-44429: Add CcdExposure, CcdExposure_camera, and LSSTComCamSim.

browser/cdb_latiss.md

@@ -0,0 +1,7 @@
+---
+layout: schema
+title: Consolidated Database for LATISS
+schema: cdb\_latiss
+sort-index: 50
+---
+The Consolidated Database Schema for LATISS describes the tables and views available as fixed metadata to describe LATISS exposures, visits, and parts thereof.

browser/cdb_lsstcomcamsim.md

@@ -0,0 +1,7 @@
+---
+layout: schema
+title: Consolidated Database for LSSTComCamSim
+schema: cdb\_lsstcomcamsim
+sort-index: 51
+---
+The Consolidated Database Schema for LSSTComCamSim describes the tables and views available as fixed metadata to describe LSSTComCamSim exposures, visits, and parts thereof.

yml/cdb_latiss.yaml

@@ -3,20 +3,21 @@ name: cdb_latiss
 "@id": "#cdb_latiss"
 description: Consolidated Database for LATISS
 version:
-  current: "1.0.0"
+  current: "1.1.0"
+  read_compatible: ["1.0.0"]
 tables:
 - name: exposure
   "@id": "#exposure"
   primaryKey:
-  - "#exposure.day_obs"
-  - "#exposure.seq_num"
+  - "#exposure.exposure_id"
   constraints:
-  - name: un_exposure_id
-    "@id": "#exposure.un_exposure_id"
+  - name: un_day_obs_seq_num
+    "@id": "#exposure.un_day_obs_seq_num"
     "@type": Unique
-    description: Ensure exposure_id is unique.
+    description: Ensure day_obs plus seq_num is unique.
     columns:
-    - "#exposure.exposure_id"
+    - "#exposure.day_obs"
+    - "#exposure.seq_num"
   columns:
   - name: exposure_id
     "@id": "#exposure.exposure_id"
@@ -37,21 +38,23 @@ tables:
     description: The abbreviation of the controller used for the observation (O, C).
   - name: day_obs
     "@id": "#exposure.day_obs"
-    datatype: long
+    datatype: int
     nullable: false
     description: Day of observation.
   - name: seq_num
     "@id": "#exposure.seq_num"
-    datatype: long
+    datatype: int
     nullable: false
     description: Sequence number.
   - name: physical_filter
     "@id": "#exposure.physical_filter"
-    datatype: text
+    datatype: string
+    length: 32
     description: ID of physical filter, the filter associated with a particular instrument.
   - name: band
     "@id": "#exposure.band"
-    datatype: text
+    datatype: string
+    length: 32
     description: Name of the band used to take the exposure where this source was.
       measured. Abstract filter that is not associated with a particular instrument.
   - name: s_ra
@@ -195,7 +198,8 @@ tables:
     ivoa:unit: s
   - name: group_id
     "@id": "#exposure.group_id"
-    datatype: text
+    datatype: string
+    length: 64
     description: Identifier for the group that this exposure is part of.
   - name: cur_index
     "@id": "#exposure.cur_index"
@@ -207,23 +211,27 @@ tables:
     description: Expected number of observations within the group.
   - name: img_type
     "@id": "#exposure.img_type"
-    datatype: text
+    datatype: string
+    length: 64
     description: Type of exposure taken.
   - name: emulated
     "@id": "#exposure.emulated"
     datatype: boolean
     description: True if the exposure was taken in emulation mode.
   - name: science_program
     "@id": "#exposure.science_program"
-    datatype: text
+    datatype: string
+    length: 64
     description: Science program.
   - name: observation_reason
     "@id": "#exposure.observation_reason"
-    datatype: text
+    datatype: string
+    length: 68
     description: Reason for the observation.
   - name: target_name
     "@id": "#exposure.target_name"
-    datatype: text
+    datatype: string
+    length: 64
     description: Target of the observation.
   - name: shutter_open_begin
     "@id": "#exposure.shutter_open_begin"
@@ -298,6 +306,12 @@ tables:
     "@id": "#exposure.simulated"
     datatype: boolean
     description: Were any control system components simulated?
+  - name: s_region
+    "@id": "#exposure.s_region"
+    datatype: string
+    length: 1024
+    description: Sky region in STC-S format (https://www.ivoa.net/documents/STC-S/20130917/index.html).
+    ivoa:ucd: pos.outline;obs.field
 - name: exposure_flexdata
   "@id": "#exposure_flexdata"
   primaryKey:
@@ -324,7 +338,8 @@ tables:
     description: Unique identifier.
   - name: key
     "@id": "#exposure_flexdata.key"
-    datatype: text
+    datatype: string
+    length: 128
     nullable: false
     description: Name of key.
   - name: value
@@ -338,12 +353,14 @@ tables:
   columns:
   - name: key
     "@id": "#exposure_flexdata_schema.key"
-    datatype: text
+    datatype: string
+    length: 128
     nullable: false
     description: Name of key.
   - name: dtype
     "@id": "#exposure_flexdata_schema.dtype"
-    datatype: text
+    datatype: string
+    length: 64
     nullable: false
     description: Name of the data type of the value, one of bool, int, float, str.
   - name: doc
@@ -353,9 +370,146 @@ tables:
     description: Documentation string.
   - name: unit
     "@id": "#exposure_flexdata_schema.unit"
-    datatype: text
+    datatype: string
+    length: 128
     description: Unit for the value. Should be from the IVOA (https://www.ivoa.net/documents/VOUnits/) or astropy.
   - name: ucd
     "@id": "#exposure_flexdata_schema.ucd"
+    datatype: string
+    length: 128
+    description: IVOA Unified Content Descriptor (https://www.ivoa.net/documents/UCD1+/).
+- name: ccdexposure
+  "@id": "#ccdexposure"
+  primaryKey:
+  - "#ccdexposure.ccdexposure_id"
+  constraints:
+  - name: un_exposure_id_detector
+    "@id": "#ccdexposure.un_exposure_id_detector"
+    "@type": Unique
+    description: Ensure exposure_id plus detector is unique.
+    columns:
+    - "#ccdexposure.exposure_id"
+    - "#ccdexposure.detector"
+  - name: fk_exposure_id
+    "@id": "#ccdexposure.fk_exposure_id"
+    "@type": ForeignKey
+    description: exposure_id must be in the Exposure table.
+    columns: ["#ccdexposure.exposure_id"]
+    referencedColumns: ["#exposure.exposure_id"]
+  columns:
+  - name: ccdexposure_id
+    "@id": "#ccdexposure.ccdexposure_id"
+    datatype: long
+    nullable: false
+    description: Unique identifier.
+    ivoa:ucd: meta.id
+  - name: exposure_id
+    "@id": "#ccdexposure.exposure_id"
+    datatype: long
+    nullable: false
+    description: Identifier of the exposure.
+    ivoa:ucd: meta.id.part
+  - name: detector
+    "@id": "#ccdexposure.detector"
+    datatype: int
+    nullable: false
+    description: Number of the detector in the focal plane.
+    ivoa:ucd: meta.id.part;instr.det
+  - name: s_region
+    "@id": "#ccdexposure.s_region"
+    datatype: string
+    length: 1024
+    description: Sky region in STC-S format (https://www.ivoa.net/documents/STC-S/20130917/index.html).
+    ivoa:ucd: pos.outline;obs.field
+- name: ccdexposure_camera
+  "@id": "#ccdexposure_camera"
+  primaryKey:
+  - "#ccdexposure_camera.ccdexposure_id"
+  constraints:
+  - name: fk_ccdexposure_id
+    "@id": "#ccdexposure_camera.fk_ccdexposure_id"
+    "@type": ForeignKey
+    description: exposure_id must be in the Exposure table.
+    columns: ["#ccdexposure_camera.ccdexposure_id"]
+    referencedColumns: ["#ccdexposure.ccdexposure_id"]
+  columns:
+  - name: ccdexposure_id
+    "@id": "#ccdexposure_camera.ccdexposure_id"
+    datatype: long
+    nullable: false
+    description: Unique identifier.
+  - name: temp_set
+    "@id": "#ccdexposure_camera.ccd_temp_set"
+    datatype: float
+    description: Temperature setpoint of CCD in degC.
+  - name: ccd_temp
+    "@id": "#ccdexposure_camera.ccd_temp"
+    datatype: float
+    description: Temperature of CCD in degC.
+    ivoa:ucd: phys.temperature
+- name: ccdexposure_flexdata
+  "@id": "#ccdexposure_flexdata"
+  primaryKey:
+  - "#ccdexposure_flexdata.obs_id"
+  - "#ccdexposure_flexdata.key"
+  constraints:
+  - name: fk_obs_id
+    "@id": "#ccdexposure_flexdata.fk_obs_id"
+    "@type": ForeignKey
+    description: Flex data obs_id must be a CcdExposure ccdexposure_id.
+    columns: ["#ccdexposure_flexdata.obs_id"]
+    referencedColumns: ["#ccdexposure.ccdexposure_id"]
+  - name: fk_key
+    "@id": "#ccdexposure_flexdata.fk_key"
+    "@type": ForeignKey
+    description: Flex data key must be listed in the schema.
+    columns: ["#ccdexposure_flexdata.key"]
+    referencedColumns: ["#ccdexposure_flexdata_schema.key"]
+  columns:
+  - name: obs_id
+    "@id": "#ccdexposure_flexdata.obs_id"
+    datatype: long
+    nullable: false
+    description: Unique identifier.
+  - name: key
+    "@id": "#ccdexposure_flexdata.key"
+    datatype: string
+    length: 128
+    nullable: false
+    description: Name of key.
+  - name: value
+    "@id": "#ccdexposure_flexdata.value"
     datatype: text
+    description: Content of value as a string.
+- name: ccdexposure_flexdata_schema
+  "@id": "#ccdexposure_flexdata_schema"
+  primaryKey:
+  - "#ccdexposure_flexdata_schema.key"
+  columns:
+  - name: key
+    "@id": "#ccdexposure_flexdata_schema.key"
+    datatype: string
+    length: 128
+    nullable: false
+    description: Name of key.
+  - name: dtype
+    "@id": "#ccdexposure_flexdata_schema.dtype"
+    datatype: string
+    length: 64
+    nullable: false
+    description: Name of the data type of the value, one of bool, int, float, str.
+  - name: doc
+    "@id": "#ccdexposure_flexdata_schema.doc"
+    datatype: text
+    nullable: false
+    description: Documentation string.
+  - name: unit
+    "@id": "#ccdexposure_flexdata_schema.unit"
+    datatype: string
+    length: 128
+    description: Unit for the value. Should be from the IVOA (https://www.ivoa.net/documents/VOUnits/) or astropy.
+  - name: ucd
+    "@id": "#ccdexposure_flexdata_schema.ucd"
+    datatype: string
+    length: 128
     description: IVOA Unified Content Descriptor (https://www.ivoa.net/documents/UCD1+/).