Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RAD-162: Remove GuideWindow and Ref tables from cal_step #420

Merged
merged 4 commits into from
May 14, 2024
Merged

RAD-162: Remove GuideWindow and Ref tables from cal_step #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0262a83
Removed unneeded db tables.
PaulHuwe May 7, 2024
0dd272e
Updated Changelog.
PaulHuwe May 7, 2024
77127d5
Corrected db target.
PaulHuwe May 7, 2024
3e7e6f2
Rebased.
PaulHuwe May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
0.20.0 (unreleased)
-------------------

- This PR removes reference file and guidewindow db tables from cal_step schemas. [#420]

- Separated TVAC and FPS schemas into their own suite of files. [#414]


Expand Down
30 changes: 15 additions & 15 deletions src/rad/resources/schemas/l2_cal_step-1.0.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_assign_wcs, GuideWindow.s_assign_wcs, WFICommon.s_assign_wcs]
destination: [ScienceRefData.s_assign_wcs]
flat_field:
title: Flat Fielding Step
descroption: |
Expand All @@ -27,7 +27,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_flat_field, GuideWindow.s_flat_field, WFICommon.s_flat_field]
destination: [ScienceRefData.s_flat_field]
dark:
title: Dark Current Subtraction Step
description: |
Expand All @@ -37,7 +37,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_dark, GuideWindow.s_dark, WFICommon.s_dark]
destination: [ScienceRefData.s_dark]
dq_init:
title: Initialization of the Data Quality Extension Step
description: |
Expand All @@ -47,7 +47,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_dq_init, GuideWindow.s_dq_init, WFICommon.s_dq_init]
destination: [ScienceRefData.s_dq_init]
flux:
title: Flux Scale Application Step
description: |
Expand All @@ -57,7 +57,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_flux, GuideWindow.s_flux, WFICommon.s_flux]
destination: [ScienceRefData.s_flux]
jump:
title: Cosmic Rays and Jump Detection Step
description: |
Expand All @@ -67,7 +67,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_jump, GuideWindow.s_jump, WFICommon.s_jump]
destination: [ScienceRefData.s_jump]
linearity:
title: Linearity Correction Step
description: |
Expand All @@ -77,7 +77,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_linearity, GuideWindow.s_linearity, WFICommon.s_linearity]
destination: [ScienceRefData.s_linearity]
photom:
title: Photometric Calibration Step
description: |
Expand All @@ -87,7 +87,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_photom, GuideWindow.s_photom, WFICommon.s_photom]
destination: [ScienceRefData.s_photom]
source_detection:
title: Source Detection Step
description: |
Expand All @@ -96,7 +96,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_source_detection, GuideWindow.s_source_detection, WFICommon.s_source_detection]
destination: [ScienceRefData.s_source_detection]
ramp_fit:
title: Ramp Fit Step
description: |
Expand All @@ -106,7 +106,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_ramp_fit, GuideWindow.s_ramp_fit, WFICommon.s_ramp_fit]
destination: [ScienceRefData.s_ramp_fit]
refpix:
title: Reference Pixel Correction Step
description: |
Expand All @@ -116,7 +116,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_refpix, GuideWindow.s_refpix, WFICommon.s_refpix]
destination: [ScienceRefData.s_refpix]
saturation:
title: Saturation Identification Step
description: |
Expand All @@ -127,7 +127,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_saturation, GuideWindow.s_saturation, WFICommon.s_saturation]
destination: [ScienceRefData.s_saturation]
outlier_detection:
title: Outlier Detection Step
description: |
Expand All @@ -136,7 +136,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]
tweakreg:
title: Tweakreg step
description: |
Expand All @@ -147,7 +147,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_tweakreg, GuideWindow.s_tweakreg, WFICommon.s_tweakreg]
destination: [ScienceRefData.s_tweakreg]
skymatch:
title: Sky Matching for Combining Overlapping Images Step
description: |
Expand All @@ -157,7 +157,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]
propertyOrder: [assign_wcs, flat_field, flux, dark, dq_init, jump, linearity, photom, source_detection,
outlier_detection, ramp_fit, refpix, saturation, skymatch, tweakreg]
flowStyle: block
Expand Down
8 changes: 4 additions & 4 deletions src/rad/resources/schemas/l3_cal_step-1.0.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_flux, GuideWindow.s_flux, WFIMosaic.s_flux]
destination: [ScienceRefData.s_flux]
outlier_detection:
title: Outlier Detection Step
description: |
Expand All @@ -24,7 +24,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_outlier_detection, GuideWindow.s_outlier_detection, WFIMosaic.s_outlier_detection]
destination: [ScienceRefData.s_outlier_detection]
skymatch:
title: Sky Matching for Combining Overlapping Images Step
description: |
Expand All @@ -34,7 +34,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_skymatch, GuideWindow.s_skymatch, WFIMosaic.s_skymatch]
destination: [ScienceRefData.s_skymatch]
resample:
title: Resampling Input Data onto a Regular Grid Step
description: |
Expand All @@ -45,7 +45,7 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_resample, GuideWindow.s_resample, WFIMosaic.s_resample]
destination: [ScienceRefData.s_resample]
propertyOrder: [flux, outlier_detection, skymatch, resample]
flowStyle: block
required: [flux, outlier_detection, resample, skymatch]
Expand Down