dkist-processing-visp 4.0.0__py3-none-any.whl → 5.0.0__py3-none-any.whl

dkist_processing_visp/tasks/visp_base.py

@@ -45,4 +45,5 @@ class VispTaskBase(WorkflowTaskBase, ABC):
             scratch=self.scratch,
             obs_ip_start_time=self.constants.obs_ip_start_time,
             wavelength=self.constants.wavelength,
+            arm_id=self.constants.arm_id,
         )

dkist_processing_visp/tests/conftest.py

@@ -1,8 +1,10 @@
 import json
 from dataclasses import asdict
 from dataclasses import dataclass
+from dataclasses import field
 from dataclasses import is_dataclass
 from random import randint
+from typing import Any
 from typing import Callable
 from typing import Type
 
@@ -17,6 +19,8 @@ from dkist_processing_common.codecs.fits import fits_array_encoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
 from dkist_processing_common.models.input_dataset import InputDatasetPartDocumentList
 from dkist_processing_common.tasks import WorkflowTaskBase
+
+# Don't remove this; tests will break
 from dkist_processing_common.tests.mock_metadata_store import fake_gql_client
 
 from dkist_processing_visp.models.constants import VispConstants
@@ -41,6 +45,7 @@ def init_visp_constants_db():
 
 @dataclass
 class VispConstantsDb:
+    ARM_ID: int = 1
     POLARIMETER_MODE: str = "observe_polarimetric"
     OBS_IP_START_TIME: str = "2022-11-28T13:54:00"
     NUM_MODSTATES: int = 10
@@ -66,6 +71,10 @@ class VispConstantsDb:
     OBSERVE_READOUT_EXP_TIMES: tuple[float] = (0.02,)
     POLCAL_READOUT_EXP_TIMES: tuple[float] = (0.02,)
     SPECTRAL_LINE: str = "VISP Ca II H"
+    INCIDENT_LIGHT_ANGLE_DEG: float = 73.22
+    REFLECTED_LIGHT_ANGLE_DEG: float = 64.92
+    GRATING_CONSTANT_INVERSE_MM: float = 316.0
+    SOLAR_GAIN_IP_START_TIME: str = "2025-09-24T20:00:00"
     STOKES_PARAMS: tuple[str] = (
         "I",
         "Q",
@@ -128,19 +137,59 @@ class VispInputDatasetParameterValues:
     visp_geo_upsample_factor: float = 10.0
     visp_geo_max_shift: float = 40.0
     visp_geo_poly_fit_order: int = 3
-    visp_solar_spectral_avg_window: WavelengthParameter = WavelengthParameter(
-        values=(800, 800, 800, 800)
+    visp_geo_zone_prominence: WavelengthParameter = WavelengthParameter(values=(0.2, 0.2, 0.3, 0.2))
+    visp_geo_zone_width: WavelengthParameter = WavelengthParameter(values=(7, 2, 3, 2))
+    visp_geo_zone_bg_order: WavelengthParameter = WavelengthParameter(values=(21, 22, 11, 22))
+    visp_geo_zone_normalization_percentile: WavelengthParameter = WavelengthParameter(
+        values=(90, 99, 90, 90)
+    )
+    visp_geo_zone_rel_height: float = 0.97
+    visp_solar_spatial_median_filter_width_px: WavelengthParameter = WavelengthParameter(
+        values=(250, 250, 250, 250)
     )
     visp_solar_characteristic_spatial_normalization_percentile: float = 90.0
-    visp_solar_zone_prominence: WavelengthParameter = WavelengthParameter(
-        values=(0.2, 0.2, 0.3, 0.2)
+    visp_solar_vignette_initial_continuum_poly_fit_order: int = 6
+    visp_solar_vignette_crval_bounds_px: float = 7
+    visp_solar_vignette_dispersion_bounds_fraction: float = 0.02
+    visp_solar_vignette_wavecal_fit_kwargs: dict[str, Any] = field(
+        default_factory=lambda: {
+            "method": "differential_evolution",
+            "init": "halton",
+            "popsize": 1,
+            "tol": 1e-10,
+        }
     )
-    visp_solar_zone_width: WavelengthParameter = WavelengthParameter(values=(7, 2, 3, 2))
-    visp_solar_zone_bg_order: WavelengthParameter = WavelengthParameter(values=(21, 22, 11, 22))
-    visp_solar_zone_normalization_percentile: WavelengthParameter = WavelengthParameter(
-        values=(90, 99, 90, 90)
+    visp_solar_vignette_spectral_poly_fit_order: int = 12
+    visp_solar_vignette_min_samples: float = 0.9
+    visp_wavecal_camera_lens_parameters_1: tuple[float, float, float] = (
+        0.7613,
+        1.720e-4,
+        -8.139e-8,
+    )
+    visp_wavecal_camera_lens_parameters_2: tuple[float, float, float] = (
+        0.9512,
+        2.141e-4,
+        -1.014e-7,
     )
-    visp_solar_zone_rel_height: float = 0.97
+    visp_wavecal_camera_lens_parameters_3: tuple[float, float, float] = (
+        0.1153e1,
+        2.595e-4,
+        -1.230e-7,
+    )
+    visp_wavecal_pixel_pitch_micron_per_pix: float = 6.5
+    visp_wavecal_atlas_download_config: dict[str, str] = field(
+        default_factory=lambda: {
+            "base_url": "doi:10.5281/zenodo.14646787/",
+            "telluric_reference_atlas_file_name": "telluric_reference_atlas.npy",
+            "telluric_reference_atlas_hash_id": "md5:8db5e12508b293bca3495d81a0747447",
+            "solar_reference_atlas_file_name": "solar_reference_atlas.npy",
+            "solar_reference_atlas_hash_id": "md5:84ab4c50689ef235fe5ed4f7ee905ca0",
+        }
+    )
+    visp_wavecal_init_crval_guess_normalization_percentile: float = 95
+    visp_wavecal_init_resolving_power: int = 150000
+    visp_wavecal_init_straylight_fraction: float = 0.2
+    visp_wavecal_init_opacity_factor: float = 5.0
     visp_polcal_spatial_median_filter_width_px: int = 10
     visp_polcal_num_spatial_bins: int = 10
     visp_polcal_demod_spatial_smooth_fit_order: int = 17
@@ -160,6 +209,32 @@ def testing_obs_ip_start_time() -> str:
     return "1946-11-20T12:34:56"
 
 
+@pytest.fixture(scope="session")
+def testing_grating_constant() -> float:
+    # Just make it different than the defaults in header_models.py
+    return 317.2
+
+
+@pytest.fixture(scope="session")
+def testing_grating_angle() -> float:
+    return -43.2
+
+
+@pytest.fixture(scope="session")
+def testing_arm_position() -> float:
+    return -5.3
+
+
+@pytest.fixture(scope="session")
+def testing_solar_ip_start_time() -> str:
+    return "1946-11-21T12:34:56"
+
+
+@pytest.fixture(scope="session")
+def testing_arm_id() -> int:
+    return 2
+
+
 @pytest.fixture(scope="session")
 def input_dataset_document_simple_parameters_part():
     """Convert a dataclass of parameterValues into an actual input dataset parameters part."""
@@ -186,13 +261,17 @@ def input_dataset_document_simple_parameters_part():
 
 @pytest.fixture(scope="session")
 def assign_input_dataset_doc_to_task(
-    input_dataset_document_simple_parameters_part, testing_obs_ip_start_time, testing_wavelength
+    input_dataset_document_simple_parameters_part,
+    testing_obs_ip_start_time,
+    testing_wavelength,
+    testing_arm_id,
 ):
     def update_task(
         task: WorkflowTaskBase,
         parameter_values,
         parameter_class=VispParameters,
         obs_ip_start_time=testing_obs_ip_start_time,
+        arm_id=testing_arm_id,
     ):
         task.write(
             data=InputDatasetPartDocumentList(
@@ -205,6 +284,7 @@ def assign_input_dataset_doc_to_task(
             scratch=task.scratch,
             obs_ip_start_time=obs_ip_start_time,
             wavelength=testing_wavelength,
+            arm_id=str(arm_id),
         )
 
     return update_task
@@ -343,28 +423,14 @@ def write_intermediate_background_to_task(
         )
 
 
-def write_intermediate_lamp_to_task(
-    task, *, lamp_signal: float, beam: int, modstate: int, data_shape: tuple[int, int]
-):
-    lamp_array = np.ones(data_shape) * lamp_signal
-    task.write(
-        data=lamp_array,
-        tags=[
-            VispTag.intermediate_frame(beam=beam, modstate=modstate),
-            VispTag.task_lamp_gain(),
-        ],
-        encoder=fits_array_encoder,
-    )
-
-
 def write_intermediate_solar_to_task(
-    task, *, solar_signal: float, beam: int, modstate: int, data_shape: tuple[int, int]
+    task, *, solar_signal: float, beam: int, data_shape: tuple[int, int]
 ):
     solar_array = np.ones(data_shape) * solar_signal
     task.write(
         data=solar_array,
         tags=[
-            VispTag.intermediate_frame(beam=beam, modstate=modstate),
+            VispTag.intermediate_frame(beam=beam),
             VispTag.task_solar_gain(),
         ],
         encoder=fits_array_encoder,
@@ -414,19 +480,16 @@ def write_intermediate_geometric_to_task(
 def write_dummy_intermediate_solar_cals_to_task(
     task,
     *,
-    num_modstates: int,
     data_shape: tuple[int, int],
 ):
     solar_signal = 1.0
     for beam in [1, 2]:
-        for modstate in range(1, num_modstates + 1):
-            write_intermediate_solar_to_task(
-                task=task,
-                solar_signal=solar_signal,
-                beam=beam,
-                modstate=modstate,
-                data_shape=data_shape,
-            )
+        write_intermediate_solar_to_task(
+            task=task,
+            solar_signal=solar_signal,
+            beam=beam,
+            data_shape=data_shape,
+        )
 
 
 def write_intermediate_polcal_darks_to_task(

dkist_processing_visp/tests/header_models.py

@@ -31,6 +31,12 @@ class VispHeaders(Spec122Dataset):
         num_modstates_header_value: int = 2,
         instrument: str = "visp",
         polarimeter_mode: str = "observe_polarimetric",
+        arm_id: int = 1,
+        ip_start_time: str = "2022-11-28T13:00:00",
+        ip_end_time: str = "2022-11-28T13:00:00",
+        grating_constant: float = 316.0,
+        grating_angle: float = -69.9,
+        arm_position: float = -4.0,
         **kwargs,
     ):
         super().__init__(
@@ -40,13 +46,21 @@ class VispHeaders(Spec122Dataset):
             instrument=instrument,
             **kwargs,
         )
+        self.add_constant_key("VISP_001", arm_id)
         self.add_constant_key("WAVELNTH", 656.30)
         self.add_constant_key("VISP_010", num_modstates_header_value)
         self.add_constant_key("ID___013", "TEST_PROPOSAL_ID")
         self.add_constant_key("VISP_006", polarimeter_mode)
         self.add_constant_key("PAC__005", "0")
         self.add_constant_key("PAC__007", "10")
+        self.add_constant_key("DKIST011", ip_start_time)
+        self.add_constant_key("DKIST012", ip_end_time)
         self.add_constant_key("FILE_ID", uuid.uuid4().hex)
+
+        self.add_constant_key("VISP_002", arm_position)
+        self.add_constant_key("VISP_013", grating_constant)
+        self.add_constant_key("VISP_015", grating_angle)
+
         self.num_modstates_header_value = num_modstates_header_value
         self.add_constant_key("CAM__001", "camera_id")
         self.add_constant_key("CAM__002", "camera_name")
@@ -83,6 +97,8 @@ class VispHeadersInputDarkFrames(VispHeaders):
         num_modstates: int,
         exp_time: float = 1.0,
         readout_exp_time: float = 2.0,
+        ip_start_time="2022-11-28T13:44:00",
+        ip_end_time="2022-11-28T13:45:00",
         **kwargs,
     ):
         ################################################
@@ -95,13 +111,13 @@ class VispHeadersInputDarkFrames(VispHeaders):
             array_shape,
             time_delta,
             num_modstates_header_value=num_modstates,
+            ip_start_time=ip_start_time,
+            ip_end_time=ip_end_time,
             **kwargs,
         )
         self.add_constant_key("DKIST004", TaskName.dark.value.lower())
         self.add_constant_key("DKIST008", 1)
         self.add_constant_key("DKIST009", 1)
-        self.add_constant_key("DKIST011", "2022-11-28T13:44:00")
-        self.add_constant_key("DKIST012", "2022-11-28T13:45:00")
         self.add_constant_key("VISP_019", 1)  # Num raster steps
         self.add_constant_key("VISP_020", 1)  # Current raster step
         self.add_constant_key("ID___004")
@@ -131,6 +147,8 @@ class VispHeadersInputLampGainFrames(VispHeaders):
         num_modstates: int,
         exp_time: float = 10.0,
         readout_exp_time: float = 20.0,
+        ip_start_time="2022-11-28T13:46:00",
+        ip_end_time="2022-11-28T13:47:00",
         **kwargs,
     ):
         ################################################
@@ -143,14 +161,14 @@ class VispHeadersInputLampGainFrames(VispHeaders):
             array_shape,
             time_delta,
             num_modstates_header_value=num_modstates,
+            ip_start_time=ip_start_time,
+            ip_end_time=ip_end_time,
             **kwargs,
         )
         self.add_constant_key("DKIST004", TaskName.gain.value.lower())
         self.add_constant_key("PAC__002", "lamp")
         self.add_constant_key("DKIST008", 1)
         self.add_constant_key("DKIST009", 1)
-        self.add_constant_key("DKIST011", "2022-11-28T13:46:00")
-        self.add_constant_key("DKIST012", "2022-11-28T13:47:00")
         self.add_constant_key("VISP_019", 1)
         self.add_constant_key("VISP_020", 1)
         self.add_constant_key("PAC__003", "on")
@@ -172,6 +190,8 @@ class VispHeadersInputSolarGainFrames(VispHeaders):
         num_modstates: int,
         exp_time: float = 20.0,
         readout_exp_time: float = 40.0,
+        ip_start_time="2022-11-28T13:48:00",
+        ip_end_time="2022-11-28T13:49:00",
         **kwargs,
     ):
         ################################################
@@ -184,13 +204,13 @@ class VispHeadersInputSolarGainFrames(VispHeaders):
             array_shape,
             time_delta,
             num_modstates_header_value=num_modstates,
+            ip_start_time=ip_start_time,
+            ip_end_time=ip_end_time,
             **kwargs,
         )
         self.add_constant_key("DKIST004", TaskName.gain.value.lower())
         self.add_constant_key("DKIST008", 1)
         self.add_constant_key("DKIST009", 1)
-        self.add_constant_key("DKIST011", "2022-11-28T13:48:00")
-        self.add_constant_key("DKIST012", "2022-11-28T13:49:00")
         self.add_constant_key("VISP_019", 1)
         self.add_constant_key("VISP_020", 1)
         self.add_constant_key("PAC__002", "clear")
@@ -218,6 +238,8 @@ class VispHeadersInputPolcalFrames(VispHeaders):
         num_cs_steps: int = 1,
         exp_time: float = 0.01,
         readout_exp_time: float = 0.02,
+        ip_start_time="2022-11-28T13:50:00",
+        ip_end_time="2022-11-28T13:51:00",
         **kwargs,
     ):
         ################################################
@@ -230,6 +252,8 @@ class VispHeadersInputPolcalFrames(VispHeaders):
             array_shape,
             time_delta,
             num_modstates_header_value=num_modstates,
+            ip_start_time=ip_start_time,
+            ip_end_time=ip_end_time,
             **kwargs,
         )
         self.index_to_modstate = list(range(1, num_modstates + 1)) * num_cs_steps
@@ -240,8 +264,6 @@ class VispHeadersInputPolcalFrames(VispHeaders):
         self.add_constant_key("DKIST004", TaskName.polcal.value.lower())
         self.add_constant_key("DKIST008", 1)
         self.add_constant_key("DKIST009", 1)
-        self.add_constant_key("DKIST011", "2022-11-28T13:50:00")
-        self.add_constant_key("DKIST012", "2022-11-28T13:51:00")
         self.add_constant_key("VISP_019", 1)
         self.add_constant_key("VISP_020", 1)
         self.add_constant_key("TELSCAN", "Raster")
@@ -290,16 +312,23 @@ class VispHeadersInputPolcalDarkFrames(VispHeaders):
         num_modstates: int,
         exp_time: float = 0.01,
         readout_exp_time: float = 0.02,
+        ip_start_time="2022-11-28T13:50:00",
+        ip_end_time="2022-11-28T13:51:00",
         **kwargs,
     ):
         num_frames = num_modstates
         dataset_shape = (num_frames, *array_shape[-2:])
-        super().__init__(dataset_shape, array_shape, time_delta, **kwargs)
+        super().__init__(
+            dataset_shape,
+            array_shape,
+            time_delta,
+            ip_start_time=ip_start_time,
+            ip_end_time=ip_end_time,
+            **kwargs,
+        )
         self.add_constant_key("DKIST004", TaskName.polcal.value.lower())
         self.add_constant_key("DKIST008", 1)
         self.add_constant_key("DKIST009", 1)
-        self.add_constant_key("DKIST011", "2022-11-28T13:50:00")
-        self.add_constant_key("DKIST012", "2022-11-28T13:51:00")
         self.add_constant_key("VISP_019", 1)
         self.add_constant_key("VISP_020", 1)
         self.add_constant_key("TELSCAN", "Raster")
@@ -322,16 +351,23 @@ class VispHeadersInputPolcalGainFrames(VispHeaders):
         num_modstates: int,
         exp_time: float = 0.01,
         readout_exp_time: float = 0.02,
+        ip_start_time="2022-11-28T13:50:00",
+        ip_end_time="2022-11-28T13:51:00",
         **kwargs,
     ):
         num_frames = num_modstates
         dataset_shape = (num_frames, *array_shape[-2:])
-        super().__init__(dataset_shape, array_shape, time_delta, **kwargs)
+        super().__init__(
+            dataset_shape,
+            array_shape,
+            time_delta,
+            ip_start_time=ip_start_time,
+            ip_end_time=ip_end_time,
+            **kwargs,
+        )
         self.add_constant_key("DKIST004", TaskName.polcal.value.lower())
         self.add_constant_key("DKIST008", 1)
         self.add_constant_key("DKIST009", 1)
-        self.add_constant_key("DKIST011", "2022-11-28T13:50:00")
-        self.add_constant_key("DKIST012", "2022-11-28T13:51:00")
         self.add_constant_key("VISP_019", 1)
         self.add_constant_key("VISP_020", 1)
         self.add_constant_key("TELSCAN", "Raster")
@@ -357,6 +393,9 @@ class VispHeadersValidObserveFrames(VispHeaders):
         exp_time: float = 15.0,
         readout_exp_time: float = 30.0,
         abort_last_step: bool = False,
+        ip_start_time="2022-11-28T13:55:00",
+        ip_end_time="2022-11-28T13:56:00",
+        grating_constant=316,
         **kwargs,
     ):
         ################################################
@@ -370,7 +409,15 @@ class VispHeadersValidObserveFrames(VispHeaders):
             num_frames -= num_dropped_frames
 
         dataset_shape = (num_frames, *array_shape[-2:])
-        super().__init__(dataset_shape, array_shape, time_delta, **kwargs)
+        super().__init__(
+            dataset_shape,
+            array_shape,
+            time_delta,
+            ip_start_time=ip_start_time,
+            ip_end_time=ip_end_time,
+            grating_constant=grating_constant,
+            **kwargs,
+        )
 
         self.index_to_map = sum(
             [[map_num + 1] * num_modstates * num_raster_steps for map_num in range(num_maps)], []
@@ -391,8 +438,6 @@ class VispHeadersValidObserveFrames(VispHeaders):
 
         self.num_raster_steps = num_raster_steps
         self.add_constant_key("DKIST004", TaskName.observe.value.lower())
-        self.add_constant_key("DKIST011", "2022-11-28T13:55:00")  # IP start time
-        self.add_constant_key("DKIST012", "2022-11-28T13:56:00")  # IP end time
         self.add_constant_key("ID___004")
         self.add_constant_key("WAVELNTH", 656.28)
         self.add_constant_key("EXPER_ID", "EXPERIMENT ID")
@@ -439,6 +484,8 @@ class VispHeadersValidCalibratedFrames(VispHeaders):
         exp_time: float = 15.0,
         readout_exp_time: float = 30.0,
         wcs_axis_names: tuple[str, str] | None = None,
+        ip_start_time="2022-11-28T13:55:00",
+        ip_end_time="2022-11-28T13:56:00",
         **kwargs,
     ):
         ################################################
@@ -452,7 +499,13 @@ class VispHeadersValidCalibratedFrames(VispHeaders):
         num_frames = num_maps * num_raster_steps * num_stokes
         dataset_shape = (num_frames, *array_shape[-2:])
         super().__init__(
-            dataset_shape, array_shape, time_delta, polarimeter_mode=polarimeter_mode, **kwargs
+            dataset_shape,
+            array_shape,
+            time_delta,
+            polarimeter_mode=polarimeter_mode,
+            ip_start_time=ip_start_time,
+            ip_end_time=ip_end_time,
+            **kwargs,
         )
 
         stokes_list = ["I", "Q", "U", "V"][:num_stokes]
@@ -466,8 +519,6 @@ class VispHeadersValidCalibratedFrames(VispHeaders):
 
         self.num_raster_steps = num_raster_steps
         self.add_constant_key("DKIST004", TaskName.observe.value.lower())
-        self.add_constant_key("DKIST011", "2022-11-28T13:55:00")  # IP start time
-        self.add_constant_key("DKIST012", "2022-11-28T13:56:00")  # IP end time
         self.add_constant_key("ID___004")
         self.add_constant_key("WAVELNTH", 656.28)
         self.add_constant_key("EXPER_ID", "EXPERIMENT ID")

dkist_processing_visp/tests/local_trial_workflows/local_trial_helpers.py

@@ -10,6 +10,7 @@ from dkist_header_validator import spec214_validator
 from dkist_processing_common.codecs.fits import fits_array_decoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
 from dkist_processing_common.models.constants import BudName
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.parsers.cs_step import CSStepFlower
 from dkist_processing_common.parsers.cs_step import NumCSStepBud
@@ -21,6 +22,8 @@ from dkist_processing_common.parsers.time import ExposureTimeFlower
 from dkist_processing_common.parsers.time import ReadoutExpTimeFlower
 from dkist_processing_common.parsers.time import TaskExposureTimesBud
 from dkist_processing_common.parsers.time import TaskReadoutExpTimesBud
+from dkist_processing_common.parsers.unique_bud import TaskUniqueBud
+from dkist_processing_common.parsers.unique_bud import UniqueBud
 from dkist_processing_common.tasks import ParseL0InputDataBase
 from dkist_processing_common.tasks import WorkflowTaskBase
 from dkist_processing_common.tasks.mixin.globus import GlobusTransferItem
@@ -31,10 +34,13 @@ from loguru import logger
 from dkist_processing_visp.models.constants import VispBudName
 from dkist_processing_visp.models.constants import VispConstants
 from dkist_processing_visp.models.fits_access import VispMetadataKey
+from dkist_processing_visp.models.metric_code import VispMetricCode
 from dkist_processing_visp.models.parameters import VispParsingParameters
 from dkist_processing_visp.models.tags import VispTag
 from dkist_processing_visp.models.task_name import VispTaskName
 from dkist_processing_visp.parsers.modulator_states import ModulatorStateFlower
+from dkist_processing_visp.parsers.spectrograph_configuration import IncidentLightAngleBud
+from dkist_processing_visp.parsers.spectrograph_configuration import ReflectedLightAngleBud
 from dkist_processing_visp.parsers.time import DarkReadoutExpTimePickyBud
 from dkist_processing_visp.parsers.time import NonDarkNonPolcalTaskReadoutExpTimesBud
 from dkist_processing_visp.parsers.visp_l0_fits_access import VispL0FitsAccess
@@ -264,7 +270,9 @@ class SaveSolarCal(SaveTaskTags):
     @property
     def tag_lists_to_save(self) -> list[list[str]]:
         return super().tag_lists_to_save + [
-            [VispTag.quality("TASK_TYPES"), VispTag.workflow_task("SolarCalibration")]
+            [VispTag.quality("TASK_TYPES"), VispTag.workflow_task("SolarCalibration")],
+            [VispTag.quality(VispMetricCode.solar_first_vignette)],
+            [VispTag.quality(VispMetricCode.solar_final_vignette)],
         ]
 
     @property
@@ -416,11 +424,27 @@ class ParseCalOnlyL0InputData(ParseL0InputDataBase):
     @property
     def constant_buds(self):
         """Add ViSP specific constants to common constants."""
+        # TODO: Subclass ViSP parse task and *remove* unneeded things from this list
         return super().constant_buds + [
+            UniqueBud(constant_name=VispBudName.arm_id.value, metadata_key=VispMetadataKey.arm_id),
             NumCSStepBud(self.parameters.max_cs_step_time_sec),
             NonDarkNonPolcalTaskReadoutExpTimesBud(),
             DarkReadoutExpTimePickyBud(),
             RetarderNameBud(),
+            IncidentLightAngleBud(),
+            ReflectedLightAngleBud(),
+            TaskUniqueBud(
+                constant_name=VispBudName.grating_constant_inverse_mm.value,
+                metadata_key=VispMetadataKey.grating_constant_inverse_mm,
+                ip_task_types=[TaskName.observe.value, TaskName.solar_gain.value],
+                task_type_parsing_function=parse_header_ip_task_with_gains,
+            ),
+            TaskUniqueBud(
+                constant_name=VispBudName.solar_gain_ip_start_time.value,
+                metadata_key=MetadataKey.ip_start_time,
+                ip_task_types=TaskName.solar_gain,
+                task_type_parsing_function=parse_header_ip_task_with_gains,
+            ),
             TaskExposureTimesBud(
                 stem_name=VispBudName.lamp_exposure_times.value,
                 ip_task_types=TaskName.lamp_gain.value,

dkist_processing_visp/tests/test_assemble_quality.py

@@ -1,27 +1,65 @@
+from typing import Generator
 from unittest.mock import MagicMock
 
+import numpy as np
 import pytest
+from dkist_processing_common._util.scratch import WorkflowFileSystem
+from dkist_processing_common.codecs.asdf import asdf_encoder
+from dkist_processing_common.codecs.quality import quality_data_decoder
 
+from dkist_processing_visp.models.metric_code import VispMetricCode
+from dkist_processing_visp.models.tags import VispTag
 from dkist_processing_visp.tasks.l1_output_data import VispAssembleQualityData
 
 
 @pytest.fixture
-def visp_assemble_quality_data_task(tmp_path, recipe_run_id) -> VispAssembleQualityData:
+def visp_assemble_quality_data_task(
+    tmp_path, recipe_run_id
+) -> Generator[VispAssembleQualityData, None, None]:
 
     with VispAssembleQualityData(
         recipe_run_id=recipe_run_id, workflow_name="visp_assemble_quality", workflow_version="VX.Y"
     ) as task:
+        task.scratch = WorkflowFileSystem(scratch_base_path=tmp_path, recipe_run_id=recipe_run_id)
         yield task
         task._purge()
 
 
+def write_raw_vignette_metrics_to_task(task):
+    for beam in [1, 2]:
+        dummy_vec = np.arange(10)
+        first_vignette_quality_outputs = {
+            "output_wave_vec": dummy_vec,
+            "input_spectrum": dummy_vec,
+            "best_fit_atlas": dummy_vec,
+            "best_fit_continuum": dummy_vec,
+            "residuals": dummy_vec,
+        }
+        task.write(
+            data=first_vignette_quality_outputs,
+            tags=[VispTag.quality(VispMetricCode.solar_first_vignette), VispTag.beam(beam)],
+            encoder=asdf_encoder,
+        )
+        final_correction_quality_outputs = {
+            "output_wave_vec": dummy_vec,
+            "median_spec": dummy_vec,
+            "low_deviation": dummy_vec,
+            "high_deviation": dummy_vec,
+        }
+        task.write(
+            data=final_correction_quality_outputs,
+            tags=[VispTag.quality(VispMetricCode.solar_final_vignette), VispTag.beam(beam)],
+            encoder=asdf_encoder,
+        )
+
+
 @pytest.fixture
 def dummy_quality_data() -> list[dict]:
     return [{"dummy_key": "dummy_value"}]
 
 
 @pytest.fixture
-def quality_assemble_data_mock(mocker, dummy_quality_data) -> MagicMock:
+def common_quality_assemble_data_mock(mocker, dummy_quality_data) -> MagicMock:
     yield mocker.patch(
         "dkist_processing_common.tasks.mixin.quality.QualityMixin.quality_assemble_data",
         return_value=dummy_quality_data,
@@ -29,13 +67,60 @@ def quality_assemble_data_mock(mocker, dummy_quality_data) -> MagicMock:
     )
 
 
-def test_correct_polcal_label_list(visp_assemble_quality_data_task, quality_assemble_data_mock):
+def test_vignette_metrics_built(visp_assemble_quality_data_task):
+    """
+    Given: A `VispAssembleQualityData` task with raw vignette metrics in scratch
+    When: Building the quality report data
+    Then: The vignette metrics are included in the data
+    """
+    task = visp_assemble_quality_data_task
+    write_raw_vignette_metrics_to_task(task)
+
+    task()
+
+    final_report_list = list(task.read(tags=VispTag.quality_data(), decoder=quality_data_decoder))
+    assert len(final_report_list) == 1
+    final_report = final_report_list[0]
+
+    initial_vignette_metrics = list(
+        filter(lambda i: i["name"].startswith("Initial Vignette Estimation"), final_report)
+    )
+    assert len(initial_vignette_metrics) == 2
+    facet_set = set()
+    for m in initial_vignette_metrics:
+        assert m["metric_code"] == VispMetricCode.solar_first_vignette.value
+        assert m["description"]
+        assert m["multi_plot_data"]
+        facet_set.add(m["facet"])
+
+    assert facet_set == {"BEAM_1", "BEAM_2"}
+
+    final_vignette_metrics = list(
+        filter(lambda i: i["name"].startswith("Final Vignette Estimation"), final_report)
+    )
+    assert len(final_vignette_metrics) == 2
+    facet_set = set()
+    for m in final_vignette_metrics:
+        assert m["metric_code"] == VispMetricCode.solar_final_vignette.value
+        assert m["description"]
+        assert m["multi_plot_data"]
+        facet_set.add(m["facet"])
+
+    assert facet_set == {"BEAM_1", "BEAM_2"}
+
+
+def test_correct_polcal_label_list(
+    visp_assemble_quality_data_task, common_quality_assemble_data_mock
+):
     """
     Given: A VispAssembleQualityData task
     When: Calling the task
     Then: The correct polcal_label_list property is passed to .quality_assemble_data
     """
     task = visp_assemble_quality_data_task
+    write_raw_vignette_metrics_to_task(task)
 
     task()
-    quality_assemble_data_mock.assert_called_once_with(task, polcal_label_list=["Beam 1", "Beam 2"])
+    common_quality_assemble_data_mock.assert_called_once_with(
+        task, polcal_label_list=["Beam 1", "Beam 2"]
+    )