Skip to content

Commit 74563a6

Browse files
RAD-170: Fix TVAC & RPS Archive Cat Destinations (#424)
* Initial edit. * Update Changelog. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent c9d7381 commit 74563a6

28 files changed

Lines changed: 124 additions & 152 deletions

CHANGES.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

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

6+
- Fixed the TVAC & FPS archive catalog destinations. [#424]
7+
68
- Added statistics schemas to both FPS and TVAC. [#423]
79

810
- Removed filepath_level_pnt5 from TVAC/FPS database. [#422]

src/rad/resources/schemas/fps/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: [WFICommon.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: [WFICommon.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: [WFICommon.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: [WFICommon.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: [WFICommon.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: [WFICommon.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: [WFICommon.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: [WFICommon.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: [WFICommon.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: [WFICommon.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: [WFICommon.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: [WFICommon.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: [WFICommon.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: [WFICommon.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: [WFICommon.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/fps/exposure-1.0.0.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ properties:
1717
origin: TBD
1818
archive_catalog:
1919
datatype: nvarchar(25)
20-
destination: [WFIExposure.exposure_type, GuideWindow.exposure_type, WFICommon.exposure_type]
20+
destination: [WFICommon.exposure_type]
2121
start_time:
2222
title: Exposure Start Time (UTC)
2323
description: |
@@ -29,7 +29,7 @@ properties:
2929
origin: TBD
3030
archive_catalog:
3131
datatype: datetime2
32-
destination: [WFIExposure.exposure_start_time, GuideWindow.exposure_start_time, WFICommon.exposure_start_time]
32+
destination: [WFICommon.exposure_start_time]
3333
ngroups:
3434
title: Number of Resultants
3535
description: |
@@ -42,7 +42,7 @@ properties:
4242
origin: TBD
4343
archive_catalog:
4444
datatype: int
45-
destination: [WFIExposure.exposure_ngroups, GuideWindow.exposure_ngroups, WFICommon.exposure_ngroups]
45+
destination: [WFICommon.exposure_ngroups]
4646
nframes:
4747
title: Number of Reads
4848
description: |
@@ -54,7 +54,7 @@ properties:
5454
origin: TBD
5555
archive_catalog:
5656
datatype: int
57-
destination: [WFIExposure.exposure_nframes, GuideWindow.exposure_nframes, WFICommon.exposure_nframes]
57+
destination: [WFICommon.exposure_nframes]
5858
data_problem:
5959
title: Data Problem
6060
description: |
@@ -66,7 +66,7 @@ properties:
6666
origin: TBD
6767
archive_catalog:
6868
datatype: nchar(1)
69-
destination: [WFIExposure.exposure_data_problem, GuideWindow.exposure_data_problem, WFICommon.exposure_data_problem]
69+
destination: [WFICommon.exposure_data_problem]
7070
frame_divisor:
7171
title: Frame Divisor
7272
description: |
@@ -79,7 +79,7 @@ properties:
7979
origin: TBD
8080
archive_catalog:
8181
datatype: int
82-
destination: [WFIExposure.exposure_frame_divisor, GuideWindow.exposure_frame_divisor, WFICommon.exposure_frame_divisor]
82+
destination: [WFICommon.exposure_frame_divisor]
8383
groupgap:
8484
title: Number of Frames Dropped Between Resultants
8585
description:
@@ -92,7 +92,7 @@ properties:
9292
origin: TBD
9393
archive_catalog:
9494
datatype: int
95-
destination: [WFIExposure.exposure_groupgap, GuideWindow.exposure_groupgap, WFICommon.exposure_groupgap]
95+
destination: [WFICommon.exposure_groupgap]
9696
frame_time:
9797
title: Time Between Reads (s)
9898
description: |
@@ -105,7 +105,7 @@ properties:
105105
origin: TBD
106106
archive_catalog:
107107
datatype: float
108-
destination: [WFIExposure.exposure_frame_time, GuideWindow.exposure_frame_time, WFICommon.exposure_frame_time]
108+
destination: [WFICommon.exposure_frame_time]
109109
group_time:
110110
title: Time Between Resultants (s)
111111
description: |
@@ -118,7 +118,7 @@ properties:
118118
origin: TBD
119119
archive_catalog:
120120
datatype: float
121-
destination: [WFIExposure.exposure_group_time, GuideWindow.exposure_group_time, WFICommon.exposure_group_time]
121+
destination: [WFICommon.exposure_group_time]
122122
exposure_time:
123123
title: Exposure Time (s)
124124
description: |
@@ -132,7 +132,7 @@ properties:
132132
origin: TBD
133133
archive_catalog:
134134
datatype: float
135-
destination: [WFIExposure.exposure_time, GuideWindow.exposure_time, WFICommon.exposure_time]
135+
destination: [WFICommon.exposure_time]
136136
ma_table_name:
137137
title: MA Table Name
138138
description: |
@@ -145,7 +145,7 @@ properties:
145145
origin: TBD
146146
archive_catalog:
147147
datatype: nvarchar(50)
148-
destination: [WFIExposure.ma_table_name, GuideWindow.ma_table_name, WFICommon.ma_table_name]
148+
destination: [WFICommon.ma_table_name]
149149
ma_table_number:
150150
title: MA Table Number
151151
description: |
@@ -158,7 +158,7 @@ properties:
158158
origin: TBD
159159
archive_catalog:
160160
datatype: smallint
161-
destination: [WFIExposure.ma_table_number, GuideWindow.ma_table_number, WFICommon.ma_table_number]
161+
destination: [WFICommon.ma_table_number]
162162
read_pattern:
163163
title: Read Pattern
164164
description: |
@@ -175,7 +175,7 @@ properties:
175175
origin: TBD
176176
archive_catalog:
177177
datatype: nvarchar(3500)
178-
destination: [WFIExposure.read_pattern, GuideWindow.read_pattern, WFICommon.read_pattern]
178+
destination: [WFICommon.read_pattern]
179179
propertyOrder: [type, start_time,
180180
ngroups, nframes, data_problem,
181181
frame_divisor, groupgap, frame_time, group_time, exposure_time,

src/rad/resources/schemas/fps/groundtest-1.0.0.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ properties:
117117
datatype: float64
118118
exact_datatype: true
119119
# needs ndim
120-
121120
propertyOrder: [test_name, test_phase, test_environment, test_script,
122121
product_date, product_version, conversion_date, conversion_version,
123122
filename_pnt5, filepath_level_pnt5, filename_l1a, detector_id,

src/rad/resources/schemas/fps/guidestar-1.0.0.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ properties:
1717
origin: TBD
1818
archive_catalog:
1919
datatype: nvarchar(20)
20-
destination: [WFIExposure.gw_id, GuideWindow.gw_id, WFICommon.gw_id]
20+
destination: [WFICommon.gw_id]
2121
gw_fgs_mode:
2222
$ref: guidewindow_modes-1.0.0
2323
sdf:
@@ -26,7 +26,7 @@ properties:
2626
origin: TBD
2727
archive_catalog:
2828
datatype: nvarchar(18)
29-
destination: [WFIExposure.gw_fgs_mode, GuideWindow.gw_fgs_mode, WFICommon.gw_fgs_mode]
29+
destination: [WFICommon.gw_fgs_mode]
3030
data_start:
3131
title: Guide Data Start Time (MJD)
3232
description: |
@@ -39,7 +39,7 @@ properties:
3939
origin: TBD
4040
archive_catalog:
4141
datatype: float
42-
destination: [WFIExposure.data_start, GuideWindow.data_start, WFICommon.data_start]
42+
destination: [WFICommon.data_start]
4343
data_end:
4444
title: Guide Data End Time (MJD)
4545
description: |
@@ -52,7 +52,7 @@ properties:
5252
origin: TBD
5353
archive_catalog:
5454
datatype: float
55-
destination: [WFIExposure.data_end, GuideWindow.data_end, WFICommon.data_end]
55+
destination: [WFICommon.data_end]
5656
gw_window_xstart:
5757
title: Guide Window X Start Position (pixels)
5858
description: |
@@ -65,7 +65,7 @@ properties:
6565
origin: Science Data Formatting
6666
archive_catalog:
6767
datatype: int
68-
destination: [WFIExposure.gw_window_xstart, WFICommon.gw_window_xstart]
68+
destination: [WFICommon.gw_window_xstart]
6969
gw_window_ystart:
7070
title: Guide Window Y Start Position (pixels)
7171
description: |
@@ -78,7 +78,7 @@ properties:
7878
origin: Science Data Formatting
7979
archive_catalog:
8080
datatype: int
81-
destination: [WFIExposure.gw_window_ystart, WFICommon.gw_window_ystart]
81+
destination: [WFICommon.gw_window_ystart]
8282
gw_window_xstop:
8383
title: Guide Window X Stop Position (pixels)
8484
description: |
@@ -91,7 +91,7 @@ properties:
9191
origin: Science Data Formatting
9292
archive_catalog:
9393
datatype: int
94-
destination: [WFIExposure.gw_window_xstop, WFICommon.gw_window_xstop]
94+
destination: [WFICommon.gw_window_xstop]
9595
gw_window_ystop:
9696
title: Guide Window Y Stop Position (pixels)
9797
description: |
@@ -104,7 +104,7 @@ properties:
104104
origin: Science Data Formatting
105105
archive_catalog:
106106
datatype: int
107-
destination: [WFIExposure.gw_window_ystop, WFICommon.gw_window_ystop]
107+
destination: [WFICommon.gw_window_ystop]
108108
gw_window_xsize:
109109
title: Guide Window Size in the X Direction (pixels)
110110
description: |
@@ -117,7 +117,7 @@ properties:
117117
origin: Science Data Formatting
118118
archive_catalog:
119119
datatype: int
120-
destination: [WFIExposure.gw_window_xsize, WFICommon.gw_window_xsize]
120+
destination: [WFICommon.gw_window_xsize]
121121
gw_window_ysize:
122122
title: Guide Window Size in the Y Direction (pixels)
123123
description: |
@@ -130,7 +130,7 @@ properties:
130130
origin: Science Data Formatting
131131
archive_catalog:
132132
datatype: int
133-
destination: [WFIExposure.gw_window_ysize, WFICommon.gw_window_ysize]
133+
destination: [WFICommon.gw_window_ysize]
134134

135135
propertyOrder: [gw_id, gw_fgs_mode,
136136
data_start, data_end, gw_window_xstart,

0 commit comments

Comments
 (0)