Skip to content

Commit 9d50bdb

Browse files
authored
RAD-162: Remove GuideWindow and Ref tables from cal_step (#420)
* Removed unneeded db tables. * Updated Changelog. * Corrected db target.
1 parent 74563a6 commit 9d50bdb

3 files changed

Lines changed: 21 additions & 19 deletions

File tree

CHANGES.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
0.20.0 (unreleased)
22
-------------------
33

4+
- This PR removes reference file and guidewindow db tables from cal_step schemas. [#420]
5+
46
- Separated TVAC and FPS schemas into their own suite of files. [#414]
57

68
- Fixed the TVAC & FPS archive catalog destinations. [#424]

src/rad/resources/schemas/l2_cal_step-1.0.0.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ properties:
1515
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
1616
archive_catalog:
1717
datatype: nvarchar(15)
18-
destination: [ScienceRefData.s_assign_wcs, GuideWindow.s_assign_wcs, WFICommon.s_assign_wcs]
18+
destination: [ScienceRefData.s_assign_wcs]
1919
flat_field:
2020
title: Flat Fielding Step
2121
descroption: |
@@ -27,7 +27,7 @@ properties:
2727
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
2828
archive_catalog:
2929
datatype: nvarchar(15)
30-
destination: [ScienceRefData.s_flat_field, GuideWindow.s_flat_field, WFICommon.s_flat_field]
30+
destination: [ScienceRefData.s_flat_field]
3131
dark:
3232
title: Dark Current Subtraction Step
3333
description: |
@@ -37,7 +37,7 @@ properties:
3737
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
3838
archive_catalog:
3939
datatype: nvarchar(15)
40-
destination: [ScienceRefData.s_dark, GuideWindow.s_dark, WFICommon.s_dark]
40+
destination: [ScienceRefData.s_dark]
4141
dq_init:
4242
title: Initialization of the Data Quality Extension Step
4343
description: |
@@ -47,7 +47,7 @@ properties:
4747
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
4848
archive_catalog:
4949
datatype: nvarchar(15)
50-
destination: [ScienceRefData.s_dq_init, GuideWindow.s_dq_init, WFICommon.s_dq_init]
50+
destination: [ScienceRefData.s_dq_init]
5151
flux:
5252
title: Flux Scale Application Step
5353
description: |
@@ -57,7 +57,7 @@ properties:
5757
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
5858
archive_catalog:
5959
datatype: nvarchar(15)
60-
destination: [ScienceRefData.s_flux, GuideWindow.s_flux, WFICommon.s_flux]
60+
destination: [ScienceRefData.s_flux]
6161
jump:
6262
title: Cosmic Rays and Jump Detection Step
6363
description: |
@@ -67,7 +67,7 @@ properties:
6767
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
6868
archive_catalog:
6969
datatype: nvarchar(15)
70-
destination: [ScienceRefData.s_jump, GuideWindow.s_jump, WFICommon.s_jump]
70+
destination: [ScienceRefData.s_jump]
7171
linearity:
7272
title: Linearity Correction Step
7373
description: |
@@ -77,7 +77,7 @@ properties:
7777
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
7878
archive_catalog:
7979
datatype: nvarchar(15)
80-
destination: [ScienceRefData.s_linearity, GuideWindow.s_linearity, WFICommon.s_linearity]
80+
destination: [ScienceRefData.s_linearity]
8181
photom:
8282
title: Photometric Calibration Step
8383
description: |
@@ -87,7 +87,7 @@ properties:
8787
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
8888
archive_catalog:
8989
datatype: nvarchar(15)
90-
destination: [ScienceRefData.s_photom, GuideWindow.s_photom, WFICommon.s_photom]
90+
destination: [ScienceRefData.s_photom]
9191
source_detection:
9292
title: Source Detection Step
9393
description: |
@@ -96,7 +96,7 @@ properties:
9696
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
9797
archive_catalog:
9898
datatype: nvarchar(15)
99-
destination: [ScienceRefData.s_source_detection, GuideWindow.s_source_detection, WFICommon.s_source_detection]
99+
destination: [ScienceRefData.s_source_detection]
100100
ramp_fit:
101101
title: Ramp Fit Step
102102
description: |
@@ -106,7 +106,7 @@ properties:
106106
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
107107
archive_catalog:
108108
datatype: nvarchar(15)
109-
destination: [ScienceRefData.s_ramp_fit, GuideWindow.s_ramp_fit, WFICommon.s_ramp_fit]
109+
destination: [ScienceRefData.s_ramp_fit]
110110
refpix:
111111
title: Reference Pixel Correction Step
112112
description: |
@@ -116,7 +116,7 @@ properties:
116116
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
117117
archive_catalog:
118118
datatype: nvarchar(15)
119-
destination: [ScienceRefData.s_refpix, GuideWindow.s_refpix, WFICommon.s_refpix]
119+
destination: [ScienceRefData.s_refpix]
120120
saturation:
121121
title: Saturation Identification Step
122122
description: |
@@ -127,7 +127,7 @@ properties:
127127
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
128128
archive_catalog:
129129
datatype: nvarchar(15)
130-
destination: [ScienceRefData.s_saturation, GuideWindow.s_saturation, WFICommon.s_saturation]
130+
destination: [ScienceRefData.s_saturation]
131131
outlier_detection:
132132
title: Outlier Detection Step
133133
description: |
@@ -136,7 +136,7 @@ properties:
136136
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
137137
archive_catalog:
138138
datatype: nvarchar(15)
139-
destination: [ScienceRefData.s_outlier_detection, GuideWindow.s_outlier_detection, WFICommon.s_outlier_detection]
139+
destination: [ScienceRefData.s_outlier_detection]
140140
tweakreg:
141141
title: Tweakreg step
142142
description: |
@@ -147,7 +147,7 @@ properties:
147147
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
148148
archive_catalog:
149149
datatype: nvarchar(15)
150-
destination: [ScienceRefData.s_tweakreg, GuideWindow.s_tweakreg, WFICommon.s_tweakreg]
150+
destination: [ScienceRefData.s_tweakreg]
151151
skymatch:
152152
title: Sky Matching for Combining Overlapping Images Step
153153
description: |
@@ -157,7 +157,7 @@ properties:
157157
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
158158
archive_catalog:
159159
datatype: nvarchar(15)
160-
destination: [ScienceRefData.s_skymatch, GuideWindow.s_skymatch, WFICommon.s_skymatch]
160+
destination: [ScienceRefData.s_skymatch]
161161
propertyOrder: [assign_wcs, flat_field, flux, dark, dq_init, jump, linearity, photom, source_detection,
162162
outlier_detection, ramp_fit, refpix, saturation, skymatch, tweakreg]
163163
flowStyle: block

src/rad/resources/schemas/l3_cal_step-1.0.0.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ properties:
1515
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
1616
archive_catalog:
1717
datatype: nvarchar(15)
18-
destination: [ScienceRefData.s_flux, GuideWindow.s_flux, WFIMosaic.s_flux]
18+
destination: [ScienceRefData.s_flux]
1919
outlier_detection:
2020
title: Outlier Detection Step
2121
description: |
@@ -24,7 +24,7 @@ properties:
2424
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
2525
archive_catalog:
2626
datatype: nvarchar(15)
27-
destination: [ScienceRefData.s_outlier_detection, GuideWindow.s_outlier_detection, WFIMosaic.s_outlier_detection]
27+
destination: [ScienceRefData.s_outlier_detection]
2828
skymatch:
2929
title: Sky Matching for Combining Overlapping Images Step
3030
description: |
@@ -34,7 +34,7 @@ properties:
3434
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
3535
archive_catalog:
3636
datatype: nvarchar(15)
37-
destination: [ScienceRefData.s_skymatch, GuideWindow.s_skymatch, WFIMosaic.s_skymatch]
37+
destination: [ScienceRefData.s_skymatch]
3838
resample:
3939
title: Resampling Input Data onto a Regular Grid Step
4040
description: |
@@ -45,7 +45,7 @@ properties:
4545
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
4646
archive_catalog:
4747
datatype: nvarchar(15)
48-
destination: [ScienceRefData.s_resample, GuideWindow.s_resample, WFIMosaic.s_resample]
48+
destination: [ScienceRefData.s_resample]
4949
propertyOrder: [flux, outlier_detection, skymatch, resample]
5050
flowStyle: block
5151
required: [flux, outlier_detection, resample, skymatch]

0 commit comments

Comments
 (0)