diff --git a/src/rad/resources/schemas/reference_files/dark-1.0.0.yaml b/src/rad/resources/schemas/reference_files/dark-1.0.0.yaml index fc66728a..8a074729 100644 --- a/src/rad/resources/schemas/reference_files/dark-1.0.0.yaml +++ b/src/rad/resources/schemas/reference_files/dark-1.0.0.yaml @@ -55,18 +55,12 @@ properties: data: title: Dark Current Array description: | - The dark current array represents the integrated number of counts due to + The dark current array in DN that represents the integrated number of counts due to the accumulation of dark current electrons in the pixels. - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - value: - tag: tag:stsci.edu:asdf/core/ndarray-1.* - datatype: float32 - exact_datatype: true - ndim: 3 - unit: - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["DN"] + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: float32 + exact_datatype: true + ndim: 3 dq: title: 2-D Data Quality Array description: | @@ -78,34 +72,22 @@ properties: dark_slope: title: Dark Current Rate Array description: | - The dark current rate array represents the slope of the integrated number + The dark current rate array in DN/s that represents the slope of the integrated number of counts due to the accumulation of dark current electrons in the pixels calculated from slope fitting the Dark Current Array. - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - value: - tag: tag:stsci.edu:asdf/core/ndarray-1.* - datatype: float32 - exact_datatype: true - ndim: 2 - unit: - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["DN / s"] + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: float32 + exact_datatype: true + ndim: 2 dark_slope_error: title: Dark Current Rate Uncertainty Array description: | - The uncertainty calculated from the slope fitting of the Dark Current + The uncertainty in DN/s calculated from the slope fitting of the Dark Current Array. - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - value: - tag: tag:stsci.edu:asdf/core/ndarray-1.* - datatype: float32 - exact_datatype: true - ndim: 2 - unit: - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["DN / s"] + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: float32 + exact_datatype: true + ndim: 2 required: [meta, data, dq, dark_slope, dark_slope_error] flowStyle: block propertyOrder: [meta, data, dq, dark_slope, dark_slope_error] diff --git a/src/rad/resources/schemas/reference_files/distortion-1.0.0.yaml b/src/rad/resources/schemas/reference_files/distortion-1.0.0.yaml index cc7a623f..92d29d67 100644 --- a/src/rad/resources/schemas/reference_files/distortion-1.0.0.yaml +++ b/src/rad/resources/schemas/reference_files/distortion-1.0.0.yaml @@ -17,19 +17,6 @@ properties: reftype: type: string enum: [DISTORTION] - input_units: - title: Input Model Units - description: | - The pixel input units of the detector coordinate model. - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: ["pixel"] - output_units: - title: Output Model Units - description: | - The V2/V3 coordinates output units after the model is applied. - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: ["arcsec"] - required: [output_units, input_units] - $ref: ref_optical_element-1.0.0 coordinate_distortion_transform: title: Distortion Transform Model diff --git a/src/rad/resources/schemas/reference_files/gain-1.0.0.yaml b/src/rad/resources/schemas/reference_files/gain-1.0.0.yaml index 10641440..554fdb06 100644 --- a/src/rad/resources/schemas/reference_files/gain-1.0.0.yaml +++ b/src/rad/resources/schemas/reference_files/gain-1.0.0.yaml @@ -20,18 +20,12 @@ properties: data: title: Gain Data Array description: | - The Gain Data Array represents the pixel to pixel conversion from digital + The Gain Data Array in electrons / DN that represents the pixel to pixel conversion from digital numbers (DN) to electrons (e). The units are e/DN. - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - value: - tag: tag:stsci.edu:asdf/core/ndarray-1.* - datatype: float32 - exact_datatype: true - ndim: 2 - unit: - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["electron / DN"] + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: float32 + exact_datatype: true + ndim: 2 required: [meta, data] flowStyle: block propertyOrder: [meta, data] diff --git a/src/rad/resources/schemas/reference_files/inverselinearity-1.0.0.yaml b/src/rad/resources/schemas/reference_files/inverselinearity-1.0.0.yaml index b072bfe9..e3fede31 100644 --- a/src/rad/resources/schemas/reference_files/inverselinearity-1.0.0.yaml +++ b/src/rad/resources/schemas/reference_files/inverselinearity-1.0.0.yaml @@ -17,19 +17,6 @@ properties: reftype: type: string enum: [INVERSELINEARITY] - input_units: - title: Inverse Linearity Input Units - description: | - Units of the input to the inverse linearity polynomial. - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["DN"] - output_units: - title: Inverse Linearity Output Units - description: | - Units of the output of the inverse linearity polynomial. - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["DN"] - required: [output_units, input_units] coeffs: title: Inverse Linearity Coefficients description: | diff --git a/src/rad/resources/schemas/reference_files/linearity-1.0.0.yaml b/src/rad/resources/schemas/reference_files/linearity-1.0.0.yaml index 69873698..1b954f77 100644 --- a/src/rad/resources/schemas/reference_files/linearity-1.0.0.yaml +++ b/src/rad/resources/schemas/reference_files/linearity-1.0.0.yaml @@ -17,19 +17,6 @@ properties: reftype: type: string enum: [LINEARITY] - input_units: - title: Units of the Input to the Linearity Polynomial - description: | - Units of the input to the linearity polynomial. - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["DN"] - output_units: - title: Units of the Output of the Linearity Polynomial - description: | - Units of the output to the linearity polynomial. - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["DN"] - required: [output_units, input_units] coeffs: title: Linearity Coefficients description: | diff --git a/src/rad/resources/schemas/reference_files/pixelarea-1.0.0.yaml b/src/rad/resources/schemas/reference_files/pixelarea-1.0.0.yaml index 5e88e728..879868b0 100644 --- a/src/rad/resources/schemas/reference_files/pixelarea-1.0.0.yaml +++ b/src/rad/resources/schemas/reference_files/pixelarea-1.0.0.yaml @@ -25,26 +25,14 @@ properties: description: | The nominal pixel area in steradians. anyOf: - - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - datatype: - enum: ["float64"] - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: ["sr"] + - type: number - type: "null" pixelarea_arcsecsq: title: Pixel Area (arcsec^2) description: The nominal pixel area in arcec^2. anyOf: - - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - datatype: - enum: ["float64"] - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: ["arcsec**2"] + - type: number - type: "null" required: [pixelarea_steradians, pixelarea_arcsecsq] required: [photometry] diff --git a/src/rad/resources/schemas/reference_files/readnoise-1.0.0.yaml b/src/rad/resources/schemas/reference_files/readnoise-1.0.0.yaml index ebdbd89b..d32db0da 100644 --- a/src/rad/resources/schemas/reference_files/readnoise-1.0.0.yaml +++ b/src/rad/resources/schemas/reference_files/readnoise-1.0.0.yaml @@ -20,18 +20,12 @@ properties: data: title: Read Noise Data Array description: | - The pixel-by-pixel map read noise data array is used in estimating the + The pixel-by-pixel map read noise data array in DN that is used in estimating the expected noise in each pixel. - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - value: - tag: tag:stsci.edu:asdf/core/ndarray-1.* - datatype: float32 - exact_datatype: true - ndim: 2 - unit: - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["DN"] + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: float32 + exact_datatype: true + ndim: 2 required: [meta, data] flowStyle: block propertyOrder: [meta, data] diff --git a/src/rad/resources/schemas/reference_files/refpix-1.0.0.yaml b/src/rad/resources/schemas/reference_files/refpix-1.0.0.yaml index 09c85039..1f886a4d 100644 --- a/src/rad/resources/schemas/reference_files/refpix-1.0.0.yaml +++ b/src/rad/resources/schemas/reference_files/refpix-1.0.0.yaml @@ -19,15 +19,6 @@ properties: reftype: type: string enum: [REFPIX] - input_units: - title: Units of the input to the linearity polynomial. - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["DN"] - output_units: - title: Units of the output of the linearity polynomial. - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["DN"] - required: [output_units, input_units] gamma: title: Left column correction coefficients diff --git a/src/rad/resources/schemas/reference_files/saturation-1.0.0.yaml b/src/rad/resources/schemas/reference_files/saturation-1.0.0.yaml index 4ef038f4..50527678 100644 --- a/src/rad/resources/schemas/reference_files/saturation-1.0.0.yaml +++ b/src/rad/resources/schemas/reference_files/saturation-1.0.0.yaml @@ -20,18 +20,12 @@ properties: data: title: Saturation Threshold Array description: | - The pixel level threshold for determining saturation before non-linearity + The pixel level threshold in DN for determining saturation before non-linearity corrections are applied. - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - value: - tag: tag:stsci.edu:asdf/core/ndarray-1.* - datatype: float32 - exact_datatype: true - ndim: 2 - unit: - tag: tag:astropy.org:astropy/units/unit-1.* - enum: ["DN"] + tag: tag:stsci.edu:asdf/core/ndarray-1.* + datatype: float32 + exact_datatype: true + ndim: 2 dq: title: 2-D Data Quality Array description: | diff --git a/src/rad/resources/schemas/reference_files/wfi_img_photom-1.0.0.yaml b/src/rad/resources/schemas/reference_files/wfi_img_photom-1.0.0.yaml index 842f53e4..92524a55 100644 --- a/src/rad/resources/schemas/reference_files/wfi_img_photom-1.0.0.yaml +++ b/src/rad/resources/schemas/reference_files/wfi_img_photom-1.0.0.yaml @@ -32,39 +32,21 @@ properties: description: | Surface brightness, in MJy / steradian. anyOf: - - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - value: - type: number - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [MJy.sr**-1] + - type: number - type: "null" uncertainty: title: Surface Brightness Uncertainty description: | Uncertainty of surface brightness, in MJy / steradian. anyOf: - - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - value: - type: number - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [MJy.sr**-1] + - type: number - type: "null" pixelareasr: title: Pixel Area description: | The nominal pixel area, in steradian. anyOf: - - tag: tag:stsci.edu:asdf/unit/quantity-1.* - properties: - value: - type: number - unit: - tag: tag:stsci.edu:asdf/unit/unit-1.* - enum: [sr] + - type: number - type: "null" required: [photmjsr, uncertainty, pixelareasr] additionalProperties: false