From 0173ec30e942929f591cc60e66821ff1427360d0 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Mon, 11 Nov 2024 15:49:17 -0500 Subject: [PATCH] Fix schemas that violate the new test --- src/rad/resources/schemas/fps/ref_file-1.0.0.yaml | 2 ++ src/rad/resources/schemas/ref_file-1.0.0.yaml | 1 + src/rad/resources/schemas/tvac/groundtest-1.0.0.yaml | 12 +++++++++++- src/rad/resources/schemas/tvac/ref_file-1.0.0.yaml | 2 ++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/rad/resources/schemas/fps/ref_file-1.0.0.yaml b/src/rad/resources/schemas/fps/ref_file-1.0.0.yaml index 31e25f4d..2d7c61e6 100644 --- a/src/rad/resources/schemas/fps/ref_file-1.0.0.yaml +++ b/src/rad/resources/schemas/fps/ref_file-1.0.0.yaml @@ -37,6 +37,7 @@ properties: archive_catalog: datatype: nvarchar(120) destination: [WFICommon.crds_context_used] + required: [sw_version, context_used] dark: title: Dark Reference File Information description: | @@ -122,5 +123,6 @@ properties: archive_catalog: datatype: nvarchar(120) destination: [WFICommon.r_saturation] +required: [crds, dark, distortion, mask, flat, gain, readnoise, linearity, photom, area, saturation] flowStyle: block ... diff --git a/src/rad/resources/schemas/ref_file-1.0.0.yaml b/src/rad/resources/schemas/ref_file-1.0.0.yaml index f5adb2bb..a7b84a16 100644 --- a/src/rad/resources/schemas/ref_file-1.0.0.yaml +++ b/src/rad/resources/schemas/ref_file-1.0.0.yaml @@ -171,5 +171,6 @@ properties: archive_catalog: datatype: nvarchar(120) destination: [ScienceRefData.r_refpix, GuideWindow.r_refpix, WFICommon.r_refpix] +required: [crds, dark, distortion, mask, flat, gain, readnoise, linearity, inverse_linearity, photom, area, saturation, refpix] flowStyle: block ... diff --git a/src/rad/resources/schemas/tvac/groundtest-1.0.0.yaml b/src/rad/resources/schemas/tvac/groundtest-1.0.0.yaml index 6f4dbb46..f7dfb0c9 100644 --- a/src/rad/resources/schemas/tvac/groundtest-1.0.0.yaml +++ b/src/rad/resources/schemas/tvac/groundtest-1.0.0.yaml @@ -470,5 +470,15 @@ required: [test_name, test_phase, test_environment, test_script, product_date, product_version, conversion_date, conversion_version, filename_pnt5, filepath_level_pnt5, filename_l1a, detector_id, detector_temp, frames_temp, ota_temp, rcs_on, readout_col_num, - detector_pixel_size, sensor_error] + detector_pixel_size, sensor_error, activity_number, srcs_pd_voltage, + srcs_led_flux, wfi_mce_srcs_bank1_led_i, wfi_mce_srcs_bank1_led_range, + wfi_mce_srcs_bank2_led_i, wfi_mce_srcs_bank2_led_range, srcs_led_current, + wfi_opt_targettype, analysis_tag, gsorc_pose_mode, gsorc_pose_target, + gsorc_sds_active_atten, gsorc_sds_lltfir_wave, gsorc_sds_sorc_on, + gsorc_sds_sorc_wlen, gsorc_sds_active_source, gsorc_sds_dq_pulse, + gsorc_sds_daq_pw, gsorc_heater1_setpt, wfi_otp_wfi_ewa, sca_temp, + mpa_temp, ewa_temp, ewta_outer_heater_temp, ewta_inner_heater_temp, + coba_temp_near_ewta, scea_temp, wfi_sce_1_vbiasgate_v, wfi_sce_1_vbiaspwr_i, + wfi_sce_1_vbiaspwr_v, wfi_sce_1_vreset_v, wfi_sce_1_vreset_i, + wfi_mcu_a_offs_csense_fpssen] ... diff --git a/src/rad/resources/schemas/tvac/ref_file-1.0.0.yaml b/src/rad/resources/schemas/tvac/ref_file-1.0.0.yaml index 42df1ee4..fa6a7958 100644 --- a/src/rad/resources/schemas/tvac/ref_file-1.0.0.yaml +++ b/src/rad/resources/schemas/tvac/ref_file-1.0.0.yaml @@ -37,6 +37,7 @@ properties: archive_catalog: datatype: nvarchar(120) destination: [WFICommon.crds_context_used] + required: [sw_version, context_used] dark: title: Dark Reference File Information description: | @@ -122,5 +123,6 @@ properties: archive_catalog: datatype: nvarchar(120) destination: [WFICommon.r_saturation] +required: [crds, dark, distortion, mask, flat, gain, readnoise, linearity, photom, area, saturation] flowStyle: block ...