Skip to content

Commit

Permalink
RAD-149: Split cal_step into L2 & L3 (spacetelescope#397)
Browse files Browse the repository at this point in the history
* Initial commit.

* Updated Changelog.

* Update docs.
  • Loading branch information
PaulHuwe authored Mar 29, 2024
1 parent 34b997a commit d869ddc
Show file tree
Hide file tree
Showing 9 changed files with 75 additions and 24 deletions.
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

- Add attributes under the ``basic`` schema to ``WfiMosaic.meta``. [#390]

- Split cal_step into L2 and L3 versions. [#397]

- Add Members Keyword to Resample Schema. [#396]

- Create the flux step schema. [#395]
Expand Down
3 changes: 2 additions & 1 deletion docs/schemas.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Tags
associations-1.0.0
basic-1.0.0
cal_logs-1.0.0
cal_step-1.0.0
common-1.0.0
coordinates-1.0.0
ephemeris-1.0.0
Expand All @@ -43,6 +42,8 @@ Tags
guidewindow_modes-1.0.0
guidewindow-1.0.0
individual_image_meta-1.0.0
l2_cal_step-1.0.0
l3_cal_step-1.0.0
mosaic_associations-1.0.0
mosaic_basic-1.0.0
mosaic_wcsinfo-1.0.0
Expand Down
13 changes: 9 additions & 4 deletions src/rad/resources/manifests/datamodels-1.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,16 @@ tags:
title: Guidestar information
description: |-
Guidestar information
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/cal_step-1.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/cal_step-1.0.0
title: Calibration Step status information
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/l2_cal_step-1.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/l2_cal_step-1.0.0
title: Level 2 Calibration Step status information
description: |-
Calibration Step status information
Level 2 Calibration Step status information
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/l3_cal_step-1.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/l3_cal_step-1.0.0
title: Level 3 Calibration Step status information
description: |-
Level 3 Calibration Step status information
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/resample-1.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/resample-1.0.0
title: Resample information
Expand Down
2 changes: 1 addition & 1 deletion src/rad/resources/schemas/common-1.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ allOf:
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/cal_step-1.0.0
tag: asdf://stsci.edu/datamodels/roman/tags/l2_cal_step-1.0.0
coordinates:
title: Name Of The Coordinate Reference Frame
tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0
Expand Down
2 changes: 1 addition & 1 deletion src/rad/resources/schemas/ground_common-1.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ allOf:
properties:
# Meta Objects
cal_step:
tag: asdf://stsci.edu/datamodels/roman/tags/cal_step-1.0.0
tag: asdf://stsci.edu/datamodels/roman/tags/l2_cal_step-1.0.0
exposure:
tag: asdf://stsci.edu/datamodels/roman/tags/base_exposure-1.0.0
guidestar:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/cal_step-1.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/l2_cal_step-1.0.0

title: Calibration Status
title: Level 2 Calibration Status
type: object
properties:
assign_wcs:
Expand Down Expand Up @@ -158,19 +158,10 @@ properties:
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_skymatch, GuideWindow.s_skymatch, WFICommon.s_skymatch]
resample:
title: Resampling Input Data onto a Regular Grid Step
description: |
Step in ROMANCAL which resamples each input 2D image based on its WCS and
WCS distortion information on a grid that allows the combination of
multiple resampled images into a single, undistorted product.
type: string
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_resample, GuideWindow.s_resample, WFICommon.s_resample]
propertyOrder: [assign_wcs, flat_field, dark, dq_init, flux, jump, linearity, photom, source_detection, outlier_detection, ramp_fit, refpix, saturation, skymatch, tweakreg, resample]
propertyOrder: [assign_wcs, flat_field, flux, dark, dq_init, jump, linearity, photom, source_detection,
outlier_detection, ramp_fit, refpix, saturation, skymatch, tweakreg]
flowStyle: block
required: [assign_wcs, flat_field, dark, dq_init, flux, jump, linearity, outlier_detection, photom, source_detection, ramp_fit, refpix, resample, saturation, skymatch, tweakreg]
required: [assign_wcs, flat_field, flux, dark, dq_init, jump, linearity, outlier_detection, photom,
source_detection, ramp_fit, refpix, saturation, skymatch, tweakreg]
additionalProperties: true
...
53 changes: 53 additions & 0 deletions src/rad/resources/schemas/l3_cal_step-1.0.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/l3_cal_step-1.0.0

title: Level 3 Calibration Status
type: object
properties:
flux:
title: Flux Scale Application Step
description: |
Step in ROMANCAL which applies the scaling factors determined in the Photom calibrations step.
The data are converted from DN/s to MJy/sr.
type: string
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_flux, GuideWindow.s_flux, WFIMosaic.s_flux]
outlier_detection:
title: Outlier Detection Step
description: |
Step in ROMANCAL which detects and flags outliers in a science image.
type: string
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_outlier_detection, GuideWindow.s_outlier_detection, WFIMosaic.s_outlier_detection]
skymatch:
title: Sky Matching for Combining Overlapping Images Step
description: |
Step in ROMANCAL that computes sky background values of each input image
and derives scalings to equalize overlapping regions.
type: string
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_skymatch, GuideWindow.s_skymatch, WFIMosaic.s_skymatch]
resample:
title: Resampling Input Data onto a Regular Grid Step
description: |
Step in ROMANCAL which resamples each input 2D image based on its WCS and
WCS distortion information on a grid that allows the combination of
multiple resampled images into a single, undistorted product.
type: string
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_resample, GuideWindow.s_resample, WFIMosaic.s_resample]
propertyOrder: [flux, outlier_detection, skymatch, resample]
flowStyle: block
required: [flux, outlier_detection, resample, skymatch]
additionalProperties: true
...
2 changes: 1 addition & 1 deletion src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ properties:
basic:
tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0
cal_step:
tag: asdf://stsci.edu/datamodels/roman/tags/cal_step-1.0.0
tag: asdf://stsci.edu/datamodels/roman/tags/l3_cal_step-1.0.0
coordinates:
tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0
individual_image_meta:
Expand Down
1 change: 0 additions & 1 deletion src/rad/resources/schemas/wfi_science_raw-1.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ properties:
unit:
tag: tag:astropy.org:astropy/units/unit-1.*
enum: ["DN"]

amp33:
title: Amplifier 33 Reference Pixel Data (DN)
description: |
Expand Down

0 comments on commit d869ddc

Please sign in to comment.