Skip to content

Commit

Permalink
Rebased.
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulHuwe committed Mar 29, 2024
2 parents ee26802 + 34b997a commit 879d591
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 9 deletions.
4 changes: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@

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

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

- Create the flux step schema. [#395]


0.19.0 (2024-02-09)
-------------------
Expand Down
14 changes: 12 additions & 2 deletions src/rad/resources/schemas/l2_cal_step-1.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ properties:
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_dq_init, GuideWindow.s_dq_init, WFICommon.s_dq_init]
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, WFICommon.s_flux]
jump:
title: Cosmic Rays and Jump Detection Step
description: |
Expand Down Expand Up @@ -148,10 +158,10 @@ properties:
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_skymatch, GuideWindow.s_skymatch, WFICommon.s_skymatch]
propertyOrder: [assign_wcs, flat_field, dark, dq_init, jump, linearity, photom, source_detection,
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, jump, linearity, outlier_detection, photom,
required: [assign_wcs, flat_field, flux, dark, dq_init, jump, linearity, outlier_detection, photom,
source_detection, ramp_fit, refpix, saturation, skymatch, tweakreg]
additionalProperties: true
...
20 changes: 15 additions & 5 deletions src/rad/resources/schemas/l3_cal_step-1.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ 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: |
Expand All @@ -14,7 +24,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_outlier_detection, GuideWindow.s_outlier_detection, WFICommon.s_outlier_detection]
destination: [ScienceRefData.s_outlier_detection, GuideWindow.s_outlier_detection, WFIMosaic.s_outlier_detection]
skymatch:
title: Sky Matching for Combining Overlapping Images Step
description: |
Expand All @@ -24,7 +34,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_skymatch, GuideWindow.s_skymatch, WFICommon.s_skymatch]
destination: [ScienceRefData.s_skymatch, GuideWindow.s_skymatch, WFIMosaic.s_skymatch]
resample:
title: Resampling Input Data onto a Regular Grid Step
description: |
Expand All @@ -35,9 +45,9 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_resample, GuideWindow.s_resample, WFICommon.s_resample]
propertyOrder: [outlier_detection, skymatch, resample]
destination: [ScienceRefData.s_resample, GuideWindow.s_resample, WFIMosaic.s_resample]
propertyOrder: [flux, outlier_detection, skymatch, resample]
flowStyle: block
required: [outlier_detection, resample, skymatch]
required: [flux, outlier_detection, resample, skymatch]
additionalProperties: true
...
11 changes: 9 additions & 2 deletions src/rad/resources/schemas/resample-1.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ properties:
description: |
The total exposure time for the resampled product.
type: number
members:
title: Resample Members
description: |
Filenames of resample members
type: array
items:
type: string
weight_type:
title: Weight Type
description: |
Expand All @@ -37,7 +44,7 @@ properties:
variance map ("ivm").
type: string
enum: ["exptime", "ivm"]
propertyOrder: [pixel_scale_ratio, pixfrac, pointings, product_exposure_time, weight_type]
propertyOrder: [members, pixel_scale_ratio, pixfrac, pointings, product_exposure_time, weight_type]
flowStyle: block
required: [pixel_scale_ratio, pixfrac, weight_type]
required: [members, pixel_scale_ratio, pixfrac, weight_type]
...

0 comments on commit 879d591

Please sign in to comment.