diff --git a/CHANGES.rst b/CHANGES.rst index a1080490..e6794d02 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,8 @@ A0.18.1 (unreleased) - Remove the unused ``variance-1.0.0`` schema. [#344] +- Add wcs tag to wfi_image and wfi_mosaic schemas. [#351] + 0.18.0 (2023-11-06) ------------------- 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 65a1be47..7b8b11bb 100644 --- a/src/rad/resources/schemas/wfi_image-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_image-1.0.0.yaml @@ -16,11 +16,16 @@ properties: - $ref: common-1.0.0 - type: object properties: + wcs: + title: WCS object + anyOf: + - tag: tag:stsci.edu:gwcs/wcs-* + - type: "null" photometry: tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0 source_detection: tag: asdf://stsci.edu/datamodels/roman/tags/source_detection-1.0.0 - required: [photometry] + required: [photometry, wcs] data: title: Science data, excluding border reference pixels. tag: tag:stsci.edu:asdf/unit/quantity-1.1.0 diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index 1f17e93a..13bd2474 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -29,7 +29,12 @@ properties: tag: asdf://stsci.edu/datamodels/roman/tags/resample-1.0.0 wcsinfo: tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_wcsinfo-1.0.0 - required: [filename, basic, individual_image_meta, program, resample, wcsinfo] + wcs: + title: WCS object + anyOf: + - tag: tag:stsci.edu:gwcs/wcs-* + - type: "null" + required: [basic, individual_image_meta, photometry, program, resample, wcs, wcsinfo] data: title: Science data, excluding border reference pixels. tag: tag:stsci.edu:asdf/unit/quantity-1.1.0 diff --git a/tests/test_schemas.py b/tests/test_schemas.py index dcacd034..19216c23 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -51,6 +51,10 @@ def valid_tag_uris(manifest): "tag:stsci.edu:asdf/unit/quantity-1.1.0", "tag:stsci.edu:asdf/unit/unit-1.0.0", "tag:astropy.org:astropy/units/unit-1.0.0", + "tag:stsci.edu:gwcs/wcs-1.0.0", + "tag:stsci.edu:gwcs/wcs-1.1.0", + "tag:stsci.edu:gwcs/wcs-1.2.0", + "tag:stsci.edu:gwcs/wcs-*", ] ) return uris