From fd758f1e393af98ed98c4cabe38e5ab0c3558669 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Mon, 29 Jan 2024 13:00:51 -0500 Subject: [PATCH 01/17] Add ground exposure schema --- .../resources/manifests/datamodels-1.0.yaml | 6 + .../schemas/ground_common-1.0.0.yaml | 25 +++ .../schemas/ground_exposure-1.0.0.yaml | 190 ++++++++++++++++++ 3 files changed, 221 insertions(+) create mode 100644 src/rad/resources/schemas/ground_common-1.0.0.yaml create mode 100644 src/rad/resources/schemas/ground_exposure-1.0.0.yaml diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index fd40518f..4ada8920 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -145,6 +145,12 @@ tags: title: Mosaic WCS parameters description: |- Mosaic WCS parameters +# Ground Modules +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/ground_exposure-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/ground_exposure-1.0.0 + title: Exposure information + description: |- + Ground test exposure information # Reference Modules - tag_uri: asdf://stsci.edu/datamodels/roman/tags/reference_files/dark-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/reference_files/dark-1.0.0 diff --git a/src/rad/resources/schemas/ground_common-1.0.0.yaml b/src/rad/resources/schemas/ground_common-1.0.0.yaml new file mode 100644 index 00000000..c0e64b82 --- /dev/null +++ b/src/rad/resources/schemas/ground_common-1.0.0.yaml @@ -0,0 +1,25 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/ground_common-1.0.0 + +title: Common metadata properties + +allOf: +# Meta Variables +- $ref: asdf://stsci.edu/datamodels/roman/schemas/basic-1.0.0 +- type: object + properties: + # Meta Objects + cal_step: + tag: asdf://stsci.edu/datamodels/roman/tags/cal_step-1.0.0 + exposure: + tag: asdf://stsci.edu/datamodels/roman/tags/ground_exposure-1.0.0 + guidestar: + tag: asdf://stsci.edu/datamodels/roman/tags/guidestar-1.0.0 + instrument: + tag: asdf://stsci.edu/datamodels/roman/tags/wfi_mode-1.0.0 + ref_file: + tag: asdf://stsci.edu/datamodels/roman/tags/ref_file-1.0.0 + required: [cal_step, exposure, guidestar, instrument, ref_file] +... diff --git a/src/rad/resources/schemas/ground_exposure-1.0.0.yaml b/src/rad/resources/schemas/ground_exposure-1.0.0.yaml new file mode 100644 index 00000000..2a4950ba --- /dev/null +++ b/src/rad/resources/schemas/ground_exposure-1.0.0.yaml @@ -0,0 +1,190 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/ground_exposure-1.0.0 + + +title: | + Ground Exposure Information + +type: object +properties: + type: + $ref: asdf://stsci.edu/datamodels/roman/schemas/exposure_type-1.0.0 + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(25) + destination: [ScienceCommon.exposure_type, GuideWindow.exposure_type] + start_time: + title: UTC exposure start time + description: | + This is a python date-time object that records the + time at the start of the exposure in UTC. + tag: tag:stsci.edu:asdf/time/time-1.* + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: datetime2 + destination: [ScienceCommon.exposure_start_time, GuideWindow.exposure_start_time] + ngroups: + title: Number of groups in integration + description: | + This is the number of resultant frames in the exposure + that are transmitted to the ground. The WFI data always has the + number of integrations=1. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [ScienceCommon.exposure_ngroups, GuideWindow.exposure_ngroups] + nframes: + title: Number of frames per group + description: | + This is the number of science frames that are combined to + produce a resultant frame. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [ScienceCommon.exposure_nframes, GuideWindow.exposure_nframes] + data_problem: + title: Science telemetry indicated a problem + description: | + This is a flag to indicate that the science telemetry + experienced a problem. + type: boolean + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nchar(1) + destination: [ScienceCommon.exposure_data_problem, GuideWindow.exposure_data_problem] + frame_divisor: + title: Divisor applied to frame-averaged groups + description: | + This is the number of reads per resultant. Its use depends upon the definition + in the MA table. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [ScienceCommon.exposure_frame_divisor, GuideWindow.exposure_frame_divisor] + groupgap: + title: Number of frames dropped between groups + description: This is the number of reads that are "dropped" and not used in the resultant. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [ScienceCommon.exposure_groupgap, GuideWindow.exposure_groupgap] + frame_time: + title: "[s] Time between frames" + description: | + The time between the end of one read and the start of the next read. This + depends on the MA table being used. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.exposure_frame_time, GuideWindow.exposure_frame_time] + group_time: + title: "[s] Time between groups" + description: | + The time that is the sum of the reads that are used to construct a resultant. + This will depend on the MA table being used. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.exposure_group_time, GuideWindow.exposure_group_time] + exposure_time: + title: "[s] exposure time" + description: | + The time between the start of the first Reset/Read Science Frame of an Exposure + and the completion of the final Read Only Science Frame of that Exposure. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.exposure_time, GuideWindow.exposure_time] + ma_table_name: + title: Identifier for the multi-accumulation table used + description: | + The name of the MA table used for the exposure as defined by the + PRD (Project Reference Database) + type: string + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(50) + destination: [ScienceCommon.ma_table_name, GuideWindow.ma_table_name] + ma_table_number: + title: Numerical identifier for the multi-accumulation table used + description: | + The number of the MA table used for the exposure as defined by the + PRD (Project Reference Database). This is used for matching the exposure + to the appropriate calibration data. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: smallint + destination: [ScienceCommon.ma_table_number, GuideWindow.ma_table_number] + read_pattern: + title: Pattern of reads + description: | + Enumeration of detector reads to resultants making up the L1 data downlinked + from the observatory + type: array + items: + type: array + items: + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(3500) + destination: [ScienceCommon.read_pattern, GuideWindow.read_pattern] +propertyOrder: [type, start_time, + ngroups, nframes, data_problem, + frame_divisor, groupgap, frame_time, group_time, exposure_time, + ma_table_name, ma_table_number, read_pattern] +flowStyle: block +required: [type, start_time, + ngroups, nframes, data_problem, + frame_divisor, groupgap, frame_time, group_time, exposure_time, + ma_table_name, ma_table_number, read_pattern] +... From 7e298d196e2b2b64e2ff95c685a5241c345c5a3b Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Mon, 29 Jan 2024 13:01:15 -0500 Subject: [PATCH 02/17] Update exposure schema to reference ground exposure --- src/rad/resources/schemas/exposure-1.0.0.yaml | 647 +++++++----------- 1 file changed, 236 insertions(+), 411 deletions(-) diff --git a/src/rad/resources/schemas/exposure-1.0.0.yaml b/src/rad/resources/schemas/exposure-1.0.0.yaml index ce0f9fb2..c2009331 100644 --- a/src/rad/resources/schemas/exposure-1.0.0.yaml +++ b/src/rad/resources/schemas/exposure-1.0.0.yaml @@ -7,417 +7,242 @@ id: asdf://stsci.edu/datamodels/roman/schemas/exposure-1.0.0 title: | Exposure information -type: object -properties: - id: - title: Exposure id number within visit - description: The exposure number for a given visit id - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [ScienceCommon.exposure_id, GuideWindow.exposure_id] - - type: - $ref: exposure_type-1.0.0 - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(25) - destination: [ScienceCommon.exposure_type, GuideWindow.exposure_type] - - start_time: - title: UTC exposure start time - description: | - This is a python date-time object that records the - time at the start of the exposure in UTC. - tag: tag:stsci.edu:asdf/time/time-1.* - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: datetime2 - destination: [ScienceCommon.exposure_start_time, GuideWindow.exposure_start_time] - mid_time: - title: UTC exposure mid time - description: | - This is a python date-time object that records the - time at the middle of the exposure in UTC. - tag: tag:stsci.edu:asdf/time/time-1.* - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: datetime2 - destination: [ScienceCommon.exposure_mid_time, GuideWindow.exposure_mid_time] - end_time: - title: UTC exposure end time - description: | - This is a python date-time object that records the - time at the end of the exposure in UTC. - tag: tag:stsci.edu:asdf/time/time-1.* - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: datetime2 - destination: [ScienceCommon.exposure_end_time, GuideWindow.exposure_end_time] - start_time_mjd: - title: "[d] exposure start time in MJD" - description: | - This records the time at the start of the exposure using the - Modified Julian Date (MJD). This is used in the archive catalog for - multi-mission matching. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_start_time_mjd, GuideWindow.exposure_start_time_mjd] - mid_time_mjd: - title: "[d] exposure mid time in MJD" - description: | - This records the time at the midpoint of the exposure using the - Modified Julian Date (MJD). This is used in the archive catalog for - multi-mission matching. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_mid_time_mjd, GuideWindow.exposure_mid_time_mjd] - end_time_mjd: - title: "[d] exposure end time in MJD" - description: | - This records the time at the end of the exposure using the - Modified Julian Date (MJD). This is used in the archive catalog for - multi-mission matching. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_end_time_mjd, GuideWindow.exposure_end_time_mjd] - start_time_tdb: - title: "[d] TDB time of exposure start in MJD" - description: | - This records the time at the start of the exposure using - the Modified Julian Date for the Barycentric Dynamical Time system - (TDB, Temps Dynamique Barycentrique), a relativistic coordinate - time scale. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_start_time_tdb, GuideWindow.exposure_start_time_tdb] - mid_time_tdb: - title: "[d] TDB time of exposure mid in MJD" - description: | - This records the time at the midpoint of the exposure using - the Modified Julian Date for the Barycentric Dynamical Time system - (TDB, Temps Dynamique Barycentrique), a relativistic coordinate - time scale. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_mid_time_tdb, GuideWindow.exposure_mid_time_tdb] - end_time_tdb: - title: "[d] TDB time of exposure end in MJD" - description: | - This records the time at the end of the exposure using - the Modified Julian Date for the Barycentric Dynamical Time system - (TDB, Temps Dynamique Barycentrique), a relativistic coordinate - time scale. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_end_time_tdb, GuideWindow.exposure_end_time_tdb] - ngroups: - title: Number of groups in integration - description: | - This is the number of resultant frames in the exposure - that are transmitted to the ground. The WFI data always has the - number of integrations=1. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [ScienceCommon.exposure_ngroups, GuideWindow.exposure_ngroups] - nframes: - title: Number of frames per group - description: | - This is the number of science frames that are combined to - produce a resultant frame. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [ScienceCommon.exposure_nframes, GuideWindow.exposure_nframes] - data_problem: - title: Science telemetry indicated a problem - description: | - This is a flag to indicate that the science telemetry - experienced a problem. - type: boolean - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nchar(1) - destination: [ScienceCommon.exposure_data_problem, GuideWindow.exposure_data_problem] - sca_number: - title: Sensor Chip Assembly number - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [ScienceCommon.exposure_sca_number, GuideWindow.exposure_sca_number] - gain_factor: - title: Gain scale factor - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_gain_factor, GuideWindow.exposure_gain_factor] - integration_time: - title: "[s] Effective integration time" - description: The effective time that the sensor has been exposed to the sky. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_integration_time, GuideWindow.exposure_integration_time] - elapsed_exposure_time: - title: "[s] Total elapsed exposure time" - description: | - The time between the start of the first Reset/Read Science Frame of an Exposure - and the completion of the final Read Only Science Frame of that Exposure. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.elapsed_exposure_time, GuideWindow.elapsed_exposure_time] - frame_divisor: - title: Divisor applied to frame-averaged groups - description: | - This is the number of reads per resultant. Its use depends upon the definition - in the MA table. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [ScienceCommon.exposure_frame_divisor, GuideWindow.exposure_frame_divisor] - groupgap: - title: Number of frames dropped between groups - description: This is the number of reads that are "dropped" and not used in the resultant. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [ScienceCommon.exposure_groupgap, GuideWindow.exposure_groupgap] - frame_time: - title: "[s] Time between frames" - description: | - The time between the end of one read and the start of the next read. This - depends on the MA table being used. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_frame_time, GuideWindow.exposure_frame_time] - group_time: - title: "[s] Time between groups" - description: | - The time that is the sum of the reads that are used to construct a resultant. - This will depend on the MA table being used. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_group_time, GuideWindow.exposure_group_time] - exposure_time: - title: "[s] exposure time" - description: | - The time between the start of the first Reset/Read Science Frame of an Exposure - and the completion of the final Read Only Science Frame of that Exposure. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_time, GuideWindow.exposure_time] - effective_exposure_time: - title: "[s] Effective exposure time" - description: The time that the detector is collecting photons that are used in the resultants. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.effective_exposure_time, GuideWindow.effective_exposure_time] - duration: - title: "[s] Total duration of exposure" - description: | - The time that the detector is dedicated to an exposure. This includes any overhead - and times for dropped frames etc. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_duration, GuideWindow.exposure_duration] - ma_table_name: - title: Identifier for the multi-accumulation table used - description: | - The name of the MA table used for the exposure as defined by the - PRD (Project Reference Database) - type: string - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(50) - destination: [ScienceCommon.ma_table_name, GuideWindow.ma_table_name] - ma_table_number: - title: Numerical identifier for the multi-accumulation table used - description: | - The number of the MA table used for the exposure as defined by the - PRD (Project Reference Database). This is used for matching the exposure - to the appropriate calibration data. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: smallint - destination: [ScienceCommon.ma_table_number, GuideWindow.ma_table_number] - level0_compressed: - title: Level 0 data was compressed - description: | - A flag to indicate that the exposure has data that needed to be decompressed by - the ground system. - type: boolean - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nchar(1) - destination: [ScienceCommon.exposure_level0_compressed, GuideWindow.exposure_level0_compressed] - read_pattern: - title: Pattern of reads - description: | - Enumeration of detector reads to resultants making up the L1 data downlinked - from the observatory - type: array - items: - type: array - items: +allOf: + - $ref: asdf://stsci.edu/datamodels/roman/schemas/ground_exposure-1.0.0 + - type: object + properties: + id: + title: Exposure id number within visit + description: The exposure number for a given visit id + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [ScienceCommon.exposure_id, GuideWindow.exposure_id] + mid_time: + title: UTC exposure mid time + description: | + This is a python date-time object that records the + time at the middle of the exposure in UTC. + tag: tag:stsci.edu:asdf/time/time-1.* + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: datetime2 + destination: [ScienceCommon.exposure_mid_time, GuideWindow.exposure_mid_time] + end_time: + title: UTC exposure end time + description: | + This is a python date-time object that records the + time at the end of the exposure in UTC. + tag: tag:stsci.edu:asdf/time/time-1.* + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: datetime2 + destination: [ScienceCommon.exposure_end_time, GuideWindow.exposure_end_time] + start_time_mjd: + title: "[d] exposure start time in MJD" + description: | + This records the time at the start of the exposure using the + Modified Julian Date (MJD). This is used in the archive catalog for + multi-mission matching. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.exposure_start_time_mjd, GuideWindow.exposure_start_time_mjd] + mid_time_mjd: + title: "[d] exposure mid time in MJD" + description: | + This records the time at the midpoint of the exposure using the + Modified Julian Date (MJD). This is used in the archive catalog for + multi-mission matching. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.exposure_mid_time_mjd, GuideWindow.exposure_mid_time_mjd] + end_time_mjd: + title: "[d] exposure end time in MJD" + description: | + This records the time at the end of the exposure using the + Modified Julian Date (MJD). This is used in the archive catalog for + multi-mission matching. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.exposure_end_time_mjd, GuideWindow.exposure_end_time_mjd] + start_time_tdb: + title: "[d] TDB time of exposure start in MJD" + description: | + This records the time at the start of the exposure using + the Modified Julian Date for the Barycentric Dynamical Time system + (TDB, Temps Dynamique Barycentrique), a relativistic coordinate + time scale. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.exposure_start_time_tdb, GuideWindow.exposure_start_time_tdb] + mid_time_tdb: + title: "[d] TDB time of exposure mid in MJD" + description: | + This records the time at the midpoint of the exposure using + the Modified Julian Date for the Barycentric Dynamical Time system + (TDB, Temps Dynamique Barycentrique), a relativistic coordinate + time scale. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.exposure_mid_time_tdb, GuideWindow.exposure_mid_time_tdb] + end_time_tdb: + title: "[d] TDB time of exposure end in MJD" + description: | + This records the time at the end of the exposure using + the Modified Julian Date for the Barycentric Dynamical Time system + (TDB, Temps Dynamique Barycentrique), a relativistic coordinate + time scale. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.exposure_end_time_tdb, GuideWindow.exposure_end_time_tdb] + sca_number: + title: Sensor Chip Assembly number type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(3500) - destination: [ScienceCommon.read_pattern, GuideWindow.read_pattern] - truncated: - title: MA Tables were truncated - description: | - This is a flag to indicate that the the MA table was truncated. - type: boolean - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nchar(1) - destination: [ScienceCommon.exposure_truncated] -propertyOrder: [id, type, - start_time, mid_time, end_time, - start_time_mjd, mid_time_mjd, end_time_mjd, - start_time_tdb, mid_time_tdb, end_time_tdb, - ngroups, nframes, data_problem, sca_number, - gain_factor, integration_time, elapsed_exposure_time, - frame_divisor, groupgap, - frame_time, group_time, exposure_time, - effective_exposure_time, duration, - ma_table_name, ma_table_number, level0_compressed, - read_pattern, truncated] + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [ScienceCommon.exposure_sca_number, GuideWindow.exposure_sca_number] + gain_factor: + title: Gain scale factor + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.exposure_gain_factor, GuideWindow.exposure_gain_factor] + integration_time: + title: "[s] Effective integration time" + description: The effective time that the sensor has been exposed to the sky. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.exposure_integration_time, GuideWindow.exposure_integration_time] + elapsed_exposure_time: + title: "[s] Total elapsed exposure time" + description: | + The time between the start of the first Reset/Read Science Frame of an Exposure + and the completion of the final Read Only Science Frame of that Exposure. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.elapsed_exposure_time, GuideWindow.elapsed_exposure_time] + effective_exposure_time: + title: "[s] Effective exposure time" + description: The time that the detector is collecting photons that are used in the resultants. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.effective_exposure_time, GuideWindow.effective_exposure_time] + duration: + title: "[s] Total duration of exposure" + description: | + The time that the detector is dedicated to an exposure. This includes any overhead + and times for dropped frames etc. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.exposure_duration, GuideWindow.exposure_duration] + level0_compressed: + title: Level 0 data was compressed + description: | + A flag to indicate that the exposure has data that needed to be decompressed by + the ground system. + type: boolean + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nchar(1) + destination: [ScienceCommon.exposure_level0_compressed, GuideWindow.exposure_level0_compressed] + truncated: + title: MA Tables were truncated + description: | + This is a flag to indicate that the the MA table was truncated. + type: boolean + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nchar(1) + destination: [ScienceCommon.exposure_truncated] + required: [id, + mid_time, end_time, + start_time_mjd, mid_time_mjd, end_time_mjd, + start_time_tdb, mid_time_tdb, end_time_tdb, + sca_number, + gain_factor, integration_time, elapsed_exposure_time, + effective_exposure_time, duration, + level0_compressed] + propertyOrder: [id, + mid_time, end_time, + start_time_mjd, mid_time_mjd, end_time_mjd, + start_time_tdb, mid_time_tdb, end_time_tdb, + sca_number, + gain_factor, integration_time, elapsed_exposure_time, + effective_exposure_time, duration, + level0_compressed, truncated] flowStyle: block -required: [id, type, - start_time, mid_time, end_time, - start_time_mjd, mid_time_mjd, end_time_mjd, - start_time_tdb, mid_time_tdb, end_time_tdb, - ngroups, nframes, data_problem, sca_number, - gain_factor, integration_time, elapsed_exposure_time, - frame_divisor, groupgap, - frame_time, group_time, exposure_time, - effective_exposure_time, duration, - ma_table_name, ma_table_number, level0_compressed, - read_pattern] ... From 562c10e2e3d8e1f0b5c1b6996b44e1fea31d1938 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Mon, 29 Jan 2024 13:12:41 -0500 Subject: [PATCH 03/17] Add ground guidestar --- .../resources/manifests/datamodels-1.0.yaml | 5 + .../schemas/ground_common-1.0.0.yaml | 2 +- .../schemas/ground_guidestar-1.0.0.yaml | 117 ++++++++++++++++++ 3 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 src/rad/resources/schemas/ground_guidestar-1.0.0.yaml diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index 4ada8920..27ad991d 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -151,6 +151,11 @@ tags: title: Exposure information description: |- Ground test exposure information +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/ground_guidestar-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/ground_guidestar-1.0.0 + title: Guidestar information + description: |- + Guidestar information # Reference Modules - tag_uri: asdf://stsci.edu/datamodels/roman/tags/reference_files/dark-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/reference_files/dark-1.0.0 diff --git a/src/rad/resources/schemas/ground_common-1.0.0.yaml b/src/rad/resources/schemas/ground_common-1.0.0.yaml index c0e64b82..c1cb4eb3 100644 --- a/src/rad/resources/schemas/ground_common-1.0.0.yaml +++ b/src/rad/resources/schemas/ground_common-1.0.0.yaml @@ -16,7 +16,7 @@ allOf: exposure: tag: asdf://stsci.edu/datamodels/roman/tags/ground_exposure-1.0.0 guidestar: - tag: asdf://stsci.edu/datamodels/roman/tags/guidestar-1.0.0 + tag: asdf://stsci.edu/datamodels/roman/tags/ground_guidestar-1.0.0 instrument: tag: asdf://stsci.edu/datamodels/roman/tags/wfi_mode-1.0.0 ref_file: diff --git a/src/rad/resources/schemas/ground_guidestar-1.0.0.yaml b/src/rad/resources/schemas/ground_guidestar-1.0.0.yaml new file mode 100644 index 00000000..40c89f2b --- /dev/null +++ b/src/rad/resources/schemas/ground_guidestar-1.0.0.yaml @@ -0,0 +1,117 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/ground_guidestar-1.0.0 + +title: Ground Guide star window information +type: object +properties: + gw_id: + title: guide star window identifier + type: string + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(20) + destination: [ScienceCommon.gw_id, GuideWindow.gw_id] + gw_fgs_mode: + $ref: asdf://stsci.edu/datamodels/roman/schemas/guidewindow_modes-1.0.0 + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(18) + destination: [ScienceCommon.gw_fgs_mode, GuideWindow.gw_fgs_mode] + data_start: + title: MJD start time of guider data within this file + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.data_start, GuideWindow.data_start] + data_end: + title: MJD end time of guider data within this file + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.data_end, GuideWindow.data_end] + gw_window_xstart: + title: Guide window x start position on the detector + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: Science Data Formatting + archive_catalog: + datatype: int + destination: [ScienceCommon.gw_window_xstart] + gw_window_ystart: + title: Guide window y start position on the detector + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: Science Data Formatting + archive_catalog: + datatype: int + destination: [ScienceCommon.gw_window_ystart] + gw_window_xstop: + title: Guide window x stop position on the detector + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: Science Data Formatting + archive_catalog: + datatype: int + destination: [ScienceCommon.gw_window_xstop] + gw_window_ystop: + title: Guide window y stop position on the detector + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: Science Data Formatting + archive_catalog: + datatype: int + destination: [ScienceCommon.gw_window_ystop] + gw_window_xsize: + title: Guide window size in the x direction in detector coordinates + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: Science Data Formatting + archive_catalog: + datatype: int + destination: [ScienceCommon.gw_window_xsize] + gw_window_ysize: + title: Guide window size in the y direction in detector coordinates + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: Science Data Formatting + archive_catalog: + datatype: int + destination: [ScienceCommon.gw_window_ysize] +propertyOrder: [gw_id, gw_fgs_mode, + data_start, data_end, gw_window_xstart, + gw_window_ystart, gw_window_xstop, gw_window_ystop, gw_window_xsize, + gw_window_ysize] +flowStyle: block +required: [gw_id, gw_fgs_mode, + data_start, data_end, gw_window_xstart, + gw_window_ystart, gw_window_xstop, gw_window_ystop, gw_window_xsize, + gw_window_ysize] +... From 35ff5ebad8ea5122022c9bd1bd9b876a356478dd Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Mon, 29 Jan 2024 13:16:44 -0500 Subject: [PATCH 04/17] Update guidestar to ref ground data --- .../resources/schemas/guidestar-1.0.0.yaml | 479 +++++++----------- 1 file changed, 190 insertions(+), 289 deletions(-) diff --git a/src/rad/resources/schemas/guidestar-1.0.0.yaml b/src/rad/resources/schemas/guidestar-1.0.0.yaml index f683c312..f37e3498 100644 --- a/src/rad/resources/schemas/guidestar-1.0.0.yaml +++ b/src/rad/resources/schemas/guidestar-1.0.0.yaml @@ -4,294 +4,195 @@ $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 id: asdf://stsci.edu/datamodels/roman/schemas/guidestar-1.0.0 title: Guide star window information -type: object -properties: - gw_id: - title: guide star window identifier - type: string - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(20) - destination: [ScienceCommon.gw_id, GuideWindow.gw_id] - gw_fgs_mode: - $ref: guidewindow_modes-1.0.0 - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(18) - destination: [ScienceCommon.gw_fgs_mode, GuideWindow.gw_fgs_mode] - gs_id: - title: guide star identifier from the GSC2 catalog - description: guide star catalog id from the GSC2, field gsc2ID - type: string - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(20) - destination: [ScienceCommon.gs_id, GuideWindow.gs_id] - gs_catalog_version: - title: The version of the Guide Star Catalog - description: The version of the catalog that the guide stars are selected, currently "GSC 2.4.2", SDF should populate - this from the return value of CAT e.g. CAT=GSC242 - type: string - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(20) - destination: [ScienceCommon.gs_catalog_version] - gs_ra: - title: "[deg] guide star right ascension" - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_ra, GuideWindow.gs_ra] - gs_dec: - title: "[deg] guide star declination" - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_dec, GuideWindow.gs_dec] - gs_ura: - title: "[deg] guide star right ascension uncertainty" - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_ura, GuideWindow.gs_ura] - gs_udec: - title: "[deg] guide star declination uncertainty" - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_udec, GuideWindow.gs_udec] - gs_mag: - title: guide star magnitude in detector - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_mag, GuideWindow.gs_mag] - gs_umag: - title: guide star magnitude uncertainty - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_umag, GuideWindow.gs_umag] - data_start: - title: MJD start time of guider data within this file - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.data_start, GuideWindow.data_start] - data_end: - title: MJD end time of guider data within this file - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.data_end, GuideWindow.data_end] - gs_ctd_x: - title: "[arcsec] guide star centroid x position in guider ideal frame" - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_ctd_x, GuideWindow.gs_ctd_x] - gs_ctd_y: - title: "[arcsec] guide star centroid y position in guider ideal frame" - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_ctd_y, GuideWindow.gs_ctd_y] - gs_ctd_ux: - title: uncertainty in the x position of the centroid - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_ctd_ux, GuideWindow.gs_ctd_ux] - gs_ctd_uy: - title: uncertainty in the y position of the centroid - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_ctd_uy, GuideWindow.gs_ctd_uy] - gs_epoch: - title: Epoch of guide star coordinates - type: string - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(10) - destination: [ScienceCommon.gs_epoch, GuideWindow.gs_epoch] - gs_mura: - title: "[mas/yr] Guide star ICRS right ascension proper motion" - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_mura, GuideWindow.gs_mura] - gs_mudec: - title: "[mas/yr] Guide star ICRS declination proper motion" - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_mudec, GuideWindow.gs_mudec] - gs_para: - title: Guide star annual parallax - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_para, GuideWindow.gs_para] - gs_pattern_error: - title: RMS of guide star position - description: RMS of guide star position in guide window from pattern matching (error on - centroid not explicitly calculated, the FACE information takes all the centroids and - calculates the error across the guiding pattern) - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.gs_pattern_error, GuideWindow.gs_pattern_error] - gw_window_xstart: - title: Guide window x start position on the detector - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [ScienceCommon.gw_window_xstart] - gw_window_ystart: - title: Guide window y start position on the detector - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [ScienceCommon.gw_window_ystart] - gw_window_xstop: - title: Guide window x stop position on the detector - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [ScienceCommon.gw_window_xstop] - gw_window_ystop: - title: Guide window y stop position on the detector - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [ScienceCommon.gw_window_ystop] - gw_window_xsize: - title: Guide window size in the x direction in detector coordinates - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [ScienceCommon.gw_window_xsize] - gw_window_ysize: - title: Guide window size in the y direction in detector coordinates - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [ ScienceCommon.gw_window_ysize] -propertyOrder: [gw_id, gs_id, gs_catalog_version, gs_ra, gs_dec, - gs_ura, gs_udec, gs_mag, gs_umag, gw_fgs_mode, - data_start, data_end, gs_ctd_x, gs_ctd_y, gs_ctd_ux, gs_ctd_uy, - gs_epoch, gs_mura, gs_mudec, gs_para, gs_pattern_error, gw_window_xstart, - gw_window_ystart, gw_window_xstop, gw_window_ystop, gw_window_xsize, - gw_window_ysize] + +allOf: + - $ref: asdf://stsci.edu/datamodels/roman/schemas/ground_guidestar-1.0.0 + - type: object + properties: + gs_id: + title: guide star identifier from the GSC2 catalog + description: guide star catalog id from the GSC2, field gsc2ID + type: string + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(20) + destination: [ScienceCommon.gs_id, GuideWindow.gs_id] + gs_catalog_version: + title: The version of the Guide Star Catalog + description: The version of the catalog that the guide stars are selected, currently "GSC 2.4.2", SDF should populate + this from the return value of CAT e.g. CAT=GSC242 + type: string + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(20) + destination: [ScienceCommon.gs_catalog_version] + gs_ra: + title: "[deg] guide star right ascension" + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_ra, GuideWindow.gs_ra] + gs_dec: + title: "[deg] guide star declination" + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_dec, GuideWindow.gs_dec] + gs_ura: + title: "[deg] guide star right ascension uncertainty" + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_ura, GuideWindow.gs_ura] + gs_udec: + title: "[deg] guide star declination uncertainty" + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_udec, GuideWindow.gs_udec] + gs_mag: + title: guide star magnitude in detector + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_mag, GuideWindow.gs_mag] + gs_umag: + title: guide star magnitude uncertainty + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_umag, GuideWindow.gs_umag] + gs_ctd_x: + title: "[arcsec] guide star centroid x position in guider ideal frame" + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_ctd_x, GuideWindow.gs_ctd_x] + gs_ctd_y: + title: "[arcsec] guide star centroid y position in guider ideal frame" + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_ctd_y, GuideWindow.gs_ctd_y] + gs_ctd_ux: + title: uncertainty in the x position of the centroid + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_ctd_ux, GuideWindow.gs_ctd_ux] + gs_ctd_uy: + title: uncertainty in the y position of the centroid + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_ctd_uy, GuideWindow.gs_ctd_uy] + gs_epoch: + title: Epoch of guide star coordinates + type: string + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(10) + destination: [ScienceCommon.gs_epoch, GuideWindow.gs_epoch] + gs_mura: + title: "[mas/yr] Guide star ICRS right ascension proper motion" + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_mura, GuideWindow.gs_mura] + gs_mudec: + title: "[mas/yr] Guide star ICRS declination proper motion" + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_mudec, GuideWindow.gs_mudec] + gs_para: + title: Guide star annual parallax + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_para, GuideWindow.gs_para] + gs_pattern_error: + title: RMS of guide star position + description: RMS of guide star position in guide window from pattern matching (error on + centroid not explicitly calculated, the FACE information takes all the centroids and + calculates the error across the guiding pattern) + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.gs_pattern_error, GuideWindow.gs_pattern_error] + propertyOrder: [gs_id, gs_catalog_version, gs_ra, gs_dec, + gs_ura, gs_udec, gs_mag, gs_umag, + gs_ctd_x, gs_ctd_y, gs_ctd_ux, gs_ctd_uy, + gs_epoch, gs_mura, gs_mudec, gs_para, gs_pattern_error] + required: [gs_id, gs_catalog_version, gs_ra, gs_dec, + gs_ura, gs_udec, gs_mag, gs_umag, + gs_ctd_x, gs_ctd_y, gs_ctd_ux, gs_ctd_uy, + gs_epoch, gs_mura, gs_mudec, gs_para, gs_pattern_error] + flowStyle: block -required: [gw_id, gs_id, gs_catalog_version, gs_ra, gs_dec, - gs_ura, gs_udec, gs_mag, gs_umag, gw_fgs_mode, - data_start, data_end, gs_ctd_x, gs_ctd_y, gs_ctd_ux, gs_ctd_uy, - gs_epoch, gs_mura, gs_mudec, gs_para, gs_pattern_error, gw_window_xstart, - gw_window_ystart, gw_window_xstop, gw_window_ystop, gw_window_xsize, - gw_window_ysize] ... From f1de2b8f2eeadef994f3a40063348f876776fe41 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Tue, 30 Jan 2024 13:53:17 -0500 Subject: [PATCH 05/17] Add ground test schema --- .../resources/manifests/datamodels-1.0.yaml | 5 ++ .../schemas/ground_common-1.0.0.yaml | 2 + .../schemas/ground_groundtest-1.0.0.yaml | 84 +++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 src/rad/resources/schemas/ground_groundtest-1.0.0.yaml diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index 27ad991d..aae25d0c 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -156,6 +156,11 @@ tags: title: Guidestar information description: |- Guidestar information +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/ground_groundtest-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/ground_groundtest-1.0.0 + title: Ground Test Information + description: |- + Ground test description. # Reference Modules - tag_uri: asdf://stsci.edu/datamodels/roman/tags/reference_files/dark-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/reference_files/dark-1.0.0 diff --git a/src/rad/resources/schemas/ground_common-1.0.0.yaml b/src/rad/resources/schemas/ground_common-1.0.0.yaml index c1cb4eb3..db2f8454 100644 --- a/src/rad/resources/schemas/ground_common-1.0.0.yaml +++ b/src/rad/resources/schemas/ground_common-1.0.0.yaml @@ -17,6 +17,8 @@ allOf: tag: asdf://stsci.edu/datamodels/roman/tags/ground_exposure-1.0.0 guidestar: tag: asdf://stsci.edu/datamodels/roman/tags/ground_guidestar-1.0.0 + groundtest: + tag: asdf://stsci.edu/datamodels/roman/tags/ground_groundtest-1.0.0 instrument: tag: asdf://stsci.edu/datamodels/roman/tags/wfi_mode-1.0.0 ref_file: diff --git a/src/rad/resources/schemas/ground_groundtest-1.0.0.yaml b/src/rad/resources/schemas/ground_groundtest-1.0.0.yaml new file mode 100644 index 00000000..94a815bf --- /dev/null +++ b/src/rad/resources/schemas/ground_groundtest-1.0.0.yaml @@ -0,0 +1,84 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/ground_groundtest-1.0.0 + +title: Ground Test Information +type: object +properties: + test_name: + title: I&T Test Name + type: string + test_phase: + title: I&T Testing Phase + type: string + test_environment: + title: I&T Testing Environment + type: string + test_script: + title: Name of Testing Script Run + type: string + product_date: + title: Source File Creation Time + tag: tag:stsci.edu:asdf/time/time-1.* + product_version: + title: I&T Software Used to Generate Source File + type: string + conversion_date: + title: HDF5 to ASDF Conversion Date + tag: tag:stsci.edu:asdf/time/time-1.* + conversion_version: + title: HDF5 to ASDF Converter Version + type: string + filename_pnt5: + title: L0.5 File Name + type: string + filepath_level_pnt5: + title: L0.5 File Path + type: string + filename_l1a: + title: L1A File Name + type: string + detector_id: + title: SCA Identifier + type: string + detector_temp: + title: Mean Detector Temperature (Kelvin) + type: number + frames_temp: + title: Interpolated Temperature of Frames (Kelvin) + tag: tag:stsci.edu:asdf/core/ndarray-1.* + # needs a datatype and ndim + ota_temp: + title: Mean OTA Temperature (Kelvin) + type: number + rcs_on: + title: RCS On/Off + type: boolean + readout_col_num: + title: Number of Readout Columns + type: integer + detector_pixel_size: + title: Pixel Size (cm) + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: ["cm"] + sensor_error: + title: Sensor Error + tag: tag:stsci.edu:asdf/core/ndarray-1.* + # needs a datatype and ndim + +propertyOrder: [test_name, test_phase, test_environment, test_script, + product_date, product_version, conversion_date, conversion_version, + filename_pnt5, filepath_level_pnt5, filename_l1a, detector_id, + detector_temp, frames_temp, ota_temp, rcs_on, readout_col_num, + detector_pixel_size, sensor_error] +flowStyle: block +required: [test_name, test_phase, test_environment, test_script, + product_date, product_version, conversion_date, conversion_version, + filename_pnt5, filepath_level_pnt5, filename_l1a, detector_id, + detector_temp, frames_temp, ota_temp, rcs_on, readout_col_num, + detector_pixel_size, sensor_error] +... From 657ecd82da8afbffc15baad4866ecb5bd6f8dbc0 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Mon, 29 Jan 2024 14:03:29 -0500 Subject: [PATCH 06/17] Added FPS schemas --- .../resources/manifests/datamodels-1.0.yaml | 5 + src/rad/resources/schemas/fps-1.0.0.yaml | 105 ++++++++++++++++++ .../schemas/ground_common-1.0.0.yaml | 12 +- 3 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 src/rad/resources/schemas/fps-1.0.0.yaml diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index aae25d0c..fb7766a3 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -161,6 +161,11 @@ tags: title: Ground Test Information description: |- Ground test description. +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/fps-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/fps-1.0.0 + title: FPS schema + description: |- + FPS test data # Reference Modules - tag_uri: asdf://stsci.edu/datamodels/roman/tags/reference_files/dark-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/reference_files/dark-1.0.0 diff --git a/src/rad/resources/schemas/fps-1.0.0.yaml b/src/rad/resources/schemas/fps-1.0.0.yaml new file mode 100644 index 00000000..3b6a05ad --- /dev/null +++ b/src/rad/resources/schemas/fps-1.0.0.yaml @@ -0,0 +1,105 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/fps-1.0.0 + +title: | + Schema for the FPS Test Data + +datamodel_name: FpsModel + +archive_meta: None + +type: object +properties: + meta: + $ref: asdf://stsci.edu/datamodels/roman/schemas/ground_common-1.0.0 + data: + title: Science data, including the border reference pixels. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + + amp33: + title: Amp 33 reference pixel data. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + + amp33_reset_reads: + title: Amp 33 reset reads performed before integration data. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + + amp33_reference_read: + title: Amp 33 reference reads that can be subtracted from the amp33 ramp data, if present. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + + guidewindow: + title: Guide window data. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + + reference_read: + title: Reference read that can be subtracted from ramp, if present. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + + reset_reads: + title: Reset reads performed before the ramp integration, if present. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + +propertyOrder: [meta, data, amp33, amp33_reset_reads, amp33_reference_read, + guidewindow, reference_read, reset_reads] +flowStyle: block +required: [meta, data, amp33, guidewindow] +... diff --git a/src/rad/resources/schemas/ground_common-1.0.0.yaml b/src/rad/resources/schemas/ground_common-1.0.0.yaml index db2f8454..deb09288 100644 --- a/src/rad/resources/schemas/ground_common-1.0.0.yaml +++ b/src/rad/resources/schemas/ground_common-1.0.0.yaml @@ -23,5 +23,15 @@ allOf: tag: asdf://stsci.edu/datamodels/roman/tags/wfi_mode-1.0.0 ref_file: tag: asdf://stsci.edu/datamodels/roman/tags/ref_file-1.0.0 - required: [cal_step, exposure, guidestar, instrument, ref_file] + hdf5_meta: + title: Original Raw HDF5 metadata + type: object + hdf5_telemetry: + title: Original Raw HDF5 telemetry keywords + type: string + gw_meta: + title: Guide Window HDF5 metadata + type: object + required: [cal_step, exposure, guidestar, instrument, ref_file, + hdf5_meta, hdf5_telemetry, gw_meta] ... From 86064e1e25b9e9f95e82ef8a265da10a069b4481 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Mon, 29 Jan 2024 15:53:57 -0500 Subject: [PATCH 07/17] Add tvac schema --- .../resources/manifests/datamodels-1.0.yaml | 5 + .../schemas/ground_groundtest-1.0.0.yaml | 3 + src/rad/resources/schemas/tvac-1.0.0.yaml | 334 ++++++++++++++++++ 3 files changed, 342 insertions(+) create mode 100644 src/rad/resources/schemas/tvac-1.0.0.yaml diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index fb7766a3..fd4a9e5b 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -166,6 +166,11 @@ tags: title: FPS schema description: |- FPS test data +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/tvac-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tvac-1.0.0 + title: TVAC schema + description: |- + TVAC test data # Reference Modules - tag_uri: asdf://stsci.edu/datamodels/roman/tags/reference_files/dark-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/reference_files/dark-1.0.0 diff --git a/src/rad/resources/schemas/ground_groundtest-1.0.0.yaml b/src/rad/resources/schemas/ground_groundtest-1.0.0.yaml index 94a815bf..3beaccd2 100644 --- a/src/rad/resources/schemas/ground_groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/ground_groundtest-1.0.0.yaml @@ -62,6 +62,9 @@ properties: title: Pixel Size (cm) tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + # needs a datatype and ndim unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: ["cm"] diff --git a/src/rad/resources/schemas/tvac-1.0.0.yaml b/src/rad/resources/schemas/tvac-1.0.0.yaml new file mode 100644 index 00000000..88d6c1e3 --- /dev/null +++ b/src/rad/resources/schemas/tvac-1.0.0.yaml @@ -0,0 +1,334 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/tvac-1.0.0 + +title: | + Schema for the TVAC Test Data + +datamodel_name: TvacModel + +archive_meta: None + +type: object +properties: + meta: + allOf: + - $ref: asdf://stsci.edu/datamodels/roman/schemas/ground_common-1.0.0 + - type: object + properties: + groundtest: + type: object + properties: + activity_number: + title: TVAC Activity Number + type: integer + led_bank1_band_number_on: + title: Band number of LED illuminating in the sRCS in bank 1 + type: array + items: + type: integer + led_bank2_band_number_on: + title: Band number of LED illuminating in the sRCS in bank 2 + type: array + items: + type: integer + led_bank1_approx_wlen: + title: Approximate wavelength of LED illuminating in the sRCS in bank 1 + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + # needs a datatype and ndim + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: ["nm"] + led_bank2_approx_wlen: + title: Approximate wavelength of LED illuminating in the sRCS in bank 2 + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + # needs a datatype and ndim + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: ["nm"] + srcs_pd_voltage: + title: sRCS Photodiode Voltage + type: number + srcs_led_flux: + title: Target flux for the sRCS LEDs + type: number + wfi_mce_srcs_bank1_led_i: + title: | + Commanded current for the SRCS -> GSFC will send us the flux + in target e-/s/px in the center of the sca + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + # enum: [] # needs a list of units + wfi_mce_srcs_bank1_led_range: + title: | + Commanded range for the SRCS -> GSFC will send us the flux in + target e-/s/px in the center of the sca + type: string + # enum: [] add enum values + wfi_mce_srcs_bank2_led_i: + title: | + Commanded current for the SRCS -> GSFC will send us the flux + in target e-/s/px in the center of the sca + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + # enum: [] # needs a list of units + wfi_mce_srcs_bank2_led_range: + title: | + Commanded range for the SRCS -> GSFC will send us the flux in + target e-/s/px in the center of the sca + type: string + # enum: [] add enum values + srcs_led_current: + title: Input LED current set point + type: number + wfi_opt_targettype: + title: WFI-team defined target types + type: string + enum: [NONE, FLAT-sRCS, FLAT-SORC, POINT SOURCE, SPECTRUM, DARK, + DARK-DARKEL, DARK-W146, PHARET-GW, PHARET-FF, PHARET-FF-F158, + PHARET-FF-M3MM, PHARET-FF-M6MM, PHARET-FF-P3MM, PHARET-FF-P6MM, + PHARET-FF-PRISM, PHARET-FF-W146, POINT-SOURCE-GW, STRAY LIGHT] + analysis_tag: + title: WFI-team defined tags for data aggregation/analysis + type: string + gsorc_pose_mode: + title: SORC pose mode + type: string + # enum: [] add enum values + gsorc_pose_target: + title: SORC pose target + type: string + # enum: [] add enum values + gsorc_sds_active_atten: + title: Attenuation from SDS + type: number + gsorc_sds_lltfir_wave: + title: Commanded wavelength for the LLTF + gsorc_sds_sorc_on: + title: SORC on/off + type: boolean + gsorc_sds_sorc_wlen: + title: SORC wavelength + type: number + gsorc_sds_active_source: + title: Laser name + type: string + gsorc_sds_dq_pulse: + title: whether the source is pulsing or not + type: string + enum: [pulse, cw] + gsorc_sds_daq_pw: + title: pulse width – originally in HDF5 file is in units of 0.1 ms + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [ms] + gsorc_heater1_setpt: + title: SORC temperature set point + type: number + wfi_otp_wfi_ewa: + title: Element Wheel position + type: string + # enum: [] add enum values + sca_temp: + title: SCE temperature + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + mpa_temp: + title: MPA temperature + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + ewa_temp: + title: ewa temp ish (there's no actual temperature sensor inside) + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + ewta_outer_heater_temp: + title: ewa_outer temperature sensor + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + ewta_inner_heater_temp: + title: ewa_inner temperature sensor + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + coba_temp_near_ewta: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + scea_temp: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + wfi_sce_1_vbiasgate_v: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [V] + wfi_sce_1_vbiaspwr_i: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [A] + wfi_sce_1_vbiaspwr_v: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [V] + wfi_sce_1_vreset_v: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [V] + wfi_sce_1_vreset_i: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [A] + wfi_mcu_a_offs_csense_fpssen: + title: temperature in eng units -> will change for TVAC2. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + + data: + title: Science data, including the border reference pixels. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + + amp33: + title: Amp 33 reference pixel data. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + + amp33_reset_reads: + title: Amp 33 reset reads performed before integration data. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + + amp33_reference_read: + title: Amp 33 reference reads that can be subtracted from the amp33 ramp data, if present. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + + guidewindow: + title: Guide window data. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + + reference_read: + title: Reference read that can be subtracted from ramp, if present. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + + reset_reads: + title: Reset reads performed before the ramp integration, if present. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: uint16 + ndim: 3 + unit: + tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN"] + +propertyOrder: [meta, data, amp33, amp33_reset_reads, amp33_reference_read, + guidewindow, reference_read, reset_reads] +flowStyle: block +required: [meta, data, amp33, guidewindow] +... From cadd46738ac3603ca056a62e5a2cc23e37b6767a Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Fri, 9 Feb 2024 15:05:13 -0500 Subject: [PATCH 08/17] Re-organize some of the schemas --- .../resources/manifests/datamodels-1.0.yaml | 9 +- src/rad/resources/schemas/fps-1.0.0.yaml | 9 +- .../schemas/ground_common-1.0.0.yaml | 2 - ...dtest-1.0.0.yaml => groundtest-1.0.0.yaml} | 2 +- src/rad/resources/schemas/tvac-1.0.0.yaml | 226 +---------------- .../schemas/tvac_groundtest-1.0.0.yaml | 235 ++++++++++++++++++ 6 files changed, 253 insertions(+), 230 deletions(-) rename src/rad/resources/schemas/{ground_groundtest-1.0.0.yaml => groundtest-1.0.0.yaml} (97%) create mode 100644 src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index fd4a9e5b..958561f2 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -156,11 +156,16 @@ tags: title: Guidestar information description: |- Guidestar information -- tag_uri: asdf://stsci.edu/datamodels/roman/tags/ground_groundtest-1.0.0 - schema_uri: asdf://stsci.edu/datamodels/roman/schemas/ground_groundtest-1.0.0 +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/groundtest-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/groundtest-1.0.0 title: Ground Test Information description: |- Ground test description. +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/tvac_groundtest-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tvac_groundtest-1.0.0 + title: TVAC Ground Test Information + description: |- + TVAC ground test description. - tag_uri: asdf://stsci.edu/datamodels/roman/tags/fps-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/fps-1.0.0 title: FPS schema diff --git a/src/rad/resources/schemas/fps-1.0.0.yaml b/src/rad/resources/schemas/fps-1.0.0.yaml index 3b6a05ad..ea456704 100644 --- a/src/rad/resources/schemas/fps-1.0.0.yaml +++ b/src/rad/resources/schemas/fps-1.0.0.yaml @@ -13,7 +13,14 @@ archive_meta: None type: object properties: meta: - $ref: asdf://stsci.edu/datamodels/roman/schemas/ground_common-1.0.0 + allOf: + - $ref: asdf://stsci.edu/datamodels/roman/schemas/ground_common-1.0.0 + - type: object + properties: + groundtest: + tag: asdf://stsci.edu/datamodels/roman/tags/groundtest-1.0.0 + required: [groundtest] + data: title: Science data, including the border reference pixels. tag: tag:stsci.edu:asdf/unit/quantity-1.* diff --git a/src/rad/resources/schemas/ground_common-1.0.0.yaml b/src/rad/resources/schemas/ground_common-1.0.0.yaml index deb09288..98a60a13 100644 --- a/src/rad/resources/schemas/ground_common-1.0.0.yaml +++ b/src/rad/resources/schemas/ground_common-1.0.0.yaml @@ -17,8 +17,6 @@ allOf: tag: asdf://stsci.edu/datamodels/roman/tags/ground_exposure-1.0.0 guidestar: tag: asdf://stsci.edu/datamodels/roman/tags/ground_guidestar-1.0.0 - groundtest: - tag: asdf://stsci.edu/datamodels/roman/tags/ground_groundtest-1.0.0 instrument: tag: asdf://stsci.edu/datamodels/roman/tags/wfi_mode-1.0.0 ref_file: diff --git a/src/rad/resources/schemas/ground_groundtest-1.0.0.yaml b/src/rad/resources/schemas/groundtest-1.0.0.yaml similarity index 97% rename from src/rad/resources/schemas/ground_groundtest-1.0.0.yaml rename to src/rad/resources/schemas/groundtest-1.0.0.yaml index 3beaccd2..6511104e 100644 --- a/src/rad/resources/schemas/ground_groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/groundtest-1.0.0.yaml @@ -1,7 +1,7 @@ %YAML 1.1 --- $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 -id: asdf://stsci.edu/datamodels/roman/schemas/ground_groundtest-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/groundtest-1.0.0 title: Ground Test Information type: object diff --git a/src/rad/resources/schemas/tvac-1.0.0.yaml b/src/rad/resources/schemas/tvac-1.0.0.yaml index 88d6c1e3..59b4a5ba 100644 --- a/src/rad/resources/schemas/tvac-1.0.0.yaml +++ b/src/rad/resources/schemas/tvac-1.0.0.yaml @@ -18,230 +18,8 @@ properties: - type: object properties: groundtest: - type: object - properties: - activity_number: - title: TVAC Activity Number - type: integer - led_bank1_band_number_on: - title: Band number of LED illuminating in the sRCS in bank 1 - type: array - items: - type: integer - led_bank2_band_number_on: - title: Band number of LED illuminating in the sRCS in bank 2 - type: array - items: - type: integer - led_bank1_approx_wlen: - title: Approximate wavelength of LED illuminating in the sRCS in bank 1 - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - value: - tag: tag:stsci.edu:asdf/core/ndarray-1.* - # needs a datatype and ndim - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: ["nm"] - led_bank2_approx_wlen: - title: Approximate wavelength of LED illuminating in the sRCS in bank 2 - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - value: - tag: tag:stsci.edu:asdf/core/ndarray-1.* - # needs a datatype and ndim - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: ["nm"] - srcs_pd_voltage: - title: sRCS Photodiode Voltage - type: number - srcs_led_flux: - title: Target flux for the sRCS LEDs - type: number - wfi_mce_srcs_bank1_led_i: - title: | - Commanded current for the SRCS -> GSFC will send us the flux - in target e-/s/px in the center of the sca - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - # enum: [] # needs a list of units - wfi_mce_srcs_bank1_led_range: - title: | - Commanded range for the SRCS -> GSFC will send us the flux in - target e-/s/px in the center of the sca - type: string - # enum: [] add enum values - wfi_mce_srcs_bank2_led_i: - title: | - Commanded current for the SRCS -> GSFC will send us the flux - in target e-/s/px in the center of the sca - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - # enum: [] # needs a list of units - wfi_mce_srcs_bank2_led_range: - title: | - Commanded range for the SRCS -> GSFC will send us the flux in - target e-/s/px in the center of the sca - type: string - # enum: [] add enum values - srcs_led_current: - title: Input LED current set point - type: number - wfi_opt_targettype: - title: WFI-team defined target types - type: string - enum: [NONE, FLAT-sRCS, FLAT-SORC, POINT SOURCE, SPECTRUM, DARK, - DARK-DARKEL, DARK-W146, PHARET-GW, PHARET-FF, PHARET-FF-F158, - PHARET-FF-M3MM, PHARET-FF-M6MM, PHARET-FF-P3MM, PHARET-FF-P6MM, - PHARET-FF-PRISM, PHARET-FF-W146, POINT-SOURCE-GW, STRAY LIGHT] - analysis_tag: - title: WFI-team defined tags for data aggregation/analysis - type: string - gsorc_pose_mode: - title: SORC pose mode - type: string - # enum: [] add enum values - gsorc_pose_target: - title: SORC pose target - type: string - # enum: [] add enum values - gsorc_sds_active_atten: - title: Attenuation from SDS - type: number - gsorc_sds_lltfir_wave: - title: Commanded wavelength for the LLTF - gsorc_sds_sorc_on: - title: SORC on/off - type: boolean - gsorc_sds_sorc_wlen: - title: SORC wavelength - type: number - gsorc_sds_active_source: - title: Laser name - type: string - gsorc_sds_dq_pulse: - title: whether the source is pulsing or not - type: string - enum: [pulse, cw] - gsorc_sds_daq_pw: - title: pulse width – originally in HDF5 file is in units of 0.1 ms - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [ms] - gsorc_heater1_setpt: - title: SORC temperature set point - type: number - wfi_otp_wfi_ewa: - title: Element Wheel position - type: string - # enum: [] add enum values - sca_temp: - title: SCE temperature - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [K] - mpa_temp: - title: MPA temperature - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [K] - ewa_temp: - title: ewa temp ish (there's no actual temperature sensor inside) - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [K] - ewta_outer_heater_temp: - title: ewa_outer temperature sensor - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [K] - ewta_inner_heater_temp: - title: ewa_inner temperature sensor - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [K] - coba_temp_near_ewta: - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [K] - scea_temp: - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [K] - wfi_sce_1_vbiasgate_v: - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [V] - wfi_sce_1_vbiaspwr_i: - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [A] - wfi_sce_1_vbiaspwr_v: - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [V] - wfi_sce_1_vreset_v: - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [V] - wfi_sce_1_vreset_i: - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [A] - wfi_mcu_a_offs_csense_fpssen: - title: temperature in eng units -> will change for TVAC2. - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - # needs a datatype - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [K] + tag: asdf://stsci.edu/datamodels/roman/tags/tvac_groundtest-1.0.0 + required: [groundtest] data: title: Science data, including the border reference pixels. diff --git a/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml new file mode 100644 index 00000000..865cfe72 --- /dev/null +++ b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml @@ -0,0 +1,235 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/tvac_groundtest-1.0.0 + +title: TVAC Ground Test Information +allOf: + - $ref: asdf://stsci.edu/datamodels/roman/schemas/groundtest-1.0.0 + - type: object + properties: + activity_number: + title: TVAC Activity Number + type: integer + led_bank1_band_number_on: + title: Band number of LED illuminating in the sRCS in bank 1 + type: array + items: + type: integer + led_bank2_band_number_on: + title: Band number of LED illuminating in the sRCS in bank 2 + type: array + items: + type: integer + led_bank1_approx_wlen: + title: Approximate wavelength of LED illuminating in the sRCS in bank 1 + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + # needs a datatype and ndim + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: ["nm"] + led_bank2_approx_wlen: + title: Approximate wavelength of LED illuminating in the sRCS in bank 2 + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + value: + tag: tag:stsci.edu:asdf/core/ndarray-1.* + # needs a datatype and ndim + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: ["nm"] + srcs_pd_voltage: + title: sRCS Photodiode Voltage + type: number + srcs_led_flux: + title: Target flux for the sRCS LEDs + type: number + wfi_mce_srcs_bank1_led_i: + title: | + Commanded current for the SRCS -> GSFC will send us the flux + in target e-/s/px in the center of the sca + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + # enum: [] # needs a list of units + wfi_mce_srcs_bank1_led_range: + title: | + Commanded range for the SRCS -> GSFC will send us the flux in + target e-/s/px in the center of the sca + type: string + # enum: [] add enum values + wfi_mce_srcs_bank2_led_i: + title: | + Commanded current for the SRCS -> GSFC will send us the flux + in target e-/s/px in the center of the sca + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + # enum: [] # needs a list of units + wfi_mce_srcs_bank2_led_range: + title: | + Commanded range for the SRCS -> GSFC will send us the flux in + target e-/s/px in the center of the sca + type: string + # enum: [] add enum values + srcs_led_current: + title: Input LED current set point + type: number + wfi_opt_targettype: + title: WFI-team defined target types + type: string + enum: [NONE, FLAT-sRCS, FLAT-SORC, POINT SOURCE, SPECTRUM, DARK, + DARK-DARKEL, DARK-W146, PHARET-GW, PHARET-FF, PHARET-FF-F158, + PHARET-FF-M3MM, PHARET-FF-M6MM, PHARET-FF-P3MM, PHARET-FF-P6MM, + PHARET-FF-PRISM, PHARET-FF-W146, POINT-SOURCE-GW, STRAY LIGHT] + analysis_tag: + title: WFI-team defined tags for data aggregation/analysis + type: string + gsorc_pose_mode: + title: SORC pose mode + type: string + # enum: [] add enum values + gsorc_pose_target: + title: SORC pose target + type: string + # enum: [] add enum values + gsorc_sds_active_atten: + title: Attenuation from SDS + type: number + gsorc_sds_lltfir_wave: + title: Commanded wavelength for the LLTF + gsorc_sds_sorc_on: + title: SORC on/off + type: boolean + gsorc_sds_sorc_wlen: + title: SORC wavelength + type: number + gsorc_sds_active_source: + title: Laser name + type: string + gsorc_sds_dq_pulse: + title: whether the source is pulsing or not + type: string + enum: [pulse, cw] + gsorc_sds_daq_pw: + title: pulse width – originally in HDF5 file is in units of 0.1 ms + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [ms] + gsorc_heater1_setpt: + title: SORC temperature set point + type: number + wfi_otp_wfi_ewa: + title: Element Wheel position + type: string + # enum: [] add enum values + sca_temp: + title: SCE temperature + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + mpa_temp: + title: MPA temperature + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + ewa_temp: + title: ewa temp ish (there's no actual temperature sensor inside) + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + ewta_outer_heater_temp: + title: ewa_outer temperature sensor + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + ewta_inner_heater_temp: + title: ewa_inner temperature sensor + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + coba_temp_near_ewta: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + scea_temp: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + wfi_sce_1_vbiasgate_v: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [V] + wfi_sce_1_vbiaspwr_i: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [A] + wfi_sce_1_vbiaspwr_v: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [V] + wfi_sce_1_vreset_v: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [V] + wfi_sce_1_vreset_i: + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [A] + wfi_mcu_a_offs_csense_fpssen: + title: temperature in eng units -> will change for TVAC2. + tag: tag:stsci.edu:asdf/unit/quantity-1.* + properties: + # needs a datatype + unit: + tag: tag:stsci.edu:asdf/unit/unit-1.* + enum: [K] + +flowStyle: block +... From 2d65fbea66604b4e87dc9fd9f3934e41feae1366 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Fri, 9 Feb 2024 15:05:52 -0500 Subject: [PATCH 09/17] Update unit for LED --- src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml index 865cfe72..f4bdcb84 100644 --- a/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml @@ -56,7 +56,7 @@ allOf: # needs a datatype unit: tag: tag:stsci.edu:asdf/unit/unit-1.* - # enum: [] # needs a list of units + enum: ["A"] wfi_mce_srcs_bank1_led_range: title: | Commanded range for the SRCS -> GSFC will send us the flux in @@ -72,7 +72,7 @@ allOf: # needs a datatype unit: tag: tag:stsci.edu:asdf/unit/unit-1.* - # enum: [] # needs a list of units + enum: ["A"] wfi_mce_srcs_bank2_led_range: title: | Commanded range for the SRCS -> GSFC will send us the flux in From 3a822ffcc883a2dc527d8243640da82f0d28866a Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Tue, 6 Feb 2024 10:51:32 -0500 Subject: [PATCH 10/17] Update changelog --- CHANGES.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index b38fd695..2c5e0bd2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,6 +8,8 @@ - Add documentation on how to create a new schema. [#375] +- Add ``FPS`` and ``TVAC`` schemas. [#364] + 0.19.0 (2024-02-09) ------------------- From 194a8fd181389f4ec0379ab646a902c07b6e5b54 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Fri, 9 Feb 2024 15:06:45 -0500 Subject: [PATCH 11/17] Add archive destination information --- .../schemas/ground_common-1.0.0.yaml | 3 + .../resources/schemas/groundtest-1.0.0.yaml | 48 ++++++++ .../schemas/tvac_groundtest-1.0.0.yaml | 103 ++++++++++++++++++ 3 files changed, 154 insertions(+) diff --git a/src/rad/resources/schemas/ground_common-1.0.0.yaml b/src/rad/resources/schemas/ground_common-1.0.0.yaml index 98a60a13..0685268b 100644 --- a/src/rad/resources/schemas/ground_common-1.0.0.yaml +++ b/src/rad/resources/schemas/ground_common-1.0.0.yaml @@ -27,6 +27,9 @@ allOf: hdf5_telemetry: title: Original Raw HDF5 telemetry keywords type: string + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.hdf5_telemetry] gw_meta: title: Guide Window HDF5 metadata type: object diff --git a/src/rad/resources/schemas/groundtest-1.0.0.yaml b/src/rad/resources/schemas/groundtest-1.0.0.yaml index 6511104e..bb81db67 100644 --- a/src/rad/resources/schemas/groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/groundtest-1.0.0.yaml @@ -9,42 +9,81 @@ properties: test_name: title: I&T Test Name type: string + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.test_name] test_phase: title: I&T Testing Phase type: string + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.test_phase] test_environment: title: I&T Testing Environment type: string + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.test_environment] test_script: title: Name of Testing Script Run type: string + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.test_script] product_date: title: Source File Creation Time tag: tag:stsci.edu:asdf/time/time-1.* + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.product_date] product_version: title: I&T Software Used to Generate Source File type: string + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.product_version] conversion_date: title: HDF5 to ASDF Conversion Date tag: tag:stsci.edu:asdf/time/time-1.* + archive_catalog: + datatype: datetime2 + destination: [TableTBA.conversion_date] conversion_version: title: HDF5 to ASDF Converter Version type: string + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.conversion_version] filename_pnt5: title: L0.5 File Name type: string + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.filename_pnt5] filepath_level_pnt5: title: L0.5 File Path type: string + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.filepath_level_pnt5] filename_l1a: title: L1A File Name type: string + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.filename_l1a] detector_id: title: SCA Identifier type: string + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.detector_id] detector_temp: title: Mean Detector Temperature (Kelvin) type: number + archive_catalog: + datatype: float + destination: [TableTBA.detector_temp] frames_temp: title: Interpolated Temperature of Frames (Kelvin) tag: tag:stsci.edu:asdf/core/ndarray-1.* @@ -52,12 +91,21 @@ properties: ota_temp: title: Mean OTA Temperature (Kelvin) type: number + archive_catalog: + datatype: float + destination: [TableTBA.ota_temp] rcs_on: title: RCS On/Off type: boolean + archive_catalog: + datatype: int + destination: [TableTBA.rcs_on] readout_col_num: title: Number of Readout Columns type: integer + archive_catalog: + datatype: int + destination: [TableTBA.readout_col_num] detector_pixel_size: title: Pixel Size (cm) tag: tag:stsci.edu:asdf/unit/quantity-1.* diff --git a/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml index f4bdcb84..dee9fbb6 100644 --- a/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml @@ -11,6 +11,9 @@ allOf: activity_number: title: TVAC Activity Number type: integer + archive_catalog: + datatype: int + destination: [TableTBA.activity_number] led_bank1_band_number_on: title: Band number of LED illuminating in the sRCS in bank 1 type: array @@ -44,9 +47,15 @@ allOf: srcs_pd_voltage: title: sRCS Photodiode Voltage type: number + archive_catalog: + datatype: float + destination: [TableTBA.srcs_pd_voltage] srcs_led_flux: title: Target flux for the sRCS LEDs type: number + archive_catalog: + datatype: float + destination: [TableTBA.srcs_led_flux] wfi_mce_srcs_bank1_led_i: title: | Commanded current for the SRCS -> GSFC will send us the flux @@ -57,12 +66,18 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: ["A"] + archive_catalog: + datatype: float + destination: [TableTBA.wfi_mce_srcs_bank1_led_i] wfi_mce_srcs_bank1_led_range: title: | Commanded range for the SRCS -> GSFC will send us the flux in target e-/s/px in the center of the sca type: string # enum: [] add enum values + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.wfi_mce_srcs_bank1_led_range] wfi_mce_srcs_bank2_led_i: title: | Commanded current for the SRCS -> GSFC will send us the flux @@ -73,15 +88,24 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: ["A"] + archive_catalog: + datatype: float + destination: [TableTBA.wfi_mce_srcs_bank2_led_i] wfi_mce_srcs_bank2_led_range: title: | Commanded range for the SRCS -> GSFC will send us the flux in target e-/s/px in the center of the sca type: string # enum: [] add enum values + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.wfi_mce_srcs_bank2_led_range] srcs_led_current: title: Input LED current set point type: number + archive_catalog: + datatype: float + destination: [TableTBA.srcs_led_current] wfi_opt_targettype: title: WFI-team defined target types type: string @@ -89,35 +113,66 @@ allOf: DARK-DARKEL, DARK-W146, PHARET-GW, PHARET-FF, PHARET-FF-F158, PHARET-FF-M3MM, PHARET-FF-M6MM, PHARET-FF-P3MM, PHARET-FF-P6MM, PHARET-FF-PRISM, PHARET-FF-W146, POINT-SOURCE-GW, STRAY LIGHT] + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.wfi_opt_targettype] analysis_tag: title: WFI-team defined tags for data aggregation/analysis type: string + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.analysis_tag] gsorc_pose_mode: title: SORC pose mode type: string # enum: [] add enum values + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.gsorc_pose_mode] gsorc_pose_target: title: SORC pose target type: string # enum: [] add enum values + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.gsorc_pose_target] gsorc_sds_active_atten: title: Attenuation from SDS type: number + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.gsorc_sds_active_atten] gsorc_sds_lltfir_wave: title: Commanded wavelength for the LLTF + type: number + archive_catalog: + datatype: float + destination: [TableTBA.gsorc_sds_lltfir_wave] gsorc_sds_sorc_on: title: SORC on/off type: boolean + archive_catalog: + datatype: int + destination: [TableTBA.gsorc_sds_sorc_on] gsorc_sds_sorc_wlen: title: SORC wavelength type: number + archive_catalog: + datatype: float + destination: [TableTBA.gsorc_sds_sorc_wlen] gsorc_sds_active_source: title: Laser name type: string + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.gsorc_sds_active_source] gsorc_sds_dq_pulse: title: whether the source is pulsing or not type: string enum: [pulse, cw] + archive_catalog: + datatype: nvarchar(max) + destination: [TableTBA.gsorc_sds_dq_pulse] gsorc_sds_daq_pw: title: pulse width – originally in HDF5 file is in units of 0.1 ms tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -126,13 +181,22 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [ms] + archive_catalog: + datatype: float + destination: [TableTBA.gsorc_sds_daq_pw] gsorc_heater1_setpt: title: SORC temperature set point type: number + archive_catalog: + datatype: float + destination: [TableTBA.gsorc_heater1_setpt] wfi_otp_wfi_ewa: title: Element Wheel position type: string # enum: [] add enum values + archive_catalog: + datatype: float + destination: [TableTBA.wfi_otp_wfi_ewa] sca_temp: title: SCE temperature tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -141,6 +205,9 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [K] + archive_catalog: + datatype: float + destination: [TableTBA.sca_temp] mpa_temp: title: MPA temperature tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -149,6 +216,9 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [K] + archive_catalog: + datatype: float + destination: [TableTBA.mpa_temp] ewa_temp: title: ewa temp ish (there's no actual temperature sensor inside) tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -157,6 +227,9 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [K] + archive_catalog: + datatype: float + destination: [TableTBA.ewa_temp] ewta_outer_heater_temp: title: ewa_outer temperature sensor tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -165,6 +238,9 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [K] + archive_catalog: + datatype: float + destination: [TableTBA.ewta_outer_heater_temp] ewta_inner_heater_temp: title: ewa_inner temperature sensor tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -173,6 +249,9 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [K] + archive_catalog: + datatype: float + destination: [TableTBA.ewta_inner_heater_temp] coba_temp_near_ewta: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -180,6 +259,9 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [K] + archive_catalog: + datatype: float + destination: [TableTBA.coba_temp_near_ewta] scea_temp: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -187,6 +269,9 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [K] + archive_catalog: + datatype: float + destination: [TableTBA.scea_temp] wfi_sce_1_vbiasgate_v: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -194,6 +279,9 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [V] + archive_catalog: + datatype: float + destination: [TableTBA.wfi_sce_1_vbiasgate_v] wfi_sce_1_vbiaspwr_i: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -201,6 +289,9 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [A] + archive_catalog: + datatype: float + destination: [TableTBA.wfi_sce_1_vbiaspwr_i] wfi_sce_1_vbiaspwr_v: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -208,6 +299,9 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [V] + archive_catalog: + datatype: float + destination: [TableTBA.wfi_sce_1_vbiaspwr_v] wfi_sce_1_vreset_v: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -215,6 +309,9 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [V] + archive_catalog: + datatype: float + destination: [TableTBA.wfi_sce_1_vreset_v] wfi_sce_1_vreset_i: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -222,6 +319,9 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [A] + archive_catalog: + datatype: float + destination: [TableTBA.wfi_sce_1_vreset_i] wfi_mcu_a_offs_csense_fpssen: title: temperature in eng units -> will change for TVAC2. tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -230,6 +330,9 @@ allOf: unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: [K] + archive_catalog: + datatype: float + destination: [TableTBA.wfi_mcu_a_offs_csense_fpssen] flowStyle: block ... From 00182c9e8cafc0dbed2c7a0ef5ea9b9d446a4ac5 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Fri, 9 Feb 2024 15:37:59 -0500 Subject: [PATCH 12/17] Add exact datatype where needed --- src/rad/resources/schemas/fps-1.0.0.yaml | 7 +++++++ src/rad/resources/schemas/groundtest-1.0.0.yaml | 12 +++++++++--- src/rad/resources/schemas/tvac-1.0.0.yaml | 7 +++++++ src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml | 8 ++++++-- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/rad/resources/schemas/fps-1.0.0.yaml b/src/rad/resources/schemas/fps-1.0.0.yaml index ea456704..04491765 100644 --- a/src/rad/resources/schemas/fps-1.0.0.yaml +++ b/src/rad/resources/schemas/fps-1.0.0.yaml @@ -28,6 +28,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* @@ -40,6 +41,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* @@ -52,6 +54,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* @@ -64,6 +67,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* @@ -76,6 +80,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* @@ -88,6 +93,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* @@ -100,6 +106,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* diff --git a/src/rad/resources/schemas/groundtest-1.0.0.yaml b/src/rad/resources/schemas/groundtest-1.0.0.yaml index bb81db67..944a2a36 100644 --- a/src/rad/resources/schemas/groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/groundtest-1.0.0.yaml @@ -87,7 +87,9 @@ properties: frames_temp: title: Interpolated Temperature of Frames (Kelvin) tag: tag:stsci.edu:asdf/core/ndarray-1.* - # needs a datatype and ndim + datatype: float64 + exact_datatype: true + # needs a ndim ota_temp: title: Mean OTA Temperature (Kelvin) type: number @@ -112,14 +114,18 @@ properties: properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* - # needs a datatype and ndim + datatype: float64 + exact_datatype: true + # needs ndim unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: ["cm"] sensor_error: title: Sensor Error tag: tag:stsci.edu:asdf/core/ndarray-1.* - # needs a datatype and ndim + datatype: float64 + exact_datatype: true + # needs ndim propertyOrder: [test_name, test_phase, test_environment, test_script, product_date, product_version, conversion_date, conversion_version, diff --git a/src/rad/resources/schemas/tvac-1.0.0.yaml b/src/rad/resources/schemas/tvac-1.0.0.yaml index 59b4a5ba..4a32dafa 100644 --- a/src/rad/resources/schemas/tvac-1.0.0.yaml +++ b/src/rad/resources/schemas/tvac-1.0.0.yaml @@ -28,6 +28,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* @@ -40,6 +41,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* @@ -52,6 +54,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* @@ -64,6 +67,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* @@ -76,6 +80,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* @@ -88,6 +93,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* @@ -100,6 +106,7 @@ properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint16 + exact_datatype: true ndim: 3 unit: tag: tag:astropy.org:astropy/units/unit-1.* diff --git a/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml index dee9fbb6..8f622629 100644 --- a/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml @@ -30,7 +30,9 @@ allOf: properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* - # needs a datatype and ndim + datatype: float64 + exact_datatype: true + # needs ndim unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: ["nm"] @@ -40,7 +42,9 @@ allOf: properties: value: tag: tag:stsci.edu:asdf/core/ndarray-1.* - # needs a datatype and ndim + datatype: float64 + exact_datatype: true + # needs ndim unit: tag: tag:stsci.edu:asdf/unit/unit-1.* enum: ["nm"] From 953191099d62d3fd5cb587837e107ce837e7fb20 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Fri, 9 Feb 2024 16:07:45 -0500 Subject: [PATCH 13/17] Update with Jason's table names --- src/rad/resources/schemas/cal_step-1.0.0.yaml | 30 ++++---- .../schemas/ground_exposure-1.0.0.yaml | 26 +++---- .../schemas/ground_guidestar-1.0.0.yaml | 20 +++--- .../resources/schemas/groundtest-1.0.0.yaml | 32 ++++----- src/rad/resources/schemas/ref_file-1.0.0.yaml | 24 +++---- .../schemas/tvac_groundtest-1.0.0.yaml | 68 +++++++++---------- src/rad/resources/schemas/wfi_mode-1.0.0.yaml | 6 +- 7 files changed, 103 insertions(+), 103 deletions(-) diff --git a/src/rad/resources/schemas/cal_step-1.0.0.yaml b/src/rad/resources/schemas/cal_step-1.0.0.yaml index bdd377c9..28a60f35 100644 --- a/src/rad/resources/schemas/cal_step-1.0.0.yaml +++ b/src/rad/resources/schemas/cal_step-1.0.0.yaml @@ -12,105 +12,105 @@ properties: enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_assign_wcs, GuideWindow.s_assign_wcs] + destination: [ScienceRefData.s_assign_wcs, GuideWindow.s_assign_wcs, WFICommon.s_assign_wcs] flat_field: title: Flat Field Step type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_flat_field, GuideWindow.s_flat_field] + destination: [ScienceRefData.s_flat_field, GuideWindow.s_flat_field, WFICommon.s_flat_field] dark: title: Dark Subtraction type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_dark, GuideWindow.s_dark] + destination: [ScienceRefData.s_dark, GuideWindow.s_dark, WFICommon.s_dark] dq_init: title: Data Quality Mask Step type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_dq_init, GuideWindow.s_dq_init] + destination: [ScienceRefData.s_dq_init, GuideWindow.s_dq_init, WFICommon.s_dq_init] jump: title: Jump Detection Step type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_jump, GuideWindow.s_jump] + destination: [ScienceRefData.s_jump, GuideWindow.s_jump, WFICommon.s_jump] linearity: title: Linearity Correction type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_linearity, GuideWindow.s_linearity] + destination: [ScienceRefData.s_linearity, GuideWindow.s_linearity, WFICommon.s_linearity] photom: title: Photometry Step type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_photom, GuideWindow.s_photom] + destination: [ScienceRefData.s_photom, GuideWindow.s_photom, WFICommon.s_photom] source_detection: title: Source Detection Step type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_source_detection, GuideWindow.s_source_detection] + destination: [ScienceRefData.s_source_detection, GuideWindow.s_source_detection, WFICommon.s_source_detection] ramp_fit: title: Ramp Fitting type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_ramp_fit, GuideWindow.s_ramp_fit] + destination: [ScienceRefData.s_ramp_fit, GuideWindow.s_ramp_fit, WFICommon.s_ramp_fit] refpix: title: Reference Pixel Correction type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_refpix, GuideWindow.s_refpix] + destination: [ScienceRefData.s_refpix, GuideWindow.s_refpix, WFICommon.s_refpix] saturation: title: Saturation Checking type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_saturation, GuideWindow.s_saturation] + destination: [ScienceRefData.s_saturation, GuideWindow.s_saturation, WFICommon.s_saturation] outlier_detection: title: outlier_detection type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_outlier_detection, GuideWindow.s_outlier_detection] + destination: [ScienceRefData.s_outlier_detection, GuideWindow.s_outlier_detection, WFICommon.s_outlier_detection] tweakreg: title: Tweakreg step type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_tweakreg, GuideWindow.s_tweakreg] + destination: [ScienceRefData.s_tweakreg, GuideWindow.s_tweakreg, WFICommon.s_tweakreg] skymatch: title: Sky Match step type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_skymatch, GuideWindow.s_skymatch] + destination: [ScienceRefData.s_skymatch, GuideWindow.s_skymatch, WFICommon.s_skymatch] resample: title: Resample Step type: string enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE'] archive_catalog: datatype: nvarchar(15) - destination: [ScienceRefData.s_resample, GuideWindow.s_resample] + destination: [ScienceRefData.s_resample, GuideWindow.s_resample, WFICommon.s_resample] propertyOrder: [assign_wcs, flat_field, dark, dq_init, jump, linearity, photom, source_detection, outlier_detection, ramp_fit, refpix, saturation, skymatch, tweakreg, resample] flowStyle: block required: [assign_wcs, flat_field, dark, dq_init, jump, linearity, outlier_detection, photom, source_detection, ramp_fit, refpix, resample, saturation, skymatch, tweakreg] diff --git a/src/rad/resources/schemas/ground_exposure-1.0.0.yaml b/src/rad/resources/schemas/ground_exposure-1.0.0.yaml index 2a4950ba..c806632d 100644 --- a/src/rad/resources/schemas/ground_exposure-1.0.0.yaml +++ b/src/rad/resources/schemas/ground_exposure-1.0.0.yaml @@ -17,7 +17,7 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(25) - destination: [ScienceCommon.exposure_type, GuideWindow.exposure_type] + destination: [ScienceCommon.exposure_type, GuideWindow.exposure_type, WFICommon.exposure_type] start_time: title: UTC exposure start time description: | @@ -30,7 +30,7 @@ properties: origin: TBD archive_catalog: datatype: datetime2 - destination: [ScienceCommon.exposure_start_time, GuideWindow.exposure_start_time] + destination: [ScienceCommon.exposure_start_time, GuideWindow.exposure_start_time, WFICommon.exposure_start_time] ngroups: title: Number of groups in integration description: | @@ -44,7 +44,7 @@ properties: origin: TBD archive_catalog: datatype: int - destination: [ScienceCommon.exposure_ngroups, GuideWindow.exposure_ngroups] + destination: [ScienceCommon.exposure_ngroups, GuideWindow.exposure_ngroups, WFICommon.exposure_ngroups] nframes: title: Number of frames per group description: | @@ -57,7 +57,7 @@ properties: origin: TBD archive_catalog: datatype: int - destination: [ScienceCommon.exposure_nframes, GuideWindow.exposure_nframes] + destination: [ScienceCommon.exposure_nframes, GuideWindow.exposure_nframes, WFICommon.exposure_nframes] data_problem: title: Science telemetry indicated a problem description: | @@ -70,7 +70,7 @@ properties: origin: TBD archive_catalog: datatype: nchar(1) - destination: [ScienceCommon.exposure_data_problem, GuideWindow.exposure_data_problem] + destination: [ScienceCommon.exposure_data_problem, GuideWindow.exposure_data_problem, WFICommon.exposure_data_problem] frame_divisor: title: Divisor applied to frame-averaged groups description: | @@ -83,7 +83,7 @@ properties: origin: TBD archive_catalog: datatype: int - destination: [ScienceCommon.exposure_frame_divisor, GuideWindow.exposure_frame_divisor] + destination: [ScienceCommon.exposure_frame_divisor, GuideWindow.exposure_frame_divisor, WFICommon.exposure_frame_divisor] groupgap: title: Number of frames dropped between groups description: This is the number of reads that are "dropped" and not used in the resultant. @@ -94,7 +94,7 @@ properties: origin: TBD archive_catalog: datatype: int - destination: [ScienceCommon.exposure_groupgap, GuideWindow.exposure_groupgap] + destination: [ScienceCommon.exposure_groupgap, GuideWindow.exposure_groupgap, WFICommon.exposure_groupgap] frame_time: title: "[s] Time between frames" description: | @@ -107,7 +107,7 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.exposure_frame_time, GuideWindow.exposure_frame_time] + destination: [ScienceCommon.exposure_frame_time, GuideWindow.exposure_frame_time, WFICommon.exposure_frame_time] group_time: title: "[s] Time between groups" description: | @@ -120,7 +120,7 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.exposure_group_time, GuideWindow.exposure_group_time] + destination: [ScienceCommon.exposure_group_time, GuideWindow.exposure_group_time, WFICommon.exposure_group_time] exposure_time: title: "[s] exposure time" description: | @@ -133,7 +133,7 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.exposure_time, GuideWindow.exposure_time] + destination: [ScienceCommon.exposure_time, GuideWindow.exposure_time, WFICommon.exposure_time] ma_table_name: title: Identifier for the multi-accumulation table used description: | @@ -146,7 +146,7 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(50) - destination: [ScienceCommon.ma_table_name, GuideWindow.ma_table_name] + destination: [ScienceCommon.ma_table_name, GuideWindow.ma_table_name, WFICommon.ma_table_name] ma_table_number: title: Numerical identifier for the multi-accumulation table used description: | @@ -160,7 +160,7 @@ properties: origin: TBD archive_catalog: datatype: smallint - destination: [ScienceCommon.ma_table_number, GuideWindow.ma_table_number] + destination: [ScienceCommon.ma_table_number, GuideWindow.ma_table_number, WFICommon.ma_table_number] read_pattern: title: Pattern of reads description: | @@ -177,7 +177,7 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(3500) - destination: [ScienceCommon.read_pattern, GuideWindow.read_pattern] + destination: [ScienceCommon.read_pattern, GuideWindow.read_pattern, WFICommon.read_pattern] propertyOrder: [type, start_time, ngroups, nframes, data_problem, frame_divisor, groupgap, frame_time, group_time, exposure_time, diff --git a/src/rad/resources/schemas/ground_guidestar-1.0.0.yaml b/src/rad/resources/schemas/ground_guidestar-1.0.0.yaml index 40c89f2b..d0c8160e 100644 --- a/src/rad/resources/schemas/ground_guidestar-1.0.0.yaml +++ b/src/rad/resources/schemas/ground_guidestar-1.0.0.yaml @@ -15,7 +15,7 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(20) - destination: [ScienceCommon.gw_id, GuideWindow.gw_id] + destination: [ScienceCommon.gw_id, GuideWindow.gw_id, WFICommon.gw_id] gw_fgs_mode: $ref: asdf://stsci.edu/datamodels/roman/schemas/guidewindow_modes-1.0.0 sdf: @@ -24,7 +24,7 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(18) - destination: [ScienceCommon.gw_fgs_mode, GuideWindow.gw_fgs_mode] + destination: [ScienceCommon.gw_fgs_mode, GuideWindow.gw_fgs_mode, WFICommon.gw_fgs_mode] data_start: title: MJD start time of guider data within this file type: number @@ -34,7 +34,7 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.data_start, GuideWindow.data_start] + destination: [ScienceCommon.data_start, GuideWindow.data_start, WFICommon.data_start] data_end: title: MJD end time of guider data within this file type: number @@ -44,7 +44,7 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.data_end, GuideWindow.data_end] + destination: [ScienceCommon.data_end, GuideWindow.data_end, WFICommon.data_end] gw_window_xstart: title: Guide window x start position on the detector type: integer @@ -54,7 +54,7 @@ properties: origin: Science Data Formatting archive_catalog: datatype: int - destination: [ScienceCommon.gw_window_xstart] + destination: [ScienceCommon.gw_window_xstart, WFICommon.gw_window_xstart] gw_window_ystart: title: Guide window y start position on the detector type: integer @@ -64,7 +64,7 @@ properties: origin: Science Data Formatting archive_catalog: datatype: int - destination: [ScienceCommon.gw_window_ystart] + destination: [ScienceCommon.gw_window_ystart, WFICommon.gw_window_ystart] gw_window_xstop: title: Guide window x stop position on the detector type: integer @@ -74,7 +74,7 @@ properties: origin: Science Data Formatting archive_catalog: datatype: int - destination: [ScienceCommon.gw_window_xstop] + destination: [ScienceCommon.gw_window_xstop, WFICommon.gw_window_xstop] gw_window_ystop: title: Guide window y stop position on the detector type: integer @@ -84,7 +84,7 @@ properties: origin: Science Data Formatting archive_catalog: datatype: int - destination: [ScienceCommon.gw_window_ystop] + destination: [ScienceCommon.gw_window_ystop, WFICommon.gw_window_ystop] gw_window_xsize: title: Guide window size in the x direction in detector coordinates type: integer @@ -94,7 +94,7 @@ properties: origin: Science Data Formatting archive_catalog: datatype: int - destination: [ScienceCommon.gw_window_xsize] + destination: [ScienceCommon.gw_window_xsize, WFICommon.gw_window_xsize] gw_window_ysize: title: Guide window size in the y direction in detector coordinates type: integer @@ -104,7 +104,7 @@ properties: origin: Science Data Formatting archive_catalog: datatype: int - destination: [ScienceCommon.gw_window_ysize] + destination: [ScienceCommon.gw_window_ysize, WFICommon.gw_window_ysize] propertyOrder: [gw_id, gw_fgs_mode, data_start, data_end, gw_window_xstart, gw_window_ystart, gw_window_xstop, gw_window_ystop, gw_window_xsize, diff --git a/src/rad/resources/schemas/groundtest-1.0.0.yaml b/src/rad/resources/schemas/groundtest-1.0.0.yaml index 944a2a36..d0005dd3 100644 --- a/src/rad/resources/schemas/groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/groundtest-1.0.0.yaml @@ -11,79 +11,79 @@ properties: type: string archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.test_name] + destination: [WFICommon.test_name] test_phase: title: I&T Testing Phase type: string archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.test_phase] + destination: [WFICommon.test_phase] test_environment: title: I&T Testing Environment type: string archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.test_environment] + destination: [WFICommon.test_environment] test_script: title: Name of Testing Script Run type: string archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.test_script] + destination: [WFICommon.test_script] product_date: title: Source File Creation Time tag: tag:stsci.edu:asdf/time/time-1.* archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.product_date] + destination: [WFICommon.product_date] product_version: title: I&T Software Used to Generate Source File type: string archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.product_version] + destination: [WFICommon.product_version] conversion_date: title: HDF5 to ASDF Conversion Date tag: tag:stsci.edu:asdf/time/time-1.* archive_catalog: datatype: datetime2 - destination: [TableTBA.conversion_date] + destination: [WFICommon.conversion_date] conversion_version: title: HDF5 to ASDF Converter Version type: string archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.conversion_version] + destination: [WFICommon.conversion_version] filename_pnt5: title: L0.5 File Name type: string archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.filename_pnt5] + destination: [WFICommon.filename_pnt5] filepath_level_pnt5: title: L0.5 File Path type: string archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.filepath_level_pnt5] + destination: [WFICommon.filepath_level_pnt5] filename_l1a: title: L1A File Name type: string archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.filename_l1a] + destination: [WFICommon.filename_l1a] detector_id: title: SCA Identifier type: string archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.detector_id] + destination: [WFICommon.detector_id] detector_temp: title: Mean Detector Temperature (Kelvin) type: number archive_catalog: datatype: float - destination: [TableTBA.detector_temp] + destination: [WFICommon.detector_temp] frames_temp: title: Interpolated Temperature of Frames (Kelvin) tag: tag:stsci.edu:asdf/core/ndarray-1.* @@ -95,19 +95,19 @@ properties: type: number archive_catalog: datatype: float - destination: [TableTBA.ota_temp] + destination: [WFICommon.ota_temp] rcs_on: title: RCS On/Off type: boolean archive_catalog: datatype: int - destination: [TableTBA.rcs_on] + destination: [WFICommon.rcs_on] readout_col_num: title: Number of Readout Columns type: integer archive_catalog: datatype: int - destination: [TableTBA.readout_col_num] + destination: [WFICommon.readout_col_num] detector_pixel_size: title: Pixel Size (cm) tag: tag:stsci.edu:asdf/unit/quantity-1.* diff --git a/src/rad/resources/schemas/ref_file-1.0.0.yaml b/src/rad/resources/schemas/ref_file-1.0.0.yaml index 4b7fc9c9..534526c4 100644 --- a/src/rad/resources/schemas/ref_file-1.0.0.yaml +++ b/src/rad/resources/schemas/ref_file-1.0.0.yaml @@ -21,7 +21,7 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(120) - destination: [ScienceCommon.crds_software_version, GuideWindow.crds_software_version] + destination: [ScienceCommon.crds_software_version, GuideWindow.crds_software_version, WFICommon.crds_software_version] context_used: title: CRDS context (.pmap) used to select ref files @@ -32,67 +32,67 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(120) - destination: [ScienceCommon.crds_context_used, GuideWindow.crds_context_used] + destination: [ScienceCommon.crds_context_used, GuideWindow.crds_context_used, WFICommon.crds_context_used] dark: title: Dark reference file information type: string archive_catalog: datatype: nvarchar(120) - destination: [ScienceRefData.r_dark, GuideWindow.r_dark] + destination: [ScienceRefData.r_dark, GuideWindow.r_dark, WFICommon.r_dark] distortion: title: Distortion reference file information type: string archive_catalog: datatype: nvarchar(120) - destination: [ScienceRefData.r_distortion, GuideWindow.r_distortion] + destination: [ScienceRefData.r_distortion, GuideWindow.r_distortion, WFICommon.r_distortion] mask: title: Mask reference file information type: string archive_catalog: datatype: nvarchar(120) - destination: [ScienceRefData.r_mask, GuideWindow.r_mask] + destination: [ScienceRefData.r_mask, GuideWindow.r_mask, WFICommon.r_mask] flat: title: Flat reference file information type: string archive_catalog: datatype: nvarchar(120) - destination: [ScienceRefData.r_flat, GuideWindow.r_flat] + destination: [ScienceRefData.r_flat, GuideWindow.r_flat, WFICommon.r_flat] gain: title: Gain reference file information type: string archive_catalog: datatype: nvarchar(120) - destination: [ScienceRefData.r_gain, GuideWindow.r_gain] + destination: [ScienceRefData.r_gain, GuideWindow.r_gain, WFICommon.r_gain] readnoise: title: Read noise reference file information type: string archive_catalog: datatype: nvarchar(120) - destination: [ScienceRefData.r_readnoise, GuideWindow.r_readnoise] + destination: [ScienceRefData.r_readnoise, GuideWindow.r_readnoise, WFICommon.r_readnoise] linearity: title: Linearity reference file information type: string archive_catalog: datatype: nvarchar(120) - destination: [ScienceRefData.r_linearity, GuideWindow.r_linearity] + destination: [ScienceRefData.r_linearity, GuideWindow.r_linearity, WFICommon.r_linearity] photom: title: Photometry reference file information type: string archive_catalog: datatype: nvarchar(120) - destination: [ScienceRefData.r_photom, GuideWindow.r_photom] + destination: [ScienceRefData.r_photom, GuideWindow.r_photom, WFICommon.r_photom] area: title: Area reference file information type: string archive_catalog: datatype: nvarchar(120) - destination: [ScienceRefData.r_area, GuideWindow.r_area] + destination: [ScienceRefData.r_area, GuideWindow.r_area, WFICommon.r_area] saturation: title: Saturation reference file information type: string archive_catalog: datatype: nvarchar(120) - destination: [ScienceRefData.r_saturation, GuideWindow.r_saturation] + destination: [ScienceRefData.r_saturation, GuideWindow.r_saturation, WFICommon.r_saturation] flowStyle: block ... diff --git a/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml index 8f622629..210710aa 100644 --- a/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml @@ -13,7 +13,7 @@ allOf: type: integer archive_catalog: datatype: int - destination: [TableTBA.activity_number] + destination: [WFITvac.activity_number] led_bank1_band_number_on: title: Band number of LED illuminating in the sRCS in bank 1 type: array @@ -53,13 +53,13 @@ allOf: type: number archive_catalog: datatype: float - destination: [TableTBA.srcs_pd_voltage] + destination: [WFITvac.srcs_pd_voltage] srcs_led_flux: title: Target flux for the sRCS LEDs type: number archive_catalog: datatype: float - destination: [TableTBA.srcs_led_flux] + destination: [WFITvac.srcs_led_flux] wfi_mce_srcs_bank1_led_i: title: | Commanded current for the SRCS -> GSFC will send us the flux @@ -72,7 +72,7 @@ allOf: enum: ["A"] archive_catalog: datatype: float - destination: [TableTBA.wfi_mce_srcs_bank1_led_i] + destination: [WFITvac.wfi_mce_srcs_bank1_led_i] wfi_mce_srcs_bank1_led_range: title: | Commanded range for the SRCS -> GSFC will send us the flux in @@ -81,7 +81,7 @@ allOf: # enum: [] add enum values archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.wfi_mce_srcs_bank1_led_range] + destination: [WFITvac.wfi_mce_srcs_bank1_led_range] wfi_mce_srcs_bank2_led_i: title: | Commanded current for the SRCS -> GSFC will send us the flux @@ -94,7 +94,7 @@ allOf: enum: ["A"] archive_catalog: datatype: float - destination: [TableTBA.wfi_mce_srcs_bank2_led_i] + destination: [WFITvac.wfi_mce_srcs_bank2_led_i] wfi_mce_srcs_bank2_led_range: title: | Commanded range for the SRCS -> GSFC will send us the flux in @@ -103,13 +103,13 @@ allOf: # enum: [] add enum values archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.wfi_mce_srcs_bank2_led_range] + destination: [WFITvac.wfi_mce_srcs_bank2_led_range] srcs_led_current: title: Input LED current set point type: number archive_catalog: datatype: float - destination: [TableTBA.srcs_led_current] + destination: [WFITvac.srcs_led_current] wfi_opt_targettype: title: WFI-team defined target types type: string @@ -119,64 +119,64 @@ allOf: PHARET-FF-PRISM, PHARET-FF-W146, POINT-SOURCE-GW, STRAY LIGHT] archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.wfi_opt_targettype] + destination: [WFITvac.wfi_opt_targettype] analysis_tag: title: WFI-team defined tags for data aggregation/analysis type: string archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.analysis_tag] + destination: [WFITvac.analysis_tag] gsorc_pose_mode: title: SORC pose mode type: string # enum: [] add enum values archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.gsorc_pose_mode] + destination: [WFITvac.gsorc_pose_mode] gsorc_pose_target: title: SORC pose target type: string # enum: [] add enum values archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.gsorc_pose_target] + destination: [WFITvac.gsorc_pose_target] gsorc_sds_active_atten: title: Attenuation from SDS type: number archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.gsorc_sds_active_atten] + destination: [WFITvac.gsorc_sds_active_atten] gsorc_sds_lltfir_wave: title: Commanded wavelength for the LLTF type: number archive_catalog: datatype: float - destination: [TableTBA.gsorc_sds_lltfir_wave] + destination: [WFITvac.gsorc_sds_lltfir_wave] gsorc_sds_sorc_on: title: SORC on/off type: boolean archive_catalog: datatype: int - destination: [TableTBA.gsorc_sds_sorc_on] + destination: [WFITvac.gsorc_sds_sorc_on] gsorc_sds_sorc_wlen: title: SORC wavelength type: number archive_catalog: datatype: float - destination: [TableTBA.gsorc_sds_sorc_wlen] + destination: [WFITvac.gsorc_sds_sorc_wlen] gsorc_sds_active_source: title: Laser name type: string archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.gsorc_sds_active_source] + destination: [WFITvac.gsorc_sds_active_source] gsorc_sds_dq_pulse: title: whether the source is pulsing or not type: string enum: [pulse, cw] archive_catalog: datatype: nvarchar(max) - destination: [TableTBA.gsorc_sds_dq_pulse] + destination: [WFITvac.gsorc_sds_dq_pulse] gsorc_sds_daq_pw: title: pulse width – originally in HDF5 file is in units of 0.1 ms tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -187,20 +187,20 @@ allOf: enum: [ms] archive_catalog: datatype: float - destination: [TableTBA.gsorc_sds_daq_pw] + destination: [WFITvac.gsorc_sds_daq_pw] gsorc_heater1_setpt: title: SORC temperature set point type: number archive_catalog: datatype: float - destination: [TableTBA.gsorc_heater1_setpt] + destination: [WFITvac.gsorc_heater1_setpt] wfi_otp_wfi_ewa: title: Element Wheel position type: string # enum: [] add enum values archive_catalog: datatype: float - destination: [TableTBA.wfi_otp_wfi_ewa] + destination: [WFITvac.wfi_otp_wfi_ewa] sca_temp: title: SCE temperature tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -211,7 +211,7 @@ allOf: enum: [K] archive_catalog: datatype: float - destination: [TableTBA.sca_temp] + destination: [WFITvac.sca_temp] mpa_temp: title: MPA temperature tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -222,7 +222,7 @@ allOf: enum: [K] archive_catalog: datatype: float - destination: [TableTBA.mpa_temp] + destination: [WFITvac.mpa_temp] ewa_temp: title: ewa temp ish (there's no actual temperature sensor inside) tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -233,7 +233,7 @@ allOf: enum: [K] archive_catalog: datatype: float - destination: [TableTBA.ewa_temp] + destination: [WFITvac.ewa_temp] ewta_outer_heater_temp: title: ewa_outer temperature sensor tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -244,7 +244,7 @@ allOf: enum: [K] archive_catalog: datatype: float - destination: [TableTBA.ewta_outer_heater_temp] + destination: [WFITvac.ewta_outer_heater_temp] ewta_inner_heater_temp: title: ewa_inner temperature sensor tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -255,7 +255,7 @@ allOf: enum: [K] archive_catalog: datatype: float - destination: [TableTBA.ewta_inner_heater_temp] + destination: [WFITvac.ewta_inner_heater_temp] coba_temp_near_ewta: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -265,7 +265,7 @@ allOf: enum: [K] archive_catalog: datatype: float - destination: [TableTBA.coba_temp_near_ewta] + destination: [WFITvac.coba_temp_near_ewta] scea_temp: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -275,7 +275,7 @@ allOf: enum: [K] archive_catalog: datatype: float - destination: [TableTBA.scea_temp] + destination: [WFITvac.scea_temp] wfi_sce_1_vbiasgate_v: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -285,7 +285,7 @@ allOf: enum: [V] archive_catalog: datatype: float - destination: [TableTBA.wfi_sce_1_vbiasgate_v] + destination: [WFITvac.wfi_sce_1_vbiasgate_v] wfi_sce_1_vbiaspwr_i: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -295,7 +295,7 @@ allOf: enum: [A] archive_catalog: datatype: float - destination: [TableTBA.wfi_sce_1_vbiaspwr_i] + destination: [WFITvac.wfi_sce_1_vbiaspwr_i] wfi_sce_1_vbiaspwr_v: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -305,7 +305,7 @@ allOf: enum: [V] archive_catalog: datatype: float - destination: [TableTBA.wfi_sce_1_vbiaspwr_v] + destination: [WFITvac.wfi_sce_1_vbiaspwr_v] wfi_sce_1_vreset_v: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -315,7 +315,7 @@ allOf: enum: [V] archive_catalog: datatype: float - destination: [TableTBA.wfi_sce_1_vreset_v] + destination: [WFITvac.wfi_sce_1_vreset_v] wfi_sce_1_vreset_i: tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: @@ -325,7 +325,7 @@ allOf: enum: [A] archive_catalog: datatype: float - destination: [TableTBA.wfi_sce_1_vreset_i] + destination: [WFITvac.wfi_sce_1_vreset_i] wfi_mcu_a_offs_csense_fpssen: title: temperature in eng units -> will change for TVAC2. tag: tag:stsci.edu:asdf/unit/quantity-1.* @@ -336,7 +336,7 @@ allOf: enum: [K] archive_catalog: datatype: float - destination: [TableTBA.wfi_mcu_a_offs_csense_fpssen] + destination: [WFITvac.wfi_mcu_a_offs_csense_fpssen] flowStyle: block ... diff --git a/src/rad/resources/schemas/wfi_mode-1.0.0.yaml b/src/rad/resources/schemas/wfi_mode-1.0.0.yaml index 7b4f5d5d..c9fa70b3 100644 --- a/src/rad/resources/schemas/wfi_mode-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mode-1.0.0.yaml @@ -18,7 +18,7 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(5) - destination: [ScienceCommon.instrument_name, GuideWindow.instrument_name] + destination: [ScienceCommon.instrument_name, GuideWindow.instrument_name, WFICommon.instrument_name] detector: $ref: wfi_detector-1.0.0 sdf: @@ -27,7 +27,7 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(10) - destination: [ScienceCommon.detector, GuideWindow.detector] + destination: [ScienceCommon.detector, GuideWindow.detector, WFICommon.detector] optical_element: $ref: wfi_optical_element-1.0.0 sdf: @@ -36,7 +36,7 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(20) - destination: [ScienceCommon.optical_element, GuideWindow.optical_element] + destination: [ScienceCommon.optical_element, GuideWindow.optical_element, WFICommon.optical_element] propertyOrder: [detector, optical_element, name] flowStyle: block required: [detector, optical_element, name] From efd7631245512680dd21112351cd2721f7e0264d Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Thu, 22 Feb 2024 15:53:33 -0500 Subject: [PATCH 14/17] Address review comments --- .../resources/schemas/groundtest-1.0.0.yaml | 4 ++-- .../schemas/tvac_groundtest-1.0.0.yaml | 23 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/rad/resources/schemas/groundtest-1.0.0.yaml b/src/rad/resources/schemas/groundtest-1.0.0.yaml index d0005dd3..ce12cdbf 100644 --- a/src/rad/resources/schemas/groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/groundtest-1.0.0.yaml @@ -34,7 +34,7 @@ properties: title: Source File Creation Time tag: tag:stsci.edu:asdf/time/time-1.* archive_catalog: - datatype: nvarchar(max) + datatype: datetime2 destination: [WFICommon.product_date] product_version: title: I&T Software Used to Generate Source File @@ -100,7 +100,7 @@ properties: title: RCS On/Off type: boolean archive_catalog: - datatype: int + datatype: nchar(1) destination: [WFICommon.rcs_on] readout_col_num: title: Number of Readout Columns diff --git a/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml index 210710aa..9876a13b 100644 --- a/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml @@ -19,7 +19,7 @@ allOf: type: array items: type: integer - led_bank2_band_number_on: + led_bank2_bank1_number_on: title: Band number of LED illuminating in the sRCS in bank 2 type: array items: @@ -118,33 +118,33 @@ allOf: PHARET-FF-M3MM, PHARET-FF-M6MM, PHARET-FF-P3MM, PHARET-FF-P6MM, PHARET-FF-PRISM, PHARET-FF-W146, POINT-SOURCE-GW, STRAY LIGHT] archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(20) destination: [WFITvac.wfi_opt_targettype] analysis_tag: title: WFI-team defined tags for data aggregation/analysis type: string archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(32) destination: [WFITvac.analysis_tag] gsorc_pose_mode: title: SORC pose mode type: string # enum: [] add enum values archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(20) destination: [WFITvac.gsorc_pose_mode] gsorc_pose_target: title: SORC pose target type: string # enum: [] add enum values archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(20) destination: [WFITvac.gsorc_pose_target] gsorc_sds_active_atten: title: Attenuation from SDS type: number archive_catalog: - datatype: nvarchar(max) + datatype: float destination: [WFITvac.gsorc_sds_active_atten] gsorc_sds_lltfir_wave: title: Commanded wavelength for the LLTF @@ -156,7 +156,7 @@ allOf: title: SORC on/off type: boolean archive_catalog: - datatype: int + datatype: nchar(1) destination: [WFITvac.gsorc_sds_sorc_on] gsorc_sds_sorc_wlen: title: SORC wavelength @@ -168,14 +168,14 @@ allOf: title: Laser name type: string archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(20) destination: [WFITvac.gsorc_sds_active_source] gsorc_sds_dq_pulse: title: whether the source is pulsing or not type: string enum: [pulse, cw] archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(10) destination: [WFITvac.gsorc_sds_dq_pulse] gsorc_sds_daq_pw: title: pulse width – originally in HDF5 file is in units of 0.1 ms @@ -199,7 +199,7 @@ allOf: type: string # enum: [] add enum values archive_catalog: - datatype: float + datatype: nvarchar(15) destination: [WFITvac.wfi_otp_wfi_ewa] sca_temp: title: SCE temperature @@ -257,6 +257,7 @@ allOf: datatype: float destination: [WFITvac.ewta_inner_heater_temp] coba_temp_near_ewta: + title: COBA temperature near element wheel tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: # needs a datatype @@ -267,6 +268,7 @@ allOf: datatype: float destination: [WFITvac.coba_temp_near_ewta] scea_temp: + title: SCEA temperature tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: # needs a datatype @@ -277,6 +279,7 @@ allOf: datatype: float destination: [WFITvac.scea_temp] wfi_sce_1_vbiasgate_v: + title: SCE gate voltage bias. tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: # needs a datatype From 4668d688fb1c5bc6133c9b4451230bb965b0b5b2 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Fri, 23 Feb 2024 09:53:16 -0500 Subject: [PATCH 15/17] More suggested changes --- .../schemas/ground_common-1.0.0.yaml | 3 --- .../resources/schemas/groundtest-1.0.0.yaml | 20 +++++++++---------- .../schemas/tvac_groundtest-1.0.0.yaml | 4 ++-- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/rad/resources/schemas/ground_common-1.0.0.yaml b/src/rad/resources/schemas/ground_common-1.0.0.yaml index 0685268b..98a60a13 100644 --- a/src/rad/resources/schemas/ground_common-1.0.0.yaml +++ b/src/rad/resources/schemas/ground_common-1.0.0.yaml @@ -27,9 +27,6 @@ allOf: hdf5_telemetry: title: Original Raw HDF5 telemetry keywords type: string - archive_catalog: - datatype: nvarchar(max) - destination: [TableTBA.hdf5_telemetry] gw_meta: title: Guide Window HDF5 metadata type: object diff --git a/src/rad/resources/schemas/groundtest-1.0.0.yaml b/src/rad/resources/schemas/groundtest-1.0.0.yaml index ce12cdbf..793d99ca 100644 --- a/src/rad/resources/schemas/groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/groundtest-1.0.0.yaml @@ -10,25 +10,25 @@ properties: title: I&T Test Name type: string archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(80) destination: [WFICommon.test_name] test_phase: title: I&T Testing Phase type: string archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(80) destination: [WFICommon.test_phase] test_environment: title: I&T Testing Environment type: string archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(80) destination: [WFICommon.test_environment] test_script: title: Name of Testing Script Run type: string archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(80) destination: [WFICommon.test_script] product_date: title: Source File Creation Time @@ -40,7 +40,7 @@ properties: title: I&T Software Used to Generate Source File type: string archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(80) destination: [WFICommon.product_version] conversion_date: title: HDF5 to ASDF Conversion Date @@ -52,31 +52,31 @@ properties: title: HDF5 to ASDF Converter Version type: string archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(80) destination: [WFICommon.conversion_version] filename_pnt5: title: L0.5 File Name type: string archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(80) destination: [WFICommon.filename_pnt5] filepath_level_pnt5: title: L0.5 File Path type: string archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(80) destination: [WFICommon.filepath_level_pnt5] filename_l1a: title: L1A File Name type: string archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(80) destination: [WFICommon.filename_l1a] detector_id: title: SCA Identifier type: string archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(80) destination: [WFICommon.detector_id] detector_temp: title: Mean Detector Temperature (Kelvin) diff --git a/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml index 9876a13b..b9545cd5 100644 --- a/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/tvac_groundtest-1.0.0.yaml @@ -80,7 +80,7 @@ allOf: type: string # enum: [] add enum values archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(80) destination: [WFITvac.wfi_mce_srcs_bank1_led_range] wfi_mce_srcs_bank2_led_i: title: | @@ -102,7 +102,7 @@ allOf: type: string # enum: [] add enum values archive_catalog: - datatype: nvarchar(max) + datatype: nvarchar(80) destination: [WFITvac.wfi_mce_srcs_bank2_led_range] srcs_led_current: title: Input LED current set point From 0c23a56d4158b12c6e452b5f89a369e280f3d59c Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Tue, 27 Feb 2024 15:03:54 -0500 Subject: [PATCH 16/17] Updated for rebase changes. Renamed ground_exposure and _guidestar to base_. --- .../resources/manifests/datamodels-1.0.yaml | 8 +- .../schemas/base_exposure-1.0.0.yaml | 188 +++++++++++++++++ .../schemas/base_guidestar-1.0.0.yaml | 144 +++++++++++++ src/rad/resources/schemas/exposure-1.0.0.yaml | 195 +----------------- .../schemas/ground_common-1.0.0.yaml | 4 +- .../schemas/ground_exposure-1.0.0.yaml | 190 ----------------- .../schemas/ground_guidestar-1.0.0.yaml | 117 ----------- .../resources/schemas/guidestar-1.0.0.yaml | 144 +------------ .../calibration_software_version-1.0.0.yaml | 2 +- .../tagged_scalars/file_date-1.0.0.yaml | 2 +- .../tagged_scalars/filename-1.0.0.yaml | 2 +- .../tagged_scalars/model_type-1.0.0.yaml | 2 +- .../schemas/tagged_scalars/origin-1.0.0.yaml | 2 +- .../prd_software_version-1.0.0.yaml | 2 +- .../sdf_software_version-1.0.0.yaml | 2 +- .../tagged_scalars/telescope-1.0.0.yaml | 2 +- 16 files changed, 364 insertions(+), 642 deletions(-) create mode 100644 src/rad/resources/schemas/base_exposure-1.0.0.yaml create mode 100644 src/rad/resources/schemas/base_guidestar-1.0.0.yaml delete mode 100644 src/rad/resources/schemas/ground_exposure-1.0.0.yaml delete mode 100644 src/rad/resources/schemas/ground_guidestar-1.0.0.yaml diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index 958561f2..e2c0a5b7 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -146,13 +146,13 @@ tags: description: |- Mosaic WCS parameters # Ground Modules -- tag_uri: asdf://stsci.edu/datamodels/roman/tags/ground_exposure-1.0.0 - schema_uri: asdf://stsci.edu/datamodels/roman/schemas/ground_exposure-1.0.0 +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/base_exposure-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/base_exposure-1.0.0 title: Exposure information description: |- Ground test exposure information -- tag_uri: asdf://stsci.edu/datamodels/roman/tags/ground_guidestar-1.0.0 - schema_uri: asdf://stsci.edu/datamodels/roman/schemas/ground_guidestar-1.0.0 +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/base_guidestar-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/base_guidestar-1.0.0 title: Guidestar information description: |- Guidestar information diff --git a/src/rad/resources/schemas/base_exposure-1.0.0.yaml b/src/rad/resources/schemas/base_exposure-1.0.0.yaml new file mode 100644 index 00000000..f9e2ab24 --- /dev/null +++ b/src/rad/resources/schemas/base_exposure-1.0.0.yaml @@ -0,0 +1,188 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/base_exposure-1.0.0 + + +title: | + Base Exposure Information + +type: object +properties: + type: + $ref: asdf://stsci.edu/datamodels/roman/schemas/exposure_type-1.0.0 + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(25) + destination: [WFIExposure.exposure_type, GuideWindow.exposure_type, WFICommon.exposure_type] + start_time: + title: Exposure Start Time (UTC) + description: | + The UTC time at the beginning of the exposure. + tag: tag:stsci.edu:asdf/time/time-1.* + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: datetime2 + destination: [WFIExposure.exposure_start_time, GuideWindow.exposure_start_time, WFICommon.exposure_start_time] + ngroups: + title: Number of Resultants + description: | + The number of resultant frames in this exposure that were transmitted to + the ground. The number of integrations of WFI data is always 1. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [WFIExposure.exposure_ngroups, GuideWindow.exposure_ngroups, WFICommon.exposure_ngroups] + nframes: + title: Number of Reads + description: | + This is the number of science frames that are combined to produce a resultant frame. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [WFIExposure.exposure_nframes, GuideWindow.exposure_nframes, WFICommon.exposure_nframes] + data_problem: + title: Data Problem + description: | + A flag indicating an issue with science telemetry. + type: boolean + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nchar(1) + destination: [WFIExposure.exposure_data_problem, GuideWindow.exposure_data_problem, WFICommon.exposure_data_problem] + frame_divisor: + title: Frame Divisor + description: | + The number of reads averaged to calculate a resultant. Value depends on + the readout pattern used from the MultiAccum table. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [WFIExposure.exposure_frame_divisor, GuideWindow.exposure_frame_divisor, WFICommon.exposure_frame_divisor] + groupgap: + title: Number of Frames Dropped Between Resultants + description: + The number of reads that are dropped, or not used to calculate a + resultant. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [WFIExposure.exposure_groupgap, GuideWindow.exposure_groupgap, WFICommon.exposure_groupgap] + frame_time: + title: Time Between Reads (s) + description: | + The amount of time elapsed between the end of one read and the beginning + of the next. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [WFIExposure.exposure_frame_time, GuideWindow.exposure_frame_time, WFICommon.exposure_frame_time] + group_time: + title: Time Between Resultants (s) + description: | + The time that is the sum of the reads that are used to construct a + resultant. This will depend on the MA table being used. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [WFIExposure.exposure_group_time, GuideWindow.exposure_group_time, WFICommon.exposure_group_time] + exposure_time: + title: Exposure Time (s) + description: | + The time between the start of the first Reset/Read Science Frame of an + Exposure and the completion of the final Read Only Science Frame of that + Exposure. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [WFIExposure.exposure_time, GuideWindow.exposure_time, WFICommon.exposure_time] + ma_table_name: + title: MA Table Name + description: | + The name of the MultiAccum table used for this exposure, as defined in the + Project Reference Database. + type: string + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(50) + destination: [WFIExposure.ma_table_name, GuideWindow.ma_table_name, WFICommon.ma_table_name] + ma_table_number: + title: MA Table Number + description: | + The number of the MultiAccum table used for this exposure. Used in + matching exposures to their corresponding calibration data. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: smallint + destination: [WFIExposure.ma_table_number, GuideWindow.ma_table_number, WFICommon.ma_table_number] + read_pattern: + title: Read Pattern + description: | + Enumeration of detector reads to resultants making up the L1 data + downlinked from the observatory. + type: array + items: + type: array + items: + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(3500) + destination: [WFIExposure.read_pattern, GuideWindow.read_pattern, WFICommon.read_pattern] +propertyOrder: [type, start_time, + ngroups, nframes, data_problem, + frame_divisor, groupgap, frame_time, group_time, exposure_time, + ma_table_name, ma_table_number, read_pattern] +flowStyle: block +required: [type, start_time, + ngroups, nframes, data_problem, + frame_divisor, groupgap, frame_time, group_time, exposure_time, + ma_table_name, ma_table_number, read_pattern] +... diff --git a/src/rad/resources/schemas/base_guidestar-1.0.0.yaml b/src/rad/resources/schemas/base_guidestar-1.0.0.yaml new file mode 100644 index 00000000..05d07b84 --- /dev/null +++ b/src/rad/resources/schemas/base_guidestar-1.0.0.yaml @@ -0,0 +1,144 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/base_guidestar-1.0.0 + +title: Base Guide star window information +type: object +properties: + gw_id: + title: Guide Star Window Identifier + description: | + Identification of the Guide Star Window. + type: string + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(20) + destination: [WFIExposure.gw_id, GuideWindow.gw_id, WFICommon.gw_id] + gw_fgs_mode: + $ref: guidewindow_modes-1.0.0 + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(18) + destination: [WFIExposure.gw_fgs_mode, GuideWindow.gw_fgs_mode, WFICommon.gw_fgs_mode] + data_start: + title: Guide Data Start Time (MJD) + description: | + Start time of the guide window data taken for this exposure as a Modified + Julian Date. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [WFIExposure.data_start, GuideWindow.data_start, WFICommon.data_start] + data_end: + title: Guide Data End Time (MJD) + description: | + End time of the guide window data taken for this exposure as a Modified + Julian Date. + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [WFIExposure.data_end, GuideWindow.data_end, WFICommon.data_end] + gw_window_xstart: + title: Guide Window X Start Position (pixels) + description: | + Minimum X position in the science coordinate frame of all tracking guide + windows in this exposure measured in pixels. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: Science Data Formatting + archive_catalog: + datatype: int + destination: [WFIExposure.gw_window_xstart, WFICommon.gw_window_xstart] + gw_window_ystart: + title: Guide Window Y Start Position (pixels) + description: | + Minimum Y position in the science coordinate frame of all tracking guide + windows in this exposure measured in pixels. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: Science Data Formatting + archive_catalog: + datatype: int + destination: [WFIExposure.gw_window_ystart, WFICommon.gw_window_ystart] + gw_window_xstop: + title: Guide Window X Stop Position (pixels) + description: | + Maximum X position in the science coordinate frame of all tracking guide + windows in this exposure measured in pixels. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: Science Data Formatting + archive_catalog: + datatype: int + destination: [WFIExposure.gw_window_xstop, WFICommon.gw_window_xstop] + gw_window_ystop: + title: Guide Window Y Stop Position (pixels) + description: | + Maximum Y position in the science coordinate frame of all tracking guide + windows in this exposure measured in pixels + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: Science Data Formatting + archive_catalog: + datatype: int + destination: [WFIExposure.gw_window_ystop, WFICommon.gw_window_ystop] + gw_window_xsize: + title: Guide Window Size in the X Direction (pixels) + description: | + Size of a single tracking guide window in this exposure measured along the + X axis in units of pixels. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: Science Data Formatting + archive_catalog: + datatype: int + destination: [WFIExposure.gw_window_xsize, WFICommon.gw_window_xsize] + gw_window_ysize: + title: Guide Window Size in the Y Direction (pixels) + description: | + Size of a single tracking guide window in this exposure measured along the + Y axis in units of pixels. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: Science Data Formatting + archive_catalog: + datatype: int + destination: [WFIExposure.gw_window_ysize, WFICommon.gw_window_ysize] + +propertyOrder: [gw_id, gw_fgs_mode, + data_start, data_end, gw_window_xstart, + gw_window_ystart, gw_window_xstop, gw_window_ystop, gw_window_xsize, + gw_window_ysize] +flowStyle: block +required: [gw_id, gw_fgs_mode, + data_start, data_end, gw_window_xstart, + gw_window_ystart, gw_window_xstop, gw_window_ystop, gw_window_xsize, + gw_window_ysize] +... diff --git a/src/rad/resources/schemas/exposure-1.0.0.yaml b/src/rad/resources/schemas/exposure-1.0.0.yaml index 07056111..74692db9 100644 --- a/src/rad/resources/schemas/exposure-1.0.0.yaml +++ b/src/rad/resources/schemas/exposure-1.0.0.yaml @@ -8,9 +8,9 @@ title: | Exposure Information allOf: - - $ref: asdf://stsci.edu/datamodels/roman/schemas/ground_exposure-1.0.0 + - $ref: asdf://stsci.edu/datamodels/roman/schemas/base_exposure-1.0.0 - type: object - - properties: + properties: id: title: Visit Exposure ID description: | @@ -23,29 +23,6 @@ allOf: archive_catalog: datatype: int destination: [WFIExposure.exposure_id, GuideWindow.exposure_id] - - type: - $ref: exposure_type-1.0.0 - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(25) - destination: [WFIExposure.exposure_type, GuideWindow.exposure_type] - - start_time: - title: Exposure Start Time (UTC) - description: | - The UTC time at the beginning of the exposure. - tag: tag:stsci.edu:asdf/time/time-1.* - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: datetime2 - destination: [WFIExposure.exposure_start_time, GuideWindow.exposure_start_time] mid_time: title: Exposure Mid Time (UTC) description: | @@ -148,43 +125,6 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.exposure_end_time_tdb, GuideWindow.exposure_end_time_tdb] - ngroups: - title: Number of Resultants - description: | - The number of resultant frames in this exposure that were transmitted to - the ground. The number of integrations of WFI data is always 1. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [WFIExposure.exposure_ngroups, GuideWindow.exposure_ngroups] - nframes: - title: Number of Reads - description: | - This is the number of science frames that are combined to produce a resultant frame. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [WFIExposure.exposure_nframes, GuideWindow.exposure_nframes] - data_problem: - title: Data Problem - description: | - A flag indicating an issue with science telemetry. - type: boolean - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nchar(1) - destination: [WFIExposure.exposure_data_problem, GuideWindow.exposure_data_problem] sca_number: title: SCA Number description: | @@ -233,72 +173,6 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.elapsed_exposure_time, GuideWindow.elapsed_exposure_time] - frame_divisor: - title: Frame Divisor - description: | - The number of reads averaged to calculate a resultant. Value depends on - the readout pattern used from the MultiAccum table. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [WFIExposure.exposure_frame_divisor, GuideWindow.exposure_frame_divisor] - groupgap: - title: Number of Frames Dropped Between Resultants - description: - The number of reads that are dropped, or not used to calculate a - resultant. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [WFIExposure.exposure_groupgap, GuideWindow.exposure_groupgap] - frame_time: - title: Time Between Reads (s) - description: | - The amount of time elapsed between the end of one read and the beginning - of the next. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [WFIExposure.exposure_frame_time, GuideWindow.exposure_frame_time] - group_time: - title: Time Between Resultants (s) - description: | - The time that is the sum of the reads that are used to construct a - resultant. This will depend on the MA table being used. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [WFIExposure.exposure_group_time, GuideWindow.exposure_group_time] - exposure_time: - title: Exposure Time (s) - description: | - The time between the start of the first Reset/Read Science Frame of an - Exposure and the completion of the final Read Only Science Frame of that - Exposure. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [WFIExposure.exposure_time, GuideWindow.exposure_time] effective_exposure_time: title: Effective Exposure Time (s) description: | @@ -325,32 +199,6 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.exposure_duration, GuideWindow.exposure_duration] - ma_table_name: - title: MA Table Name - description: | - The name of the MultiAccum table used for this exposure, as defined in the - Project Reference Database. - type: string - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(50) - destination: [WFIExposure.ma_table_name, GuideWindow.ma_table_name] - ma_table_number: - title: MA Table Number - description: | - The number of the MultiAccum table used for this exposure. Used in - matching exposures to their corresponding calibration data. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: smallint - destination: [WFIExposure.ma_table_number, GuideWindow.ma_table_number] level0_compressed: title: Level 0 Compression description: | @@ -364,23 +212,6 @@ allOf: archive_catalog: datatype: nchar(1) destination: [WFIExposure.exposure_level0_compressed, GuideWindow.exposure_level0_compressed] - read_pattern: - title: Read Pattern - description: | - Enumeration of detector reads to resultants making up the L1 data - downlinked from the observatory. - type: array - items: - type: array - items: - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(3500) - destination: [WFIExposure.read_pattern, GuideWindow.read_pattern] truncated: title: Truncated MA Table description: | @@ -393,27 +224,21 @@ allOf: archive_catalog: datatype: nchar(1) destination: [WFIExposure.exposure_truncated] - propertyOrder: [id, type, - start_time, mid_time, end_time, + required: [id, + mid_time, end_time, start_time_mjd, mid_time_mjd, end_time_mjd, start_time_tdb, mid_time_tdb, end_time_tdb, - ngroups, nframes, data_problem, sca_number, + sca_number, gain_factor, integration_time, elapsed_exposure_time, - frame_divisor, groupgap, - frame_time, group_time, exposure_time, effective_exposure_time, duration, - ma_table_name, ma_table_number, level0_compressed, - read_pattern, truncated] - required: [id, type, - start_time, mid_time, end_time, + level0_compressed] + propertyOrder: [id, + mid_time, end_time, start_time_mjd, mid_time_mjd, end_time_mjd, start_time_tdb, mid_time_tdb, end_time_tdb, - ngroups, nframes, data_problem, sca_number, + sca_number, gain_factor, integration_time, elapsed_exposure_time, - frame_divisor, groupgap, - frame_time, group_time, exposure_time, effective_exposure_time, duration, - ma_table_name, ma_table_number, level0_compressed, - read_pattern] + level0_compressed, truncated] flowStyle: block ... diff --git a/src/rad/resources/schemas/ground_common-1.0.0.yaml b/src/rad/resources/schemas/ground_common-1.0.0.yaml index 98a60a13..86b6e17d 100644 --- a/src/rad/resources/schemas/ground_common-1.0.0.yaml +++ b/src/rad/resources/schemas/ground_common-1.0.0.yaml @@ -14,9 +14,9 @@ allOf: cal_step: tag: asdf://stsci.edu/datamodels/roman/tags/cal_step-1.0.0 exposure: - tag: asdf://stsci.edu/datamodels/roman/tags/ground_exposure-1.0.0 + tag: asdf://stsci.edu/datamodels/roman/tags/base_exposure-1.0.0 guidestar: - tag: asdf://stsci.edu/datamodels/roman/tags/ground_guidestar-1.0.0 + tag: asdf://stsci.edu/datamodels/roman/tags/base_guidestar-1.0.0 instrument: tag: asdf://stsci.edu/datamodels/roman/tags/wfi_mode-1.0.0 ref_file: diff --git a/src/rad/resources/schemas/ground_exposure-1.0.0.yaml b/src/rad/resources/schemas/ground_exposure-1.0.0.yaml deleted file mode 100644 index c806632d..00000000 --- a/src/rad/resources/schemas/ground_exposure-1.0.0.yaml +++ /dev/null @@ -1,190 +0,0 @@ -%YAML 1.1 ---- -$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 -id: asdf://stsci.edu/datamodels/roman/schemas/ground_exposure-1.0.0 - - -title: | - Ground Exposure Information - -type: object -properties: - type: - $ref: asdf://stsci.edu/datamodels/roman/schemas/exposure_type-1.0.0 - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(25) - destination: [ScienceCommon.exposure_type, GuideWindow.exposure_type, WFICommon.exposure_type] - start_time: - title: UTC exposure start time - description: | - This is a python date-time object that records the - time at the start of the exposure in UTC. - tag: tag:stsci.edu:asdf/time/time-1.* - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: datetime2 - destination: [ScienceCommon.exposure_start_time, GuideWindow.exposure_start_time, WFICommon.exposure_start_time] - ngroups: - title: Number of groups in integration - description: | - This is the number of resultant frames in the exposure - that are transmitted to the ground. The WFI data always has the - number of integrations=1. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [ScienceCommon.exposure_ngroups, GuideWindow.exposure_ngroups, WFICommon.exposure_ngroups] - nframes: - title: Number of frames per group - description: | - This is the number of science frames that are combined to - produce a resultant frame. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [ScienceCommon.exposure_nframes, GuideWindow.exposure_nframes, WFICommon.exposure_nframes] - data_problem: - title: Science telemetry indicated a problem - description: | - This is a flag to indicate that the science telemetry - experienced a problem. - type: boolean - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nchar(1) - destination: [ScienceCommon.exposure_data_problem, GuideWindow.exposure_data_problem, WFICommon.exposure_data_problem] - frame_divisor: - title: Divisor applied to frame-averaged groups - description: | - This is the number of reads per resultant. Its use depends upon the definition - in the MA table. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [ScienceCommon.exposure_frame_divisor, GuideWindow.exposure_frame_divisor, WFICommon.exposure_frame_divisor] - groupgap: - title: Number of frames dropped between groups - description: This is the number of reads that are "dropped" and not used in the resultant. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: int - destination: [ScienceCommon.exposure_groupgap, GuideWindow.exposure_groupgap, WFICommon.exposure_groupgap] - frame_time: - title: "[s] Time between frames" - description: | - The time between the end of one read and the start of the next read. This - depends on the MA table being used. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_frame_time, GuideWindow.exposure_frame_time, WFICommon.exposure_frame_time] - group_time: - title: "[s] Time between groups" - description: | - The time that is the sum of the reads that are used to construct a resultant. - This will depend on the MA table being used. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_group_time, GuideWindow.exposure_group_time, WFICommon.exposure_group_time] - exposure_time: - title: "[s] exposure time" - description: | - The time between the start of the first Reset/Read Science Frame of an Exposure - and the completion of the final Read Only Science Frame of that Exposure. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.exposure_time, GuideWindow.exposure_time, WFICommon.exposure_time] - ma_table_name: - title: Identifier for the multi-accumulation table used - description: | - The name of the MA table used for the exposure as defined by the - PRD (Project Reference Database) - type: string - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(50) - destination: [ScienceCommon.ma_table_name, GuideWindow.ma_table_name, WFICommon.ma_table_name] - ma_table_number: - title: Numerical identifier for the multi-accumulation table used - description: | - The number of the MA table used for the exposure as defined by the - PRD (Project Reference Database). This is used for matching the exposure - to the appropriate calibration data. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: smallint - destination: [ScienceCommon.ma_table_number, GuideWindow.ma_table_number, WFICommon.ma_table_number] - read_pattern: - title: Pattern of reads - description: | - Enumeration of detector reads to resultants making up the L1 data downlinked - from the observatory - type: array - items: - type: array - items: - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(3500) - destination: [ScienceCommon.read_pattern, GuideWindow.read_pattern, WFICommon.read_pattern] -propertyOrder: [type, start_time, - ngroups, nframes, data_problem, - frame_divisor, groupgap, frame_time, group_time, exposure_time, - ma_table_name, ma_table_number, read_pattern] -flowStyle: block -required: [type, start_time, - ngroups, nframes, data_problem, - frame_divisor, groupgap, frame_time, group_time, exposure_time, - ma_table_name, ma_table_number, read_pattern] -... diff --git a/src/rad/resources/schemas/ground_guidestar-1.0.0.yaml b/src/rad/resources/schemas/ground_guidestar-1.0.0.yaml deleted file mode 100644 index d0c8160e..00000000 --- a/src/rad/resources/schemas/ground_guidestar-1.0.0.yaml +++ /dev/null @@ -1,117 +0,0 @@ -%YAML 1.1 ---- -$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 -id: asdf://stsci.edu/datamodels/roman/schemas/ground_guidestar-1.0.0 - -title: Ground Guide star window information -type: object -properties: - gw_id: - title: guide star window identifier - type: string - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(20) - destination: [ScienceCommon.gw_id, GuideWindow.gw_id, WFICommon.gw_id] - gw_fgs_mode: - $ref: asdf://stsci.edu/datamodels/roman/schemas/guidewindow_modes-1.0.0 - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(18) - destination: [ScienceCommon.gw_fgs_mode, GuideWindow.gw_fgs_mode, WFICommon.gw_fgs_mode] - data_start: - title: MJD start time of guider data within this file - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.data_start, GuideWindow.data_start, WFICommon.data_start] - data_end: - title: MJD end time of guider data within this file - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [ScienceCommon.data_end, GuideWindow.data_end, WFICommon.data_end] - gw_window_xstart: - title: Guide window x start position on the detector - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [ScienceCommon.gw_window_xstart, WFICommon.gw_window_xstart] - gw_window_ystart: - title: Guide window y start position on the detector - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [ScienceCommon.gw_window_ystart, WFICommon.gw_window_ystart] - gw_window_xstop: - title: Guide window x stop position on the detector - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [ScienceCommon.gw_window_xstop, WFICommon.gw_window_xstop] - gw_window_ystop: - title: Guide window y stop position on the detector - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [ScienceCommon.gw_window_ystop, WFICommon.gw_window_ystop] - gw_window_xsize: - title: Guide window size in the x direction in detector coordinates - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [ScienceCommon.gw_window_xsize, WFICommon.gw_window_xsize] - gw_window_ysize: - title: Guide window size in the y direction in detector coordinates - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [ScienceCommon.gw_window_ysize, WFICommon.gw_window_ysize] -propertyOrder: [gw_id, gw_fgs_mode, - data_start, data_end, gw_window_xstart, - gw_window_ystart, gw_window_xstop, gw_window_ystop, gw_window_xsize, - gw_window_ysize] -flowStyle: block -required: [gw_id, gw_fgs_mode, - data_start, data_end, gw_window_xstart, - gw_window_ystart, gw_window_xstop, gw_window_ystop, gw_window_xsize, - gw_window_ysize] -... diff --git a/src/rad/resources/schemas/guidestar-1.0.0.yaml b/src/rad/resources/schemas/guidestar-1.0.0.yaml index ab34b4d3..6606b77f 100644 --- a/src/rad/resources/schemas/guidestar-1.0.0.yaml +++ b/src/rad/resources/schemas/guidestar-1.0.0.yaml @@ -6,31 +6,9 @@ id: asdf://stsci.edu/datamodels/roman/schemas/guidestar-1.0.0 title: Guide Star Window Information allOf: - - $ref: asdf://stsci.edu/datamodels/roman/schemas/ground_guidestar-1.0.0 - + - $ref: asdf://stsci.edu/datamodels/roman/schemas/base_guidestar-1.0.0 - type: object properties: - gw_id: - title: Guide Star Window Identifier - description: | - Identification of the Guide Star Window. - type: string - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(20) - destination: [WFIExposure.gw_id, GuideWindow.gw_id] - gw_fgs_mode: - $ref: guidewindow_modes-1.0.0 - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: nvarchar(18) - destination: [WFIExposure.gw_fgs_mode, GuideWindow.gw_fgs_mode] gs_id: title: Guide Star Identifier from Guide Star Catalog description: | @@ -133,32 +111,6 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.gs_umag, GuideWindow.gs_umag] - data_start: - title: Guide Data Start Time (MJD) - description: | - Start time of the guide window data taken for this exposure as a Modified - Julian Date. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [WFIExposure.data_start, GuideWindow.data_start] - data_end: - title: Guide Data End Time (MJD) - description: | - End time of the guide window data taken for this exposure as a Modified - Julian Date. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - archive_catalog: - datatype: float - destination: [WFIExposure.data_end, GuideWindow.data_end] gs_ctd_x: title: Guide Star Centroid X Position (arcsec) description: | @@ -276,94 +228,14 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.gs_pattern_error, GuideWindow.gs_pattern_error] - gw_window_xstart: - title: Guide Window X Start Position (pixels) - description: | - Minimum X position in the science coordinate frame of all tracking guide - windows in this exposure measured in pixels. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [WFIExposure.gw_window_xstart] - gw_window_ystart: - title: Guide Window Y Start Position (pixels) - description: | - Minimum Y position in the science coordinate frame of all tracking guide - windows in this exposure measured in pixels. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [WFIExposure.gw_window_ystart] - gw_window_xstop: - title: Guide Window X Stop Position (pixels) - description: | - Maximum X position in the science coordinate frame of all tracking guide - windows in this exposure measured in pixels. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [WFIExposure.gw_window_xstop] - gw_window_ystop: - title: Guide Window Y Stop Position (pixels) - description: | - Maximum Y position in the science coordinate frame of all tracking guide - windows in this exposure measured in pixels - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [WFIExposure.gw_window_ystop] - gw_window_xsize: - title: Guide Window Size in the X Direction (pixels) - description: | - Size of a single tracking guide window in this exposure measured along the - X axis in units of pixels. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [WFIExposure.gw_window_xsize] - gw_window_ysize: - title: Guide Window Size in the Y Direction (pixels) - description: | - Size of a single tracking guide window in this exposure measured along the - Y axis in units of pixels. - type: integer - sdf: - special_processing: VALUE_REQUIRED - source: - origin: Science Data Formatting - archive_catalog: - datatype: int - destination: [WFIExposure.gw_window_ysize] - propertyOrder: [gw_id, gs_id, gs_catalog_version, gs_ra, gs_dec, - gs_ura, gs_udec, gs_mag, gs_umag, gw_fgs_mode, - data_start, data_end, gs_ctd_x, gs_ctd_y, gs_ctd_ux, gs_ctd_uy, - gs_epoch, gs_mura, gs_mudec, gs_para, gs_pattern_error, gw_window_xstart, - gw_window_ystart, gw_window_xstop, gw_window_ystop, gw_window_xsize, - gw_window_ysize] + propertyOrder: [gs_id, gs_catalog_version, gs_ra, gs_dec, + gs_ura, gs_udec, gs_mag, gs_umag, + gs_ctd_x, gs_ctd_y, gs_ctd_ux, gs_ctd_uy, + gs_epoch, gs_mura, gs_mudec, gs_para, gs_pattern_error] required: [gs_id, gs_catalog_version, gs_ra, gs_dec, - gs_ura, gs_udec, gs_mag, gs_umag, - gs_ctd_x, gs_ctd_y, gs_ctd_ux, gs_ctd_uy, - gs_epoch, gs_mura, gs_mudec, gs_para, gs_pattern_error] + gs_ura, gs_udec, gs_mag, gs_umag, + gs_ctd_x, gs_ctd_y, gs_ctd_ux, gs_ctd_uy, + gs_epoch, gs_mura, gs_mudec, gs_para, gs_pattern_error] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/calibration_software_version-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/calibration_software_version-1.0.0.yaml index 57f15dc2..2ea4e4fc 100644 --- a/src/rad/resources/schemas/tagged_scalars/calibration_software_version-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/calibration_software_version-1.0.0.yaml @@ -11,7 +11,7 @@ sdf: origin: TBD archive_catalog: datatype: nvarchar(120) - destination: [WFIExposure.calibration_software_version, GuideWindow.calibration_software_version] + destination: [WFIExposure.calibration_software_version, GuideWindow.calibration_software_version, WFICommon.calibration_software_version] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/file_date-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/file_date-1.0.0.yaml index 06921c44..f843ca77 100644 --- a/src/rad/resources/schemas/tagged_scalars/file_date-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/file_date-1.0.0.yaml @@ -14,7 +14,7 @@ sdf: origin: TBD archive_catalog: datatype: datetime2 - destination: [WFIExposure.filedate, GuideWindow.filedate] + destination: [WFIExposure.filedate, GuideWindow.filedate, WFICommon.filedate] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/filename-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/filename-1.0.0.yaml index 5482d9fa..420ab32b 100644 --- a/src/rad/resources/schemas/tagged_scalars/filename-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/filename-1.0.0.yaml @@ -11,7 +11,7 @@ sdf: origin: TBD archive_catalog: datatype: nvarchar(120) - destination: [WFIExposure.filename, WFIMosaic.filename, GuideWindow.filename] + destination: [WFIExposure.filename, WFIMosaic.filename, GuideWindow.filename, WFICommon.filename] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/model_type-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/model_type-1.0.0.yaml index 1db1e599..89c04d9a 100644 --- a/src/rad/resources/schemas/tagged_scalars/model_type-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/model_type-1.0.0.yaml @@ -11,7 +11,7 @@ sdf: origin: TBD archive_catalog: datatype: nvarchar(50) - destination: [WFIExposure.model_type, GuideWindow.model_type] + destination: [WFIExposure.model_type, GuideWindow.model_type, WFICommon.model_type] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/origin-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/origin-1.0.0.yaml index eb3d72bc..77efd16d 100644 --- a/src/rad/resources/schemas/tagged_scalars/origin-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/origin-1.0.0.yaml @@ -14,7 +14,7 @@ sdf: origin: TBD archive_catalog: datatype: nvarchar(15) - destination: [WFIExposure.origin, GuideWindow.origin] + destination: [WFIExposure.origin, GuideWindow.origin, WFICommon.origin] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/prd_software_version-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/prd_software_version-1.0.0.yaml index 09e34ea3..99871ba6 100644 --- a/src/rad/resources/schemas/tagged_scalars/prd_software_version-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/prd_software_version-1.0.0.yaml @@ -11,7 +11,7 @@ sdf: origin: TBD archive_catalog: datatype: nvarchar(120) - destination: [WFIExposure.prd_software_version, GuideWindow.prd_software_version] + destination: [WFIExposure.prd_software_version, GuideWindow.prd_software_version, WFICommon.prd_software_version] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/sdf_software_version-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/sdf_software_version-1.0.0.yaml index defa7eca..2f20dfce 100644 --- a/src/rad/resources/schemas/tagged_scalars/sdf_software_version-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/sdf_software_version-1.0.0.yaml @@ -11,7 +11,7 @@ sdf: origin: TBD archive_catalog: datatype: nvarchar(120) - destination: [WFIExposure.sdf_software_version, GuideWindow.sdf_software_version] + destination: [WFIExposure.sdf_software_version, GuideWindow.sdf_software_version, WFICommon.sdf_software_version] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/telescope-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/telescope-1.0.0.yaml index 5bbe1efd..83270a12 100644 --- a/src/rad/resources/schemas/tagged_scalars/telescope-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/telescope-1.0.0.yaml @@ -10,7 +10,7 @@ enum: [ROMAN] archive_catalog: datatype: nvarchar(5) - destination: [WFIExposure.telescope, WFIMosaic.telescope, GuideWindow.telescope] + destination: [WFIExposure.telescope, WFIMosaic.telescope, GuideWindow.telescope, WFICommon.telescope] flowStyle: block ... From 37e5c7a007554acb321d3d78a2667a3b3bc06ba4 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Tue, 27 Feb 2024 16:02:43 -0500 Subject: [PATCH 17/17] Reinstating accidentally deleted tags. --- src/rad/resources/schemas/reference_files/superbias-1.0.0.yaml | 1 + src/rad/resources/schemas/wfi_image-1.0.0.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/src/rad/resources/schemas/reference_files/superbias-1.0.0.yaml b/src/rad/resources/schemas/reference_files/superbias-1.0.0.yaml index e908b042..b4e73b20 100644 --- a/src/rad/resources/schemas/reference_files/superbias-1.0.0.yaml +++ b/src/rad/resources/schemas/reference_files/superbias-1.0.0.yaml @@ -30,6 +30,7 @@ properties: description: | Two Dimensional Quality Array for all Resultants. title: 2-D data quality array for all planes + tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint32 exact_datatype: true ndim: 2 diff --git a/src/rad/resources/schemas/wfi_image-1.0.0.yaml b/src/rad/resources/schemas/wfi_image-1.0.0.yaml index 27073c76..30c657fa 100644 --- a/src/rad/resources/schemas/wfi_image-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_image-1.0.0.yaml @@ -198,6 +198,7 @@ properties: title: Data Quality Flag for Border Reference Pixels, on Top description: | Data quality flag for border reference pixels, on top. + tag: tag:stsci.edu:asdf/core/ndarray-1.* datatype: uint32 exact_datatype: true ndim: 2