From fffcbea2e81f5a06034b37c5b5f3e6db7ec37c96 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Tue, 5 Mar 2024 18:16:47 -0500 Subject: [PATCH 1/3] Changed image units. --- .../resources/schemas/wfi_image-1.0.0.yaml | 52 ++++++++++++------- 1 file changed, 32 insertions(+), 20 deletions(-) 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 30c657fa..7823fc57 100644 --- a/src/rad/resources/schemas/wfi_image-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_image-1.0.0.yaml @@ -26,9 +26,10 @@ properties: tag: asdf://stsci.edu/datamodels/roman/tags/source_detection-1.0.0 required: [photometry, wcs] data: - title: Science Data (electrons / s) + title: Science Data (DN / s) or (MJy / sr) description: | - Science data, excluding border reference pixels. + Science data, excluding border reference pixels, in DNs per second + or MJ per steradian. tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: value: @@ -37,8 +38,10 @@ properties: exact_datatype: true ndim: 2 unit: - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["electron / s"] + oneOf: + - tag: tag:stsci.edu:asdf/unit/unit-1.* + - tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN / s", "MJy.sr**-1"] dq: title: Data Quality Flags description: | @@ -48,9 +51,9 @@ properties: exact_datatype: true ndim: 2 err: - title: Error (electrons / s) + title: Error (DN / s) or (MJy / sr) description: | - Error in units of electrons per second. + Error in units of DNs per second or MJ per steradian. tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: value: @@ -59,12 +62,15 @@ properties: exact_datatype: true ndim: 2 unit: - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["electron / s"] + oneOf: + - tag: tag:stsci.edu:asdf/unit/unit-1.* + - tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN / s", "MJy.sr**-1"] var_poisson: - title: Poisson Variance (electrons^2 / s^2) + title: Poisson Variance (DN^2 / s^2) or (MJy^2 / sr^2) description: | - Poisson variance in units of electrons^2 / second^2. + Poisson variance in units of DN^2 / second^2 + or MJ per steradian. tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: value: @@ -73,12 +79,14 @@ properties: exact_datatype: true ndim: 2 unit: - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["electron2 / s2"] + oneOf: + - tag: tag:stsci.edu:asdf/unit/unit-1.* + - tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN2 / s2", "MJy**2.sr**-2"] var_rnoise: - title: Read Noise (electrons^2 / s^2) + title: Read Noise (DN^2 / s^2) or (MJy^2 / sr^2) description: | - Read noise in units of electrons^2 / second^2. + Read noise in units of DN^2 / second^2 or MJ^2 per steradian^2. tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: value: @@ -87,13 +95,15 @@ properties: exact_datatype: true ndim: 2 unit: - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["electron2 / s2"] + oneOf: + - tag: tag:stsci.edu:asdf/unit/unit-1.* + - tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN2 / s2", "MJy**2.sr**-2"] var_flat: - title: Variance for Estimate of Flat Pixel Flux (electrons^2 / s^2) + title: Variance for Estimate of Flat Pixel Flux (DN^2 / s^2) or (MJy^2 / sr^2) description: | Variance for estimate of flat pixel flux in units of - electrons^2 / second^2. + DN^2 / second^2 or MJ^2 per steradian^2. tag: tag:stsci.edu:asdf/unit/quantity-1.* properties: value: @@ -102,8 +112,10 @@ properties: exact_datatype: true ndim: 2 unit: - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["electron2 / s2"] + oneOf: + - tag: tag:stsci.edu:asdf/unit/unit-1.* + - tag: tag:astropy.org:astropy/units/unit-1.* + enum: ["DN2 / s2", "MJy**2.sr**-2"] amp33: title: Amp 33 Reference Pixel Data (DN) description: | From af2c4336c712cb1070565fc7b6c228f1f6b054c3 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Tue, 5 Mar 2024 18:34:03 -0500 Subject: [PATCH 2/3] CHANGES.rst --- CHANGES.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 0f66ab5c..59d1211d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -16,6 +16,8 @@ - Updated product table names. [#382] +- Changed image units. [#389] + 0.19.0 (2024-02-09) ------------------- From 1ad6ddef0cccefa7a0310a47320b646e90eba4b8 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Wed, 6 Mar 2024 10:27:53 -0500 Subject: [PATCH 3/3] Updated changelog. --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 59d1211d..d77c4b3b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -16,7 +16,7 @@ - Updated product table names. [#382] -- Changed image units. [#389] +- Changed image units from e/s to DN/s (and added support for MJy/sr). [#389] 0.19.0 (2024-02-09)