diff --git a/changes/473.misc.rst b/changes/473.misc.rst new file mode 100644 index 00000000..154a83fa --- /dev/null +++ b/changes/473.misc.rst @@ -0,0 +1 @@ +Add ``rcs`` and removes ``aperture``, ``target`` schemas diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index c2c3371c..61dc6230 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -85,21 +85,16 @@ tags: title: Coordinate frame information description: |- Coordinate frame information -- tag_uri: asdf://stsci.edu/datamodels/roman/tags/aperture-1.0.0 - schema_uri: asdf://stsci.edu/datamodels/roman/schemas/aperture-1.0.0 - title: Aperture information - description: |- - Aperture information - tag_uri: asdf://stsci.edu/datamodels/roman/tags/pointing-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/pointing-1.0.0 title: Spacecraft Pointing information description: |- Spacecraft Pointing information -- tag_uri: asdf://stsci.edu/datamodels/roman/tags/target-1.0.0 - schema_uri: asdf://stsci.edu/datamodels/roman/schemas/target-1.0.0 - title: Target information +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/rcs-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/rcs-1.0.0 + title: Relative Calibration System Information description: |- - Target information + Relative Calibration System Information - tag_uri: asdf://stsci.edu/datamodels/roman/tags/velocity_aberration-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/velocity_aberration-1.0.0 title: Velocity aberration information diff --git a/src/rad/resources/schemas/aperture-1.0.0.yaml b/src/rad/resources/schemas/aperture-1.0.0.yaml deleted file mode 100644 index 0e3523dc..00000000 --- a/src/rad/resources/schemas/aperture-1.0.0.yaml +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 ---- -$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 -id: asdf://stsci.edu/datamodels/roman/schemas/aperture-1.0.0 - -title: Aperture Information -type: object -properties: - name: - title: PRD Science Aperture Used - description: | - Science aperture used as defined in the Project - Reference Database (PRD). - type: string - enum: ['WFI_01_FULL', 'WFI_02_FULL', 'WFI_03_FULL', 'WFI_04_FULL', - 'WFI_05_FULL', 'WFI_06_FULL', 'WFI_07_FULL', 'WFI_08_FULL', - 'WFI_09_FULL', 'WFI_10_FULL', 'WFI_11_FULL', 'WFI_12_FULL', - 'WFI_13_FULL', 'WFI_14_FULL', 'WFI_15_FULL', 'WFI_16_FULL', - 'WFI_17_FULL', 'WFI_18_FULL', - 'BORESIGHT', - 'CGI_CEN', 'WFI_CEN'] - sdf: - special_processing: VALUE_REQUIRED - source: - origin: PSS:aperture.AperName - maxLength: 40 - archive_catalog: - datatype: nvarchar(40) - destination: [WFIExposure.aperture_name, GuideWindow.aperture_name] - position_angle: - title: "Position Angle of Aperture Used (deg)" - description: | - Position angle of the science aperture as measured in degrees. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD #v3_position_angle in baseline_prime_visits or spacecraft_parameters - archive_catalog: - datatype: float - destination: [WFIExposure.position_angle, GuideWindow.position_angle] -propertyOrder: [name, position_angle] -flowStyle: block -required: [name, position_angle] -... diff --git a/src/rad/resources/schemas/common-1.0.0.yaml b/src/rad/resources/schemas/common-1.0.0.yaml index 6b268bd1..3d8f204f 100644 --- a/src/rad/resources/schemas/common-1.0.0.yaml +++ b/src/rad/resources/schemas/common-1.0.0.yaml @@ -11,9 +11,6 @@ allOf: - type: object properties: # Meta Objects - aperture: - title: Aperture Information - tag: asdf://stsci.edu/datamodels/roman/tags/aperture-1.0.0 cal_step: title: Tracker of Calibration Pipeline Steps tag: asdf://stsci.edu/datamodels/roman/tags/l2_cal_step-1.0.0 @@ -44,9 +41,9 @@ allOf: ref_file: title: Reference File Information tag: asdf://stsci.edu/datamodels/roman/tags/ref_file-1.0.0 - target: - title: Target Information - tag: asdf://stsci.edu/datamodels/roman/tags/target-1.0.0 + rcs: + title: Relative Calibration System Information + tag: asdf://stsci.edu/datamodels/roman/tags/rcs-1.0.0 velocity_aberration: title: Velocity Aberration Correction Information tag: asdf://stsci.edu/datamodels/roman/tags/velocity_aberration-1.0.0 @@ -56,7 +53,7 @@ allOf: wcsinfo: title: World Coordinate System (WCS) Parameters tag: asdf://stsci.edu/datamodels/roman/tags/wcsinfo-1.0.0 - required: [aperture, cal_step, coordinates, ephemeris, exposure, guidestar, + required: [cal_step, coordinates, ephemeris, exposure, guidestar, instrument, observation, pointing, program, ref_file, - target, velocity_aberration, visit, wcsinfo] + rcs, velocity_aberration, visit, wcsinfo] ... diff --git a/src/rad/resources/schemas/rcs-1.0.0.yaml b/src/rad/resources/schemas/rcs-1.0.0.yaml new file mode 100644 index 00000000..627ece30 --- /dev/null +++ b/src/rad/resources/schemas/rcs-1.0.0.yaml @@ -0,0 +1,80 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/rcs-1.0.0 + +title: Relative Calibration System Information +type: object +properties: + active: + title: Status of the Relative Calibration System (RCS) + description: | + A boolean flag to indicate if the Relative Calibration + System (RCS) is on (True) or off (False) during the exposure. + type: boolean + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nchar(1) + destination: [WFIExposure.active] + electronics: + title: Relative Calibration System (RCS) Electronics Side + description: | + The active redundant electronics used to control the + Relative Calibration System (RCS). Values may be "A" or "B" if + the RCS is on, and "N/A" if the RCS is off. + anyOf: + - type: string + enum: ["A", "B", None] + - type: "null" + maxLength: 5 + archive_catalog: + datatype: nvarchar(5) + destination: [WFIExposure.electronics] + bank: + title: Light Emitting Diode (LED) Bank Selection + description: | + The bank of light emitting diodes (LEDs) selected in + the program specification in the Astronomer's Proposal Tool + (APT). Values may be either "1" or "2" if the RCS is on, and + "N/A" if the RCS is off. + anyOf: + - type: string + enum: ["1", "2", None] + - type: "null" + maxLength: 5 + archive_catalog: + datatype: nvarchar(5) + destination: [WFIExposure.bank] + led: + title: Light Emitting Diode (LED) Passband + description: | + The light emitting diode (LED) passband selected in + the program specification in the Astronomer's Proposal Tool + (APT). Values are integer strings between "1" and "6" inclusive, + when the RCS is on, and "N/A" when the RCS is off. + anyOf: + - type: string + enum: ["1", "2", "3", "4", "5", "6", None] + - type: "null" + maxLength: 5 + archive_catalog: + datatype: nvarchar(5) + destination: [WFIExposure.led] + counts: + title: Light Emitting Diode (LED) Flux (DN) + description: | + The integrated number of counts of the light emitting + diode (LED) selected in the program specification in the + Astronomer's Proposal Tool (APT). Values are between 0 and + 65,535 in units of DN. + type: integer + archive_catalog: + datatype: int + destination: [WFIExposure.counts] +propertyOrder: [active, electronics, bank, led, counts] +flowStyle: block +required: [active, electronics, bank, led, counts] +... diff --git a/src/rad/resources/schemas/target-1.0.0.yaml b/src/rad/resources/schemas/target-1.0.0.yaml deleted file mode 100644 index 858b431f..00000000 --- a/src/rad/resources/schemas/target-1.0.0.yaml +++ /dev/null @@ -1,196 +0,0 @@ -%YAML 1.1 ---- -$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 -id: asdf://stsci.edu/datamodels/roman/schemas/target-1.0.0 - -title: Target Information -type: object -properties: - proposer_name: - title: Target Name from Proposer - description: | - The name of the target as it was defined and submitted by the proposer. - type: string - sdf: - special_processing: VALUE_REQUIRED - source: - origin: PSS:dms_target.target_name - maxLength: 100 - archive_catalog: - datatype: nvarchar(100) - destination: [WFIExposure.proposer_target_name, GuideWindow.proposer_target_name] - catalog_name: - title: Target Name from Catalog - description: | - The target name as defined by an astronomical catalog. - type: string - sdf: - special_processing: VALUE_REQUIRED - source: - origin: PSS:dms_target.standard_target_name - maxLength: 256 - archive_catalog: - datatype: nvarchar(256) - destination: [WFIExposure.catalog_name, GuideWindow.catalog_name] - type: - title: Target Type - description: | - The target type gives information on how the target will need to be - observed by the telescope. The options are "fixed", "moving", and - "generic". Moving indicates that the motion of the target needs to be - taken into account when observing, while fixed indicates that the target - needs a fixed orientation. Generic observations do not fit into the other - two categories. - type: string - enum: [FIXED, MOVING, GENERIC] - sdf: - special_processing: VALUE_REQUIRED - source: - origin: PSS:dms_target.target_type - maxLength: 10 - archive_catalog: - datatype: nvarchar(10) - destination: [WFIExposure.target_type, GuideWindow.target_type] - ra: - title: Target RA (deg) - description: | - The right ascension (RA) of the target in degrees at the midpoint of the - exposure. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: PSS:dms_target.ra_computed - archive_catalog: - datatype: float - destination: [WFIExposure.ra, GuideWindow.ra] - dec: - title: Target Dec (deg) - description: | - The declination (Dec) of the target in degrees at the midpoint of the - exposure. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: PSS:dms_target.dec_computed - archive_catalog: - datatype: float - destination: [WFIExposure.dec, GuideWindow.dec] - ra_uncertainty: - title: Target RA Uncertainty (deg) - description: | - The uncertainty of the right ascension (RA) of the target in degrees at - the midpoint of the exposure. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: PSS:dms_target.ra_uncertainty_computed - archive_catalog: - datatype: float - destination: [WFIExposure.ra_uncertainty, GuideWindow.ra_uncertainty] - dec_uncertainty: - title: Target Dec Uncertainty (deg) - description: | - The uncertainty of the declination (Dec) of the target in degrees at the - midpoint of the exposure. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: PSS:dms_target.dec_uncertainty_computed - archive_catalog: - datatype: float - destination: [WFIExposure.dec_uncertainty, GuideWindow.dec_uncertainty] - proper_motion_ra: - title: Proper Motion of Target RA (deg) - description: | - The proper motion of the right ascension (RA) of the target in degrees. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: PSS:dms_target.ra_proper_motion - archive_catalog: - datatype: float - destination: [WFIExposure.proper_motion_ra, GuideWindow.proper_motion_ra] - proper_motion_dec: - title: Proper Motion of Target Dec (deg) - description: | - The proper motion of the declination (Dec) of the target in degrees. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: PSS:dms_target.dec_proper_motion - archive_catalog: - datatype: float - destination: [WFIExposure.proper_motion_dec, GuideWindow.proper_motion_dec] - proper_motion_epoch: - title: Proper Motion Epoch of Target - description: | - The epoch at which the proper motion was calculated. This is needed to - correct for the proper motion at other epochs. - type: string - sdf: - special_processing: VALUE_REQUIRED - source: - origin: PSS:dms_visit.epoch - maxLength: 10 - archive_catalog: - datatype: nvarchar(10) - destination: [WFIExposure.proper_motion_epoch, GuideWindow.proper_motion_epoch] - proposer_ra: - title: RA from Proposer (deg) - description: | - The right ascension (RA) of the target in degrees as it was defined and - submitted by the proposer. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: PSS:fixed_target.ra_literal - function: hms_to_degrees - archive_catalog: - datatype: float - destination: [WFIExposure.proposer_ra, GuideWindow.proposer_ra] - proposer_dec: - title: Dec from Proposer (deg) - description: | - The declination (Dec) of the target in degrees as it was defined and - submitted by the proposer. - type: number - sdf: - special_processing: VALUE_REQUIRED - source: - origin: PSS:fixed_target.dec_literal - function: hms_to_degrees - archive_catalog: - datatype: float - destination: [WFIExposure.proposer_dec, GuideWindow.proposer_dec] - source_type: - title: Source Type for Calibration - description: | - The source type is defined by the calibration needs. The options are - "extended", "point", and "unknown". Extended sources and point sources - might have different calibration requirements. Unknown is for sources - where the type is not yet defined. - type: string - enum: [EXTENDED, POINT, UNKNOWN] - sdf: - special_processing: VALUE_REQUIRED - source: - origin: TBD - maxLength: 8 - archive_catalog: - datatype: nvarchar(8) - destination: [WFIExposure.source_type, GuideWindow.source_type] -propertyOrder: [proposer_name, catalog_name, type, ra, dec, ra_uncertainty, dec_uncertainty, - proper_motion_ra, proper_motion_dec, proper_motion_epoch, - proposer_ra, proposer_dec, source_type] -flowStyle: block -required: [proposer_name, catalog_name, type, ra, dec, ra_uncertainty, dec_uncertainty, - proper_motion_ra, proper_motion_dec, proper_motion_epoch, - proposer_ra, proposer_dec, source_type] -...