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

dkist_processing_visp/models/constants.py

@@ -2,7 +2,6 @@
 
 from enum import Enum
 
-from dkist_processing_common.models.constants import BudName
 from dkist_processing_common.models.constants import ConstantsBase
 
 

dkist_processing_visp/models/fits_access.py

@@ -0,0 +1,16 @@
+"""ViSP control of FITS key names and values."""
+
+from enum import StrEnum
+
+
+class VispMetadataKey(StrEnum):
+    """Controlled list of names for FITS metadata header keys."""
+
+    raster_scan_step = "VSPSTP"
+    total_raster_steps = "VSPNSTP"
+    modulator_state = "VSPSTNUM"
+    number_of_modulator_states = "VSPNUMST"
+    polarimeter_mode = "VISP_006"
+    axis_1_type = "CTYPE1"
+    axis_2_type = "CTYPE2"
+    axis_3_type = "CTYPE3"

dkist_processing_visp/parsers/polarimeter_mode.py

@@ -4,6 +4,7 @@ from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.parsers.unique_bud import TaskUniqueBud
 
 from dkist_processing_visp.models.constants import VispBudName
+from dkist_processing_visp.models.fits_access import VispMetadataKey
 
 
 class PolarimeterModeBud(TaskUniqueBud):
@@ -12,6 +13,6 @@ class PolarimeterModeBud(TaskUniqueBud):
     def __init__(self):
         super().__init__(
             constant_name=VispBudName.polarimeter_mode.value,
-            metadata_key="polarimeter_mode",
+            metadata_key=VispMetadataKey.polarimeter_mode,
             ip_task_types=TaskName.observe.value,
         )

dkist_processing_visp/parsers/raster_step.py

@@ -10,6 +10,7 @@ from dkist_processing_common.parsers.single_value_single_key_flower import (
 )
 
 from dkist_processing_visp.models.constants import VispBudName
+from dkist_processing_visp.models.fits_access import VispMetadataKey
 from dkist_processing_visp.models.tags import VispStemName
 from dkist_processing_visp.parsers.visp_l0_fits_access import VispL0FitsAccess
 
@@ -69,7 +70,8 @@ class RasterScanStepFlower(SingleValueSingleKeyFlower):
 
     def __init__(self):
         super().__init__(
-            tag_stem_name=VispStemName.raster_step.value, metadata_key="raster_scan_step"
+            tag_stem_name=VispStemName.raster_step.value,
+            metadata_key=VispMetadataKey.raster_scan_step,
         )
 
     def setter(self, fits_obj: VispL0FitsAccess):

dkist_processing_visp/parsers/time.py

@@ -3,6 +3,7 @@
 from pathlib import Path
 from typing import NamedTuple
 
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.flower_pot import SpilledDirt
 from dkist_processing_common.models.flower_pot import Stem
 from dkist_processing_common.models.flower_pot import Thorn
@@ -18,7 +19,7 @@ class NonDarkNonPolcalTaskReadoutExpTimesBud(Stem):
 
     def __init__(self):
         super().__init__(stem_name=VispBudName.non_dark_task_readout_exp_times.value)
-        self.metadata_key = "sensor_readout_exposure_time_ms"
+        self.metadata_key = MetadataKey.sensor_readout_exposure_time_ms.name
 
     def setter(self, fits_obj: VispL0FitsAccess) -> float | SpilledDirt:
         """
@@ -73,7 +74,7 @@ class DarkReadoutExpTimePickyBud(Stem):
 
     def __init__(self):
         super().__init__(stem_name=VispBudName.dark_readout_exp_time_picky_bud.value)
-        self.metadata_key = "sensor_readout_exposure_time_ms"
+        self.metadata_key = MetadataKey.sensor_readout_exposure_time_ms.name
 
     def setter(self, fits_obj: VispL0FitsAccess) -> tuple:
         """

dkist_processing_visp/parsers/visp_l0_fits_access.py

@@ -3,6 +3,8 @@
 from astropy.io import fits
 from dkist_processing_common.parsers.l0_fits_access import L0FitsAccess
 
+from dkist_processing_visp.models.fits_access import VispMetadataKey
+
 
 class VispL0FitsAccess(L0FitsAccess):
     """
@@ -30,11 +32,13 @@ class VispL0FitsAccess(L0FitsAccess):
     ):
         super().__init__(hdu=hdu, name=name, auto_squeeze=auto_squeeze)
 
-        self.number_of_modulator_states: int = self.header["VSPNUMST"]
-        self.raster_scan_step: int = self.header["VSPSTP"]
-        self.total_raster_steps: int = self.header["VSPNSTP"]
-        self.modulator_state: int = self.header["VSPSTNUM"]
-        self.polarimeter_mode: str = self.header["VISP_006"]
-        self.axis_1_type: str = self.header["CTYPE1"]
-        self.axis_2_type: str = self.header["CTYPE2"]
-        self.axis_3_type: str = self.header["CTYPE3"]
+        self.number_of_modulator_states: int = self.header[
+            VispMetadataKey.number_of_modulator_states
+        ]
+        self.raster_scan_step: int = self.header[VispMetadataKey.raster_scan_step]
+        self.total_raster_steps: int = self.header[VispMetadataKey.total_raster_steps]
+        self.modulator_state: int = self.header[VispMetadataKey.modulator_state]
+        self.polarimeter_mode: str = self.header[VispMetadataKey.polarimeter_mode]
+        self.axis_1_type: str = self.header[VispMetadataKey.axis_1_type]
+        self.axis_2_type: str = self.header[VispMetadataKey.axis_2_type]
+        self.axis_3_type: str = self.header[VispMetadataKey.axis_3_type]

dkist_processing_visp/tasks/make_movie_frames.py

@@ -5,6 +5,7 @@ from astropy.io import fits
 from astropy.visualization import ZScaleInterval
 from dkist_processing_common.codecs.fits import fits_access_decoder
 from dkist_processing_common.codecs.fits import fits_array_encoder
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_service_configuration.logging import logger
 
 from dkist_processing_visp.models.tags import VispTag
@@ -78,7 +79,7 @@ class MakeVispMovieFrames(VispTaskBase):
                                     fits_access_class=VispL1FitsAccess,
                                 )
                             )
-                            data = calibrated_frame.data
+                            data = np.nan_to_num(calibrated_frame.data, nan=0)
                             if self.constants.num_raster_steps == 1:
                                 logger.info(
                                     "Only a single raster step found. Making a spectral movie."
@@ -121,16 +122,16 @@ class MakeVispMovieFrames(VispTaskBase):
                         f"There should only be one instrument value in the headers. "
                         f"Found {len(instrument_set)}: {instrument_set=}"
                     )
-                header["INSTRUME"] = instrument_set.pop()
+                header[MetadataKey.instrument] = instrument_set.pop()
                 # The timestamp of a movie frame will be the time of raster scan start
-                header["DATE-BEG"] = time_obs[0]
+                header[MetadataKey.time_obs] = time_obs[0]
                 # Make sure only one wavelength value was found
                 if len(wavelength_set) != 1:
                     raise ValueError(
                         f"There should only be one wavelength value in the headers. "
                         f"Found {len(wavelength_set)}: {wavelength_set=}"
                     )
-                header["LINEWAV"] = wavelength_set.pop()
+                header[MetadataKey.wavelength] = wavelength_set.pop()
                 # Write the movie frame file to disk and tag it, normalizing across stokes intensities
                 if is_polarized:
                     i_norm = ZScaleInterval()(stokes_i_data)

dkist_processing_visp/tasks/mixin/corrections.py

@@ -17,6 +17,9 @@ class CorrectionsMixin:
         arrays: Iterable[np.ndarray] | np.ndarray,
         shift: np.ndarray = np.zeros(2),
         angle: float = 0.0,
+        mode: str = "edge",
+        order: int = 5,
+        cval: float = np.nan,
     ) -> Generator[np.ndarray, None, None]:
         """
         Shift and then rotate data.
@@ -35,6 +38,24 @@ class CorrectionsMixin:
         angle : float
             The angle (in radians) between slit hairlines and pixel axes.
 
+        mode : {'constant', 'edge', 'symmetric', 'reflect', 'wrap'}
+            Points outside the boundaries of the input are filled according
+            to the given mode.  Modes match the behaviour of `numpy.pad`.
+
+        order : int
+            The order of interpolation. The order has to be in the range 0-5:
+             - 0: Nearest-neighbor
+             - 1: Bi-linear (default)
+             - 2: Bi-quadratic
+             - 3: Bi-cubic
+             - 4: Bi-quartic
+             - 5: Bi-quintic
+
+        cval : float
+            Used in conjunction with mode 'constant', the value outside
+            the image boundaries.
+
+
         Returns
         -------
         Generator
@@ -46,12 +67,21 @@ class CorrectionsMixin:
             array[np.where(array == np.inf)] = np.max(array[np.isfinite(array)])
             array[np.where(array == -np.inf)] = np.min(array[np.isfinite(array)])
             array[np.isnan(array)] = np.nanmedian(array)
-            translated = affine_transform_arrays(array, translation=-shift, mode="reflect", order=5)
-            yield next(rotate_arrays_about_point(translated, angle=-angle, mode="reflect", order=5))
+            translated = affine_transform_arrays(
+                array, translation=-shift, mode=mode, order=order, cval=cval
+            )
+            yield next(
+                rotate_arrays_about_point(
+                    translated, angle=-angle, mode=mode, order=order, cval=cval
+                )
+            )
 
     @staticmethod
     def corrections_remove_spec_geometry(
-        arrays: Iterable[np.ndarray] | np.ndarray, spec_shift: np.ndarray
+        arrays: Iterable[np.ndarray] | np.ndarray,
+        spec_shift: np.ndarray,
+        cval: float | None = None,
+        order: int = 3,
     ) -> Generator[np.ndarray, None, None]:
         """
         Remove spectral curvature.
@@ -67,6 +97,19 @@ class CorrectionsMixin:
             Array with shape (X), where X is the number of pixels in the spatial dimension.
             This dimension gives the spectral shift.
 
+        order : int
+            The order of interpolation. The order has to be in the range 0-5:
+             - 0: Nearest-neighbor
+             - 1: Bi-linear (default)
+             - 2: Bi-quadratic
+             - 3: Bi-cubic
+             - 4: Bi-quartic
+             - 5: Bi-quintic
+
+        cval : float
+            Used in conjunction with mode 'constant', the value outside
+            the image boundaries.
+
         Returns
         -------
         Generator
@@ -78,8 +121,14 @@ class CorrectionsMixin:
             numy = array.shape[1]
             array_output = np.zeros(array.shape)
             for j in range(numy):
+                if cval is None:
+                    cval = np.nanmedian(array[:, j])
                 array_output[:, j] = spnd.shift(
-                    array[:, j], -spec_shift[j], mode="constant", cval=np.nanmedian(array[:, j])
+                    array[:, j],
+                    -spec_shift[j],
+                    mode="constant",
+                    cval=cval,
+                    order=order,
                 )
             yield array_output
 

dkist_processing_visp/tasks/parse.py

@@ -20,6 +20,7 @@ from dkist_processing_common.parsers.wavelength import ObserveWavelengthBud
 from dkist_processing_common.tasks import ParseL0InputDataBase
 
 from dkist_processing_visp.models.constants import VispBudName
+from dkist_processing_visp.models.fits_access import VispMetadataKey
 from dkist_processing_visp.models.parameters import VispParsingParameters
 from dkist_processing_visp.parsers.map_repeats import MapScanFlower
 from dkist_processing_visp.parsers.map_repeats import NumMapScansBud
@@ -123,9 +124,18 @@ class ParseL0VispInputData(ParseL0InputDataBase):
                 ip_task_types=TaskName.polcal.value,
                 header_task_parsing_func=parse_header_ip_task_with_gains,
             ),
-            UniqueBud(constant_name=VispBudName.axis_1_type.value, metadata_key="axis_1_type"),
-            UniqueBud(constant_name=VispBudName.axis_2_type.value, metadata_key="axis_2_type"),
-            UniqueBud(constant_name=VispBudName.axis_3_type.value, metadata_key="axis_3_type"),
+            UniqueBud(
+                constant_name=VispBudName.axis_1_type.value,
+                metadata_key=VispMetadataKey.axis_1_type,
+            ),
+            UniqueBud(
+                constant_name=VispBudName.axis_2_type.value,
+                metadata_key=VispMetadataKey.axis_2_type,
+            ),
+            UniqueBud(
+                constant_name=VispBudName.axis_3_type.value,
+                metadata_key=VispMetadataKey.axis_3_type,
+            ),
         ]
 
     @property

dkist_processing_visp/tasks/quality_metrics.py

@@ -162,7 +162,7 @@ class VispL1QualityMetrics(VispTaskBase, QualityMixin):
                             continue
 
                         # compute sensitivity for this Stokes parameter
-                        data_list.append(np.std(stokes_frame.data) / stokesI_med)
+                        data_list.append(np.nanstd(stokes_frame.data) / stokesI_med)
 
                 all_datetimes.append(Time(np.mean(polarization_data.datetimes), format="mjd").isot)
                 for target, source in zip(

dkist_processing_visp/tasks/science.py

@@ -12,6 +12,7 @@ from astropy.time import TimeDelta
 from dkist_processing_common.codecs.fits import fits_access_decoder
 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.fits_access import MetadataKey
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.tasks.mixin.quality import QualityMixin
 from dkist_processing_math.arithmetic import divide_arrays_by_array
@@ -21,6 +22,7 @@ from dkist_processing_math.statistics import average_numpy_arrays
 from dkist_processing_pac.optics.telescope import Telescope
 from dkist_service_configuration.logging import logger
 
+from dkist_processing_visp.models.fits_access import VispMetadataKey
 from dkist_processing_visp.models.tags import VispTag
 from dkist_processing_visp.parsers.visp_l0_fits_access import VispL0FitsAccess
 from dkist_processing_visp.tasks.mixin.beam_access import BeamAccessMixin
@@ -49,6 +51,9 @@ class CalibrationCollection:
 
         This is done by considering that state offset values computed by the GeometricCalibration task. Any sub-pixel
         overlaps are rounded to the next integer that still guarantees overlap.
+
+        When "start pixels" are mentioned, those are pixels being counted from zero on a given axis in the positive direction.
+        When "end pixels" are mentioned, those are pixels being counted from the end of a given axis in the negative direction.
         """
         logger.info("Computing beam overlap slices")
         # This will be a flat list of (x, y) pairs for all modstates and beams
@@ -61,25 +66,33 @@ class CalibrationCollection:
         logger.info(f"All x shifts: {all_x_shifts}")
         logger.info(f"All y shifts: {all_y_shifts}")
 
-        # The amount we need to "slice in" from the front of the array is simply the maximum positive shift
+        # The amount we need to "slice in" from the start of the array is equivalent to the absolute value of the most negative shift.
         # The call to `np.ceil` ensures that the integer rounding doesn't allow non-overlap regions to leak in.
-        max_x = int(np.ceil(np.max(all_x_shifts)))
-        max_y = int(np.ceil(np.max(all_y_shifts)))
+        start_pixels_to_slice_x = int(np.ceil(abs(np.min(all_x_shifts))))
+        start_pixels_to_slice_y = int(np.ceil(abs(np.min(all_y_shifts))))
 
-        # The amount we need to "chop off" the end of the array is the most negative negative shift.
+        # The amount we need to "chop off" the end of the array is the most positive shift.
         #
         # Here we rely on the fact that the fiducial array's shift is *always* (0, 0)
-        #  (see `geometric.compute_modstate_offset`). Thus, if there are no negative shifts then the following lines
-        #  will result in None. This is required for slicing because array[x:0] is no good. So if the min is 0 then we
-        #  end up with array[x:None] which goes all the way to the end of the array.
+        # (see `geometric.compute_modstate_offset`). Thus, if there are no negative shifts then the following lines
+        # will result in None. This is required for slicing because array[x:0] is no good. So if the max is 0 then we
+        # end up with array[x:None] which goes all the way to the end of the array.
         #
-        # The call to `np.floor` ensures that the integer rounding doesn't allow non-overlap regions to leak in.
-        #  (because more negative slices will cut out more data).
-        min_x = int(np.floor(np.min(all_x_shifts))) or None
-        min_y = int(np.floor(np.min(all_y_shifts))) or None
+        # The call to `np.ceil` ensures that the integer rounding doesn't allow non-overlap regions to leak in.
+        # (because more negative slices will cut out more data).
+        end_pixels_to_slice_x = int(np.ceil(np.max(all_x_shifts))) or None
+        end_pixels_to_slice_y = int(np.ceil(np.max(all_y_shifts))) or None
+
+        # As the pixels to remove from the end of axes is given as a positive number, we need to make it negative for slicing.
+        if end_pixels_to_slice_x is not None:
+            end_pixels_to_slice_x *= -1
 
-        x_slice = slice(max_x, min_x)
-        y_slice = slice(max_y, min_y)
+        if end_pixels_to_slice_y is not None:
+            end_pixels_to_slice_y *= -1
+
+        # Construct the slices
+        x_slice = slice(start_pixels_to_slice_x, end_pixels_to_slice_x)
+        y_slice = slice(start_pixels_to_slice_y, end_pixels_to_slice_y)
 
         return x_slice, y_slice
 
@@ -275,6 +288,7 @@ class ScienceCalibration(
                 for raster_step in range(0, self.constants.num_raster_steps):
                     beam_storage = dict()
                     header_storage = dict()
+                    nan_storage = dict()
                     for beam in range(1, self.constants.num_beams + 1):
                         apm_str = f"{map_scan = }, {raster_step = }, and {beam = }"
                         with self.telemetry_span(f"Basic corrections for {apm_str}"):
@@ -286,6 +300,7 @@ class ScienceCalibration(
                                 (
                                     intermediate_array,
                                     intermediate_header,
+                                    nan_mask,
                                 ) = self.process_polarimetric_modstates(
                                     beam=beam,
                                     raster_step=raster_step,
@@ -297,7 +312,11 @@ class ScienceCalibration(
                                 logger.info(
                                     f"Processing spectrographic observe frames from {apm_str}"
                                 )
-                                intermediate_array, intermediate_header = self.correct_single_frame(
+                                (
+                                    intermediate_array,
+                                    intermediate_header,
+                                    nan_mask,
+                                ) = self.correct_single_frame(
                                     beam=beam,
                                     modstate=1,
                                     raster_step=raster_step,
@@ -308,6 +327,7 @@ class ScienceCalibration(
                                 intermediate_header = self.compute_date_keys(intermediate_header)
                             beam_storage[VispTag.beam(beam)] = intermediate_array
                             header_storage[VispTag.beam(beam)] = intermediate_header
+                            nan_storage[VispTag.beam(beam)] = nan_mask
 
                     with self.telemetry_span("Combining beams"):
                         calibrated = self.combine_beams(beam_storage, header_storage, calibrations)
@@ -316,12 +336,29 @@ class ScienceCalibration(
                         with self.telemetry_span("Correcting telescope polarization"):
                             calibrated = self.telescope_polarization_correction(calibrated)
 
+                    with self.telemetry_span("Combining NaN masks from beams"):
+                        cut_combined_nan_mask = self.combine_and_cut_nan_masks(
+                            list(nan_storage.values()), calibrations
+                        )
+
                     # Save the final output files
                     with self.telemetry_span("Writing calibrated arrays"):
                         self.write_calibrated_array(
-                            calibrated, map_scan=map_scan, calibrations=calibrations
+                            calibrated,
+                            map_scan=map_scan,
+                            calibrations=calibrations,
+                            nan_mask=cut_combined_nan_mask,
                         )
 
+    @staticmethod
+    def combine_and_cut_nan_masks(
+        nan_masks: list[np.ndarray], calibrations: CalibrationCollection
+    ) -> np.ndarray:
+        """Combine two NaN masks into one, cropping the result based on pre-calculated shifts."""
+        combined_nan_mask = np.logical_or.reduce(nan_masks)
+        x_slice, y_slice = calibrations.beams_overlap_slice
+        return combined_nan_mask[x_slice, y_slice]
+
     def process_polarimetric_modstates(
         self,
         beam: int,
@@ -329,7 +366,7 @@ class ScienceCalibration(
         map_scan: int,
         readout_exp_time: float,
         calibrations: CalibrationCollection,
-    ) -> tuple[np.ndarray, fits.Header]:
+    ) -> tuple[np.ndarray, fits.Header, np.ndarray]:
         """
         Process a single polarimetric beam as much as is possible.
 
@@ -341,11 +378,12 @@ class ScienceCalibration(
         ].shape
         array_stack = np.zeros(array_shape + (self.constants.num_modstates,))
         header_stack = []
+        nan_mask_stack = np.zeros(array_shape + (self.constants.num_modstates,))
 
         with self.telemetry_span(f"Correcting {self.constants.num_modstates} modstates"):
             for modstate in range(1, self.constants.num_modstates + 1):
                 # Correct the arrays
-                corrected_array, corrected_header = self.correct_single_frame(
+                corrected_array, corrected_header, nan_mask = self.correct_single_frame(
                     beam=beam,
                     modstate=modstate,
                     raster_step=raster_step,
@@ -356,6 +394,7 @@ class ScienceCalibration(
                 # Add this result to the 3D stack
                 array_stack[:, :, modstate - 1] = corrected_array
                 header_stack.append(corrected_header)
+                nan_mask_stack[:, :, modstate - 1] = nan_mask
 
         with self.telemetry_span("Applying instrument polarization correction"):
             intermediate_array = nd_left_matrix_multiply(
@@ -364,7 +403,8 @@ class ScienceCalibration(
             )
             intermediate_header = self.compute_date_keys(header_stack)
 
-        return intermediate_array, intermediate_header
+        # The modulator state NaN masks are stacked along axis=2 with axis=0 & 1 being the array axes of one modstate
+        return intermediate_array, intermediate_header, np.logical_or.reduce(nan_mask_stack, axis=2)
 
     def combine_beams(
         self,
@@ -438,6 +478,7 @@ class ScienceCalibration(
         calibrated_object: VispL0FitsAccess,
         map_scan: int,
         calibrations: CalibrationCollection,
+        nan_mask: np.ndarray,
     ) -> None:
         """
         Write out calibrated science frames.
@@ -456,6 +497,9 @@ class ScienceCalibration(
         calibrations
             Calibration collection
 
+        nan_mask
+            A mask containing the known areas where data does not exist for both beams
+
         Returns
         -------
         None
@@ -471,7 +515,8 @@ class ScienceCalibration(
             stokes_I_data = calibrated_object.data[:, :, 0]
             for i, stokes_param in enumerate(self.constants.stokes_params):
                 stokes_data = calibrated_object.data[:, :, i]
-                final_data = self.re_dummy_data(stokes_data)
+                nan_masked_data = np.where(nan_mask, np.nan, stokes_data)
+                final_data = self.re_dummy_data(nan_masked_data)
                 pol_header = self.add_L1_pol_headers(final_header, stokes_data, stokes_I_data)
                 self.write_cal_array(
                     data=final_data,
@@ -481,7 +526,8 @@ class ScienceCalibration(
                     map_scan=map_scan,
                 )
         else:  # Only write stokes I
-            final_data = self.re_dummy_data(calibrated_object.data)
+            nan_masked_data = np.where(nan_mask, np.nan, calibrated_object.data)
+            final_data = self.re_dummy_data(nan_masked_data)
             self.write_cal_array(
                 data=final_data,
                 header=final_header,
@@ -498,7 +544,7 @@ class ScienceCalibration(
         map_scan: int,
         readout_exp_time: float,
         calibrations: CalibrationCollection,
-    ) -> tuple[np.ndarray, fits.Header]:
+    ) -> tuple[np.ndarray, fits.Header, np.ndarray]:
         """
         Apply basic corrections to a single frame.
 
@@ -593,7 +639,40 @@ class ScienceCalibration(
             self.corrections_remove_spec_geometry(geo_corrected_array, spec_shift)
         )
 
-        return spectral_corrected_array, observe_object.header
+        nan_mask = self.generate_nan_mask(
+            solar_corrected_array=solar_corrected_array,
+            state_offset=state_offset,
+            angle=angle,
+            spec_shift=spec_shift,
+        )
+
+        return (
+            spectral_corrected_array,
+            observe_object.header,
+            nan_mask,
+        )
+
+    def generate_nan_mask(
+        self,
+        solar_corrected_array: np.ndarray,
+        state_offset: np.ndarray,
+        angle: float,
+        spec_shift: np.ndarray,
+    ) -> np.ndarray:
+        """Calculate the NaN mask through geometric correction to be applied to the final L1 arrays."""
+        # Using a bi-cubic polynomial (order = 3) best converges to the desired result in the underlying fits
+        geo_corrected_with_nan = next(
+            self.corrections_correct_geometry(
+                solar_corrected_array, state_offset, angle, mode="constant", order=3, cval=np.nan
+            )
+        )
+        # Interpolating with nearest neighbor (order = 0) prevents NaN values from "taking over" the whole array
+        spectral_corrected_with_nan = next(
+            self.corrections_remove_spec_geometry(
+                geo_corrected_with_nan, spec_shift, cval=np.nan, order=0
+            )
+        )
+        return np.isnan(spectral_corrected_with_nan)
 
     def telescope_polarization_correction(
         self,
@@ -653,7 +732,7 @@ class ScienceCalibration(
         date_end = (Time(sorted_obj_list[-1].time_obs) + exp_time).isot
 
         header = sorted_obj_list[0].header
-        header["DATE-BEG"] = date_beg
+        header[MetadataKey.time_obs] = date_beg
         header["DATE-END"] = date_end
 
         return header

dkist_processing_visp/tasks/write_l1.py

@@ -5,11 +5,13 @@ from typing import Literal
 
 import astropy.units as u
 from astropy.io import fits
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.tasks import WriteL1Frame
 from dkist_processing_common.tasks.write_l1 import WavelengthRange
 from dkist_service_configuration.logging import logger
 
 from dkist_processing_visp.models.constants import VispConstants
+from dkist_processing_visp.models.fits_access import VispMetadataKey
 
 cached_info_logger = cache(logger.info)
 __all__ = ["VispWriteL1Frame"]
@@ -55,7 +57,7 @@ class VispWriteL1Frame(WriteL1Frame):
         """
         # Correct the headers for the number of map and scan steps per map due to potential observation aborts
         header["VSPNMAPS"] = self.constants.num_map_scans
-        header["VSPNSTP"] = self.constants.num_raster_steps
+        header[VispMetadataKey.total_raster_steps] = self.constants.num_raster_steps
 
         if stokes.upper() not in self.constants.stokes_params:
             raise ValueError("The stokes parameter must be one of I, Q, U, V")
@@ -92,7 +94,7 @@ class VispWriteL1Frame(WriteL1Frame):
                     header[f"CNAME{i}"] = "helioprojective longitude"
                 header[f"DUNIT{i}"] = header[f"CUNIT{i}"]
                 # Current position in raster scan which counts from zero
-                header[f"DINDEX{i}"] = header["VSPSTP"] + 1
+                header[f"DINDEX{i}"] = header[VispMetadataKey.raster_scan_step] + 1
             else:
                 raise ValueError(
                     f"Unexpected axis type. Expected ['HPLT-TAN', 'AWAV', 'HPLN-TAN']. Got {axis_type}"
@@ -207,5 +209,7 @@ class VispWriteL1Frame(WriteL1Frame):
         header["CADMIN"] = self.constants.minimum_cadence * self.constants.num_modstates
         header["CADMAX"] = self.constants.maximum_cadence * self.constants.num_modstates
         header["CADVAR"] = self.constants.variance_cadence * self.constants.num_modstates
-        header["XPOSURE"] = header["XPOSURE"] * self.constants.num_modstates
+        header[MetadataKey.fpa_exposure_time_ms] = (
+            header[MetadataKey.fpa_exposure_time_ms] * self.constants.num_modstates
+        )
         return header

dkist_processing_visp/tests/local_trial_workflows/l0_polcals_as_science.py

@@ -11,6 +11,7 @@ from typing import Literal
 from astropy.io import fits
 from dkist_processing_common.codecs.basemodel import basemodel_encoder
 from dkist_processing_common.manual import ManualProcessing
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.input_dataset import InputDatasetPartDocumentList
 from dkist_processing_common.tasks import CreateTrialQualityReport
 from dkist_processing_common.tasks import QualityL1Metrics
@@ -18,6 +19,7 @@ from dkist_processing_common.tasks import WorkflowTaskBase
 from dkist_service_configuration.logging import logger
 
 from dkist_processing_visp.models.constants import VispBudName
+from dkist_processing_visp.models.fits_access import VispMetadataKey
 from dkist_processing_visp.models.tags import VispTag
 from dkist_processing_visp.tasks import AssembleVispMovie
 from dkist_processing_visp.tasks import MakeVispMovieFrames
@@ -156,7 +158,7 @@ class TagPolcalAsScience(VispTaskBase):
                     idx = 0
                     if hdul[idx].data is None:
                         idx = 1
-                    hdul[idx].header["VSPSTP"] = raster_step
+                    hdul[idx].header[VispMetadataKey.raster_scan_step] = raster_step
                     hdul.flush()
                     del hdul
 
@@ -201,9 +203,9 @@ def write_L1_files_task(prefix: str = ""):
 
         def l1_filename(self, header: fits.Header, stokes: Literal["I", "Q", "U", "V"]):
             """Do."""
-            wavelength = str(round(header["LINEWAV"] * 1000)).zfill(8)
+            wavelength = str(round(header[MetadataKey.wavelength] * 1000)).zfill(8)
             cs_step = header["VSPMAP"]
-            raster_step = header["VSPSTP"]
+            raster_step = header[VispMetadataKey.raster_scan_step]
             return f"{prefix}CS_STEP_{cs_step:02n}_{raster_step:02n}_{wavelength}_{stokes}_L1.fits"
 
     return WritePolcalL1Files

dkist_processing_visp/tests/local_trial_workflows/local_trial_helpers.py

@@ -30,6 +30,7 @@ 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.parameters import VispParsingParameters
 from dkist_processing_visp.models.tags import VispTag
 from dkist_processing_visp.models.task_name import VispTaskName
@@ -575,9 +576,9 @@ class TagSingleSolarGainAsScience(VispTaskBase):
         avg_array = average_numpy_arrays(arrays=arrays)
 
         hdul = fits.HDUList([fits.PrimaryHDU(data=avg_array, header=first_header)])
-        hdul[0].header["VSPSTP"] = 0
-        hdul[0].header["VSPNSTP"] = 1
-        hdul[0].header["VSPSTNUM"] = 1
+        hdul[0].header[VispMetadataKey.raster_scan_step] = 0
+        hdul[0].header[VispMetadataKey.total_raster_steps] = 1
+        hdul[0].header[VispMetadataKey.modulator_state] = 1
         hdul[0].header["VSPPOLMD"] = "observe_intensity"
         # hdul[0].header["POL_NOIS"] = 0.666
         # hdul[0].header["POL_SENS"] = 0.666
@@ -626,9 +627,9 @@ class TagModulatedSolarGainsAsScience(VispTaskBase):
             avg_array = average_numpy_arrays(arrays=arrays)
 
             hdul = fits.HDUList([fits.PrimaryHDU(data=avg_array, header=first_header)])
-            hdul[0].header["VSPSTP"] = 0
-            hdul[0].header["VSPNSTP"] = 1
-            hdul[0].header["VSPSTNUM"] = modstate
+            hdul[0].header[VispMetadataKey.raster_scan_step] = 0
+            hdul[0].header[VispMetadataKey.total_raster_steps] = 1
+            hdul[0].header[VispMetadataKey.modulator_state] = modstate
             hdul[0].header["VSPPOLMD"] = "observe_polarimetric"
 
             new_tags = [

dkist_processing_visp/tests/test_fits_access.py

@@ -0,0 +1,43 @@
+import pytest
+from dkist_header_validator.translator import translate_spec122_to_spec214_l0
+
+from dkist_processing_visp.models.fits_access import VispMetadataKey
+from dkist_processing_visp.parsers.visp_l0_fits_access import VispL0FitsAccess
+from dkist_processing_visp.parsers.visp_l1_fits_access import VispL1FitsAccess
+from dkist_processing_visp.tests.header_models import VispHeadersValidObserveFrames
+
+
+@pytest.fixture(scope="session")
+def complete_header():
+    dataset = VispHeadersValidObserveFrames(
+        array_shape=(1, 1, 1),
+        time_delta=10,
+        num_maps=1,
+        num_raster_steps=1,
+        num_modstates=1,
+    )
+    header = translate_spec122_to_spec214_l0(dataset.header())
+    return header
+
+
+def test_metadata_keys_in_access_bases(complete_header):
+    """
+    Given: the set of metadata key names in VispMetadataKey
+    When: the ViSP FITS access classes define a set of new attributes
+    Then: the sets are the same and the attributes have the correct values
+    """
+    # Given
+    visp_metadata_key_names = {vmk.name for vmk in VispMetadataKey}
+    # When
+    all_visp_fits_access_attrs = set()
+    for access_class in [VispL0FitsAccess, VispL1FitsAccess]:
+        fits_obj = access_class.from_header(complete_header)
+        visp_instance_attrs = set(vars(fits_obj).keys())
+        parent_class = access_class.mro()[1]
+        parent_fits_obj = parent_class.from_header(complete_header)
+        parent_instance_attrs = set(vars(parent_fits_obj).keys())
+        visp_fits_access_attrs = visp_instance_attrs - parent_instance_attrs
+        for attr in visp_fits_access_attrs:
+            assert getattr(fits_obj, attr) == fits_obj.header[VispMetadataKey[attr]]
+        all_visp_fits_access_attrs |= visp_fits_access_attrs
+    assert visp_metadata_key_names == all_visp_fits_access_attrs

dkist_processing_visp/tests/test_make_movie_frames.py

@@ -1,6 +1,7 @@
 import pytest
 from astropy.io import fits
 from dkist_processing_common._util.scratch import WorkflowFileSystem
+from dkist_processing_common.models.fits_access import MetadataKey
 
 from dkist_processing_visp.models.tags import VispTag
 from dkist_processing_visp.tasks.make_movie_frames import MakeVispMovieFrames
@@ -56,5 +57,5 @@ def test_make_movie_frames(movie_frames_task, pol_mode, mocker, fake_gql_client)
     for filepath in task.read(tags=[VispTag.movie_frame()]):
         assert filepath.exists()
         hdul = fits.open(filepath)
-        assert hdul[0].header["INSTRUME"] == "VISP"
+        assert hdul[0].header[MetadataKey.instrument] == "VISP"
         assert hdul[0].data.shape == expected_movie_fram_shape

dkist_processing_visp/tests/test_map_repeats.py

@@ -14,6 +14,7 @@ from dkist_processing_common.parsers.single_value_single_key_flower import (
 )
 
 from dkist_processing_visp.models.constants import VispBudName
+from dkist_processing_visp.models.fits_access import VispMetadataKey
 from dkist_processing_visp.models.tags import VispStemName
 from dkist_processing_visp.models.tags import VispTag
 from dkist_processing_visp.parsers.map_repeats import MapScanFlower
@@ -90,7 +91,8 @@ class ParseTaskJustMapStuff(ParseL0VispInputData):
             MapScanFlower(),
             RasterScanStepFlower(),
             SingleValueSingleKeyFlower(
-                tag_stem_name=VispStemName.modstate.value, metadata_key="modulator_state"
+                tag_stem_name=VispStemName.modstate.value,
+                metadata_key=VispMetadataKey.modulator_state,
             ),
         ]
 

dkist_processing_visp/tests/test_science.py

@@ -12,6 +12,7 @@ from dkist_header_validator import spec122_validator
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.codecs.fits import fits_array_encoder
 from dkist_processing_common.codecs.fits import fits_hdu_decoder
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.tags import Tag
 
 from dkist_processing_visp.models.tags import VispStemName
@@ -183,7 +184,7 @@ def headers_with_dates() -> tuple[list[fits.Header], str, int, int]:
     ]
     random.shuffle(headers)  # Shuffle to make sure they're not already in time order
     for h in headers:
-        h["XPOSURE"] = exp_time  # Exposure time, in ms
+        h[MetadataKey.fpa_exposure_time_ms] = exp_time  # Exposure time, in ms
 
     return headers, start_time, exp_time, time_delta
 
@@ -363,10 +364,10 @@ def test_science_calibration_task(
         assert header["VSPMAP"] == map_scan
 
         # Check that WCS keys were updated
-        if offsets[1, 0, 0] > 0:
-            assert header["CRPIX2"] == input_header["CRPIX2"] - np.ceil(offsets[1, 0, 0])
-        if offsets[1, 0, 1] > 0:
-            assert header["CRPIX1"] == input_header["CRPIX1"] - np.ceil(offsets[1, 0, 1])
+        if offsets[1, 0, 0] < 0:
+            assert header["CRPIX2"] == input_header["CRPIX2"] - np.ceil(-offsets[1, 0, 0])
+        if offsets[1, 0, 1] < 0:
+            assert header["CRPIX1"] == input_header["CRPIX1"] - np.ceil(-offsets[1, 0, 1])
 
     quality_files = task.read(tags=[Tag.quality("TASK_TYPES")])
     for file in quality_files:
@@ -419,7 +420,7 @@ def test_readout_normalization_correct(
     )
 
     # When:
-    corrected_array, _ = task.correct_single_frame(
+    corrected_array, _, _ = task.correct_single_frame(
         beam=1,
         modstate=1,
         raster_step=1,
@@ -512,7 +513,7 @@ def test_compute_date_keys_compressed_headers(
                     [[1.0, 2.0], [11.0, 10.0], [3.0, 2.0]],  # Beam 2
                 ]
             ),
-            [slice(11, None, None), slice(10, None, None)],
+            [slice(0, -11, None), slice(0, -10, None)],
         ),
         (
             np.array(
@@ -521,7 +522,7 @@ def test_compute_date_keys_compressed_headers(
                     [[-1.0, -2.0], [-11.0, -10.0], [-3.0, -2.0]],  # Beam 2
                 ]
             ),
-            [slice(0, -11, None), slice(0, -10, None)],
+            [slice(11, None, None), slice(10, None, None)],
         ),
         (
             np.array(
@@ -530,7 +531,7 @@ def test_compute_date_keys_compressed_headers(
                     [[1.0, 2.0], [-11.0, 10.0], [-3.0, -2.0]],  # Beam 2
                 ]
             ),
-            [slice(10, -11, None), slice(10, -2, None)],
+            [slice(11, -10, None), slice(2, -10, None)],
         ),
     ],
     ids=["All positive", "All negative", "Positive and negative"],
@@ -580,3 +581,98 @@ def test_combine_beams(
         expected = np.ones((10, 10, 4)) * 2.5
 
     np.testing.assert_array_equal(data, expected)
+
+
+@pytest.mark.parametrize(
+    "shifts",
+    # Shifts have shape (num_beams, num_modstates, 2)
+    # So the inner-most lists below (e.g., [5.0, 6.0]) correspond to [x_shift, y_shit]
+    [
+        np.array(
+            [
+                [[0.0, 0.0], [10.0, 2.0], [5.0, 6.0]],  # Beam 1
+                [[1.0, 2.0], [-11.0, 10.0], [-3.0, -2.0]],  # Beam 2
+            ]
+        ),
+    ],
+    ids=["Positive and negative"],
+)
+def test_combine_and_cut_nan_masks(
+    science_calibration_task, calibration_collection_with_geo_shifts, shifts
+):
+    """
+    Given: A ScienceCalibration task and NaN masks, along with geometric shifts
+    When: Combining the two NaN masks
+    Then: The final mask has NaN values in the correct place and is correctly cropped
+    """
+    nan_1_location = [0, 1]
+    nan_2_location = [50, 50]
+    nan_3_location = [4, 1]
+    nan_4_location = [55, 63]
+    nan_mask_shape = (100, 100)
+    nan_mask_1 = np.zeros(shape=nan_mask_shape)
+    nan_mask_1[nan_1_location[0], nan_1_location[1]] = np.nan
+    nan_mask_1[nan_2_location[0], nan_2_location[1]] = np.nan
+    nan_mask_2 = np.zeros(shape=nan_mask_shape)
+    nan_mask_2[nan_3_location[0], nan_3_location[1]] = np.nan
+    nan_mask_2[nan_4_location[0], nan_4_location[1]] = np.nan
+    task, _, _, _, _, _ = science_calibration_task
+    combined_nan_mask = task.combine_and_cut_nan_masks(
+        nan_masks=[nan_mask_1, nan_mask_2], calibrations=calibration_collection_with_geo_shifts
+    )
+    beam_1_shifts = shifts[0]
+    beam_2_shifts = shifts[1]
+    beam_1_x_shifts = [i[0] for i in beam_1_shifts]
+    beam_2_x_shifts = [i[0] for i in beam_2_shifts]
+    beam_1_y_shifts = [i[1] for i in beam_1_shifts]
+    beam_2_y_shifts = [i[1] for i in beam_2_shifts]
+    x_shifts = beam_1_x_shifts + beam_2_x_shifts
+    y_shifts = beam_1_y_shifts + beam_2_y_shifts
+    assert combined_nan_mask.shape == (
+        nan_mask_shape[0] - (max(x_shifts) - min(x_shifts)),
+        nan_mask_shape[1] - (max(y_shifts) - min(y_shifts)),
+    )
+    # Check that one NaN value from each original mask is present in the combined mask and in the correct place
+    assert (
+        combined_nan_mask[
+            nan_2_location[0] - int(abs(min(x_shifts))), nan_2_location[1] - int(abs(min(y_shifts)))
+        ]
+        == True
+    )
+    assert (
+        combined_nan_mask[
+            nan_4_location[0] - int(abs(min(x_shifts))), nan_4_location[1] - int(abs(min(y_shifts)))
+        ]
+        == True
+    )
+    assert np.sum(combined_nan_mask) == 2  # only two NaN values are in the final mask
+
+
+def test_generate_nan_mask(science_calibration_task, dummy_calibration_collection):
+    """
+    Given: a calibration collection
+    When: calculating the NaN mask to use
+    Then: the mask takes up some, but not all, of the frame size
+    """
+    task, _, _, _, _, _ = science_calibration_task
+    calibration_collection, _, _ = dummy_calibration_collection
+    beam = 1
+    modstate = 1
+    solar_gain_array = calibration_collection.solar_gain[VispTag.beam(beam)][
+        VispTag.modstate(modstate)
+    ]
+    angle = calibration_collection.angle[VispTag.beam(beam)]
+    spec_shift = calibration_collection.spec_shift[VispTag.beam(beam)]
+    state_offset = calibration_collection.state_offset[VispTag.beam(beam)][
+        VispTag.modstate(modstate)
+    ]
+    nan_mask = task.generate_nan_mask(
+        solar_corrected_array=np.random.random(size=solar_gain_array.shape),
+        state_offset=state_offset,
+        angle=angle,
+        spec_shift=spec_shift,
+    )
+    # Some of the mask is marked as NaN but not all
+    assert np.sum(nan_mask) < np.size(nan_mask)
+    # Ensure that only zeroes and ones are in the mask
+    assert set(np.unique(nan_mask)) == {0, 1}

dkist_processing_visp/tests/test_write_l1.py

@@ -4,6 +4,7 @@ from astropy.io import fits
 from astropy.time import Time
 from dkist_fits_specifications import __version__ as spec_version
 from dkist_header_validator import spec214_validator
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.tags import Tag
 from dkist_processing_common.models.wavelength import WavelengthRange
 from dkist_spectral_lines import get_closest_spectral_line
@@ -176,7 +177,7 @@ def test_write_l1_frame(
 
             if pol_mode == "observe_polarimetric":
                 assert header["CADENCE"] == 100
-                assert header["XPOSURE"] == 150
+                assert header[MetadataKey.fpa_exposure_time_ms] == 150
             else:
                 assert header["CADENCE"] == 10
-                assert header["XPOSURE"] == 15
+                assert header[MetadataKey.fpa_exposure_time_ms] == 15

{dkist_processing_visp-3.6.2.dist-info → dkist_processing_visp-4.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-visp
-Version: 3.6.2
+Version: 4.0.0
 Summary: Science processing code for the ViSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -76,6 +76,7 @@ Requires-Dist: Flask-Login==0.6.3; extra == "frozen"
 Requires-Dist: Flask-SQLAlchemy==2.5.1; extra == "frozen"
 Requires-Dist: Flask-Session==0.5.0; extra == "frozen"
 Requires-Dist: Flask-WTF==1.2.2; extra == "frozen"
+Requires-Dist: ImageIO==2.37.2; extra == "frozen"
 Requires-Dist: Jinja2==3.1.6; extra == "frozen"
 Requires-Dist: Mako==1.3.10; extra == "frozen"
 Requires-Dist: MarkupSafe==3.0.3; extra == "frozen"
@@ -115,19 +116,19 @@ Requires-Dist: asdf==3.5.0; extra == "frozen"
 Requires-Dist: asdf_standard==1.4.0; extra == "frozen"
 Requires-Dist: asdf_transform_schemas==0.6.0; extra == "frozen"
 Requires-Dist: asgiref==3.10.0; extra == "frozen"
-Requires-Dist: asteval==1.0.6; extra == "frozen"
+Requires-Dist: asteval==1.0.7; extra == "frozen"
 Requires-Dist: astropy==7.0.2; extra == "frozen"
-Requires-Dist: astropy-iers-data==0.2025.11.3.0.38.37; extra == "frozen"
+Requires-Dist: astropy-iers-data==0.2025.11.10.0.38.31; extra == "frozen"
 Requires-Dist: asyncpg==0.30.0; extra == "frozen"
 Requires-Dist: attrs==25.4.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
 Requires-Dist: billiard==4.2.2; extra == "frozen"
 Requires-Dist: blinker==1.9.0; extra == "frozen"
-Requires-Dist: boto3==1.40.64; extra == "frozen"
-Requires-Dist: botocore==1.40.64; extra == "frozen"
+Requires-Dist: boto3==1.40.71; extra == "frozen"
+Requires-Dist: botocore==1.40.71; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
 Requires-Dist: celery==5.3.1; extra == "frozen"
-Requires-Dist: certifi==2025.10.5; extra == "frozen"
+Requires-Dist: certifi==2025.11.12; extra == "frozen"
 Requires-Dist: cffi==2.0.0; extra == "frozen"
 Requires-Dist: charset-normalizer==3.4.4; extra == "frozen"
 Requires-Dist: click==8.3.0; extra == "frozen"
@@ -151,7 +152,7 @@ Requires-Dist: dkist-processing-common==11.8.0; extra == "frozen"
 Requires-Dist: dkist-processing-core==6.0.0; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.1; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-visp==3.6.2; extra == "frozen"
+Requires-Dist: dkist-processing-visp==4.0.0; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.1.7; extra == "frozen"
 Requires-Dist: dkist-spectral-lines==3.0.0; extra == "frozen"
 Requires-Dist: dkist_fits_specifications==4.17.0; extra == "frozen"
@@ -163,10 +164,9 @@ Requires-Dist: fonttools==4.60.1; extra == "frozen"
 Requires-Dist: frozenlist==1.8.0; extra == "frozen"
 Requires-Dist: fsspec==2025.10.0; extra == "frozen"
 Requires-Dist: globus-sdk==3.65.0; extra == "frozen"
-Requires-Dist: google-re2==1.1.20250805; extra == "frozen"
-Requires-Dist: googleapis-common-protos==1.71.0; extra == "frozen"
+Requires-Dist: google-re2==1.1.20251105; extra == "frozen"
+Requires-Dist: googleapis-common-protos==1.72.0; extra == "frozen"
 Requires-Dist: gqlclient==1.2.3; extra == "frozen"
-Requires-Dist: greenlet==3.2.4; extra == "frozen"
 Requires-Dist: grpcio==1.76.0; extra == "frozen"
 Requires-Dist: gunicorn==23.0.0; extra == "frozen"
 Requires-Dist: h11==0.16.0; extra == "frozen"
@@ -174,7 +174,6 @@ Requires-Dist: httpcore==1.0.9; extra == "frozen"
 Requires-Dist: httpx==0.28.1; extra == "frozen"
 Requires-Dist: humanize==4.14.0; extra == "frozen"
 Requires-Dist: idna==3.11; extra == "frozen"
-Requires-Dist: imageio==2.37.0; extra == "frozen"
 Requires-Dist: imageio-ffmpeg==0.6.0; extra == "frozen"
 Requires-Dist: importlib_metadata==8.7.0; extra == "frozen"
 Requires-Dist: inflection==0.5.1; extra == "frozen"
@@ -254,9 +253,9 @@ Requires-Dist: protobuf==6.33.0; extra == "frozen"
 Requires-Dist: psutil==7.1.3; extra == "frozen"
 Requires-Dist: psycopg2-binary==2.9.11; extra == "frozen"
 Requires-Dist: pycparser==2.23; extra == "frozen"
-Requires-Dist: pydantic==2.12.3; extra == "frozen"
-Requires-Dist: pydantic-settings==2.11.0; extra == "frozen"
-Requires-Dist: pydantic_core==2.41.4; extra == "frozen"
+Requires-Dist: pydantic==2.12.4; extra == "frozen"
+Requires-Dist: pydantic-settings==2.12.0; extra == "frozen"
+Requires-Dist: pydantic_core==2.41.5; extra == "frozen"
 Requires-Dist: pyerfa==2.0.1.5; extra == "frozen"
 Requires-Dist: pyparsing==3.2.5; extra == "frozen"
 Requires-Dist: python-daemon==3.1.2; extra == "frozen"
@@ -300,7 +299,7 @@ Requires-Dist: typing_extensions==4.15.0; extra == "frozen"
 Requires-Dist: tzdata==2025.2; extra == "frozen"
 Requires-Dist: uc-micro-py==1.0.3; extra == "frozen"
 Requires-Dist: uncertainties==3.2.3; extra == "frozen"
-Requires-Dist: universal_pathlib==0.3.4; extra == "frozen"
+Requires-Dist: universal_pathlib==0.3.5; extra == "frozen"
 Requires-Dist: urllib3==2.5.0; extra == "frozen"
 Requires-Dist: vine==5.1.0; extra == "frozen"
 Requires-Dist: voluptuous==0.15.2; extra == "frozen"

{dkist_processing_visp-3.6.2.dist-info → dkist_processing_visp-4.0.0.dist-info}/RECORD

@@ -3,17 +3,18 @@ dkist_processing_visp/__init__.py,sha256=LC8o31oTIro4F7IgwoWalX1W3KcPU27yJhlDUeG
 dkist_processing_visp/config.py,sha256=GMr0CreW4qavbueTtsH_Gx5P52v4yZd2PNKyPmxBKQE,478
 dkist_processing_visp/fonts/Lato-Regular.ttf,sha256=1jbkaDIx-THtoiLViOlE0IK_0726AvkovuRhwPGFslE,656568
 dkist_processing_visp/models/__init__.py,sha256=z2nFVvvIzirxklQ9i5-F1nR-WOgcDttYtog_jx4yN5I,12
-dkist_processing_visp/models/constants.py,sha256=GLltKc11rVAcLu6SLgMTGrxnyV88YVEg-dO8N8Cx7_0,5201
+dkist_processing_visp/models/constants.py,sha256=sizf2PB3H8BVughHsJhh_fJUeNkN-0uHpo-DVy1_wdo,5140
+dkist_processing_visp/models/fits_access.py,sha256=-W5hP5U9n4uMCg2A_CSJuM3L6dipktZIjoUxyQfT0O8,435
 dkist_processing_visp/models/parameters.py,sha256=m5o41KsPO99WUgWlY4-ezu4wqvQVMGpQ3fNuMcFkSu0,9831
 dkist_processing_visp/models/tags.py,sha256=RKtDlNA9O3LMinUP7BJ3tXWn6CWAARaKhXIVB1EHtg0,3055
 dkist_processing_visp/models/task_name.py,sha256=ykLXcmCBWYguopdBlg_G0X_u-0o_Ugh2117XrCqdbFk,187
 dkist_processing_visp/parsers/__init__.py,sha256=z2nFVvvIzirxklQ9i5-F1nR-WOgcDttYtog_jx4yN5I,12
 dkist_processing_visp/parsers/map_repeats.py,sha256=YuO1VROQLuE-Hn9hSzityjNhIDe-EgQ4kjZV6l9xF2Q,5468
 dkist_processing_visp/parsers/modulator_states.py,sha256=dHAZZaG3i_UUT5FjTg1oJdCBiOKCqkrx1jiQnzp2t2o,3006
-dkist_processing_visp/parsers/polarimeter_mode.py,sha256=mrlxFRcJfDojaE7tuB4DTka4fTQbPA6ae2rspE7s5WI,542
-dkist_processing_visp/parsers/raster_step.py,sha256=39kpy3PqcRgZluViJLuJnW0eD6LLF6R5QrxWkg50SQk,3046
-dkist_processing_visp/parsers/time.py,sha256=kN4B2gJ0XpO2oOOk0CQyuWd-BRUOLLM6P7KQJClvNQk,4715
-dkist_processing_visp/parsers/visp_l0_fits_access.py,sha256=JoQezX0yhgyA-UVET7SXILXnny_M6ZuSRz4SSPn9syk,1336
+dkist_processing_visp/parsers/polarimeter_mode.py,sha256=vOE8IYlBrgAFGSrDbpUDfHnI3OTPBDpd3U_j5totZb8,625
+dkist_processing_visp/parsers/raster_step.py,sha256=tCmXPhG99z54YVX3X-kLOGDKJRTDJHnDbjNev4An7Pg,3142
+dkist_processing_visp/parsers/time.py,sha256=uudQ5manYdL7SgxqABfFPDzW2iTNrTYF0klqCRsP0CI,4812
+dkist_processing_visp/parsers/visp_l0_fits_access.py,sha256=vZGLGQNofRFziTSBOTf4_digLlOdRRGeFEvrAQouXTI,1609
 dkist_processing_visp/parsers/visp_l1_fits_access.py,sha256=1MrFfsJjT_7fd1cj8tFr5rHX2JdRSrlwiMCzu-Q8ejY,860
 dkist_processing_visp/tasks/__init__.py,sha256=qlPlahiM9_sCsaIj_wzQpzWkMITJ1dPdT93iV9q-fgg,713
 dkist_processing_visp/tasks/assemble_movie.py,sha256=8UujniXlV_sSGeuISud8wMHihLy6Gc5fKZpwkXLUQB8,3330
@@ -23,16 +24,16 @@ dkist_processing_visp/tasks/geometric.py,sha256=rvWa13T2_cPQtiMjlWrqMYS5UvL8Xgmi
 dkist_processing_visp/tasks/instrument_polarization.py,sha256=uj7iyzM3CiJcbQeF4eKpk_KCoheXaM4FpDI83GYDld4,25854
 dkist_processing_visp/tasks/l1_output_data.py,sha256=lon6bIUBvURV_7gn1HFGAGVuEiLoOiMaJwfbdhSRW3w,459
 dkist_processing_visp/tasks/lamp.py,sha256=RciNB8zW5fDx5yrsaNZgFP7LsajmSvkTNvbe3Sm6tjc,6060
-dkist_processing_visp/tasks/make_movie_frames.py,sha256=AMhHTMlcrCX_dI7lHduGZPWitwtfXI9m9FbJKZ8vz1Y,7420
-dkist_processing_visp/tasks/parse.py,sha256=tU8Ann3k3cByOGsLe5dIQKZC_RQA50Z2mUu52H3qVCs,6500
-dkist_processing_visp/tasks/quality_metrics.py,sha256=Xz0ft1Y6ocJiVIDKe2fp8YxWsy3ctuGvYI-4hWFL-P8,8130
-dkist_processing_visp/tasks/science.py,sha256=-tI1bnIEu00nVBaZAhii7cUlFXaFDxZK3wTSWHRhWxA,30815
+dkist_processing_visp/tasks/make_movie_frames.py,sha256=fw25ksKiJJNS57XV5a7rHpYGcSkYxS2Qf13Fb1UGNpE,7544
+dkist_processing_visp/tasks/parse.py,sha256=3f8LWSKQtuY7n-PdHiw1j55i5l4juBn3pIHqTtp2-rk,6752
+dkist_processing_visp/tasks/quality_metrics.py,sha256=Pw55-PXW0cl39FuNkEQCGGhvI_zMDimwmh-swVPVBD4,8133
+dkist_processing_visp/tasks/science.py,sha256=BiEtgDowExHAXXzfO4BSr34BT0PZ28CdtOJMP4TDA20,34680
 dkist_processing_visp/tasks/solar.py,sha256=QPkrJqUz6gYxFFvNlATMKa4NIEdn4iassYn86qPb60k,27567
 dkist_processing_visp/tasks/visp_base.py,sha256=flUM-dCWkjcGvfaiFWH89DRZXz7NADgShxzpFjFqVEw,1370
-dkist_processing_visp/tasks/write_l1.py,sha256=OuTgzZG_47LZrQ42cYOP6wUUx18TL0o5WxrRwVJrTNM,8541
+dkist_processing_visp/tasks/write_l1.py,sha256=bsDZ0BwoqpTtS_f_rAzUn7Ra8UvYb-kINQhX6BwwFQw,8796
 dkist_processing_visp/tasks/mixin/__init__.py,sha256=z2nFVvvIzirxklQ9i5-F1nR-WOgcDttYtog_jx4yN5I,12
 dkist_processing_visp/tasks/mixin/beam_access.py,sha256=1VSJkH6yMxCiZWdWOp_RJ37fX5ULMYmB_0_ulT7YJpI,870
-dkist_processing_visp/tasks/mixin/corrections.py,sha256=tsXexnqsYgd14CjGYrsBxGjX7ZTUVrTj6_-2VdKeWP0,5666
+dkist_processing_visp/tasks/mixin/corrections.py,sha256=FhLFgD9ZYLZd3SaC3PFF-szrcs-zmdrUYNDUEK-h7JA,7145
 dkist_processing_visp/tasks/mixin/downsample.py,sha256=SvKzY6HJRn-FeyG7O6HPvyOS5dmMu6uPoWkfnpPXpVw,1344
 dkist_processing_visp/tasks/mixin/line_zones.py,sha256=5jfea9V5RJAi-834z_Y9v4fhlRFJdK1McAqO9X92bZo,4065
 dkist_processing_visp/tests/README.rst,sha256=rnedwwg25c0lB9Me7cT7QNZA17FYlqCu9ZnjQxR5hi0,12502
@@ -44,26 +45,27 @@ dkist_processing_visp/tests/test_assemble_quality.py,sha256=Hm0nAW90Kbb-6OLkUsW6
 dkist_processing_visp/tests/test_background_light.py,sha256=Zvm8s38qx_ybviEhnKqPI4s36VFBJKtsNrp31-o8lEQ,17553
 dkist_processing_visp/tests/test_dark.py,sha256=iKp12bHOOKPf7GAB8iKYpZu1AXFaESAW6C0ua1nVFXA,5552
 dkist_processing_visp/tests/test_downsample.py,sha256=iSmb4PwpZtnVU06tmlko1wwepWueQ3KJ459XYgNIpws,2211
+dkist_processing_visp/tests/test_fits_access.py,sha256=jOaSHDydzPl48SSBxt3z3CtCzBgCmSCc3rZ92CpoAaY,1822
 dkist_processing_visp/tests/test_geometric.py,sha256=60W1Vv16JtQBnsP5CS10sOksXF8NzfoQDvl46C7fT3U,12536
 dkist_processing_visp/tests/test_instrument_polarization.py,sha256=AntdpdmKtUJmr0VtooucqaMzXwgPqFgChU88_vFUtBU,11853
 dkist_processing_visp/tests/test_lamp.py,sha256=_ibg4ORd_19eORS24zgJZfkOxIdijr1eWKVGHWk-PKY,5212
-dkist_processing_visp/tests/test_make_movie_frames.py,sha256=lZlUZNYmvfNSH8DKOtMByoi0vDYOmGKV3LG1rD3mWOw,2549
-dkist_processing_visp/tests/test_map_repeats.py,sha256=i_niVHsKAFrqk_weisKcU7JAkcfI3muOWFDHQiPyB9A,7511
+dkist_processing_visp/tests/test_make_movie_frames.py,sha256=huQ5n0YneHByKumM_Ye9tekqKeh-F-e6MQoudOP3S-g,2628
+dkist_processing_visp/tests/test_map_repeats.py,sha256=9g3NnvSfn1OqxxYYxTFoOIi1UsCOa6mZjiuGkbxUvTg,7611
 dkist_processing_visp/tests/test_parameters.py,sha256=h9EemGJf0b4ma0jLGd321untkhLkhwgo88mIRnSmxXs,4369
 dkist_processing_visp/tests/test_parse.py,sha256=aFBbLBXdz2KJZy62gC1KC049FFfRKYqYVo-Y32mx_E4,20853
 dkist_processing_visp/tests/test_quality.py,sha256=YW24VjEHoILseFIXZBp4-o7egT26mfT1lafzajVjXu8,6905
-dkist_processing_visp/tests/test_science.py,sha256=eoBH83Mk9pXHdfe_kYWgueLysUkujj2P5nqfa5MibAQ,20182
+dkist_processing_visp/tests/test_science.py,sha256=rIoHu1hifNYj1niQaDkmyID5BQVzTEgZ5BhsdZOSaWk,23985
 dkist_processing_visp/tests/test_solar.py,sha256=Bpkm59HI0GqrwM8LqIK7GR0pUUW0anboJkePQnofgmA,9471
 dkist_processing_visp/tests/test_trial_create_quality_report.py,sha256=t3de9LMJOqrRaFXAvKV_5sotAfzDR8fZVIrFNRB2I_A,2779
 dkist_processing_visp/tests/test_visp_constants.py,sha256=v8meAXdR6jJntaFtWR-N65Z-3ovr9Vf9_-BwAZv2RBc,1974
 dkist_processing_visp/tests/test_workflows.py,sha256=qyWxagIDv-MmVN0u3KFswa5HdaHC6uGeJpvgxvPE30E,287
-dkist_processing_visp/tests/test_write_l1.py,sha256=_RtTE9JRNLKXEw9Nr98BmLInWn3zIh2o6SBj_qv6xh4,6461
+dkist_processing_visp/tests/test_write_l1.py,sha256=ORNKUvF4RPjXc24HgOzyVsP0BCQ9izi54EqXpjLzHXQ,6574
 dkist_processing_visp/tests/local_trial_workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkist_processing_visp/tests/local_trial_workflows/l0_cals_only.py,sha256=1TmvdAn80WKW-2DsuSg9iK6yQ3Urwm9yt5HlVv1dGWE,10649
-dkist_processing_visp/tests/local_trial_workflows/l0_polcals_as_science.py,sha256=CiEBouMAc9lj4sqwjmclS7ryFpr_BkMi-wC5S0F7mmI,17370
+dkist_processing_visp/tests/local_trial_workflows/l0_polcals_as_science.py,sha256=geU6Q8ULfIq4Jmj6ORq8mgXYlF8SYrvgZP-0u-4Uz24,17567
 dkist_processing_visp/tests/local_trial_workflows/l0_solar_gain_as_science.py,sha256=cRrLklazesLBHPPbGzVjBXbEQKaCxQfgy1_AgWyZRyo,15820
 dkist_processing_visp/tests/local_trial_workflows/l0_to_l1.py,sha256=cwEdvUGqqSpp4htrxlmyRN2sZBBvVOjomd66DEqTmTA,15191
-dkist_processing_visp/tests/local_trial_workflows/local_trial_helpers.py,sha256=q7sGn3GlwCB60EBk3Noujfj6n6GuocxxX25348iwfZw,26541
+dkist_processing_visp/tests/local_trial_workflows/local_trial_helpers.py,sha256=eSOuCn7c2DYATq3twu9Gqj7DrLR902p7b5vGlHZ3zxU,26750
 dkist_processing_visp/workflows/__init__.py,sha256=1-GP9tOzjCxLJtyq0ry_x4dPdArfSso8Hxu65ydPpXQ,103
 dkist_processing_visp/workflows/l0_processing.py,sha256=VzTjyS-ywhwATN1Hc17B7tdZOwu3Cv3dUv9l5Ux_vqY,3262
 dkist_processing_visp/workflows/single_task_workflows.py,sha256=LK4dsshM0-lwy79WaMoTplyCxUyINnP9RU74MG_dhyc,33
@@ -85,7 +87,7 @@ docs/requirements_table.rst,sha256=_HIbwFpDooM5n0JjiDAbFozGfJuX13smtcoujLFN4Gk,2
 docs/science_calibration.rst,sha256=VN_g7xSjN-nbXhlBaFnPCbNcsc_Qu0207jEUfRAjnBE,2939
 docs/scientific_changelog.rst,sha256=01AWBSHg8zElnodCgAq-hMxhk9CkX5rtEENx4iz0sjI,300
 licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
-dkist_processing_visp-3.6.2.dist-info/METADATA,sha256=cmUCBaNYTqGxhJ1OcmAT1kB8enj-4SlnlpEQwg8Sj7A,29121
-dkist_processing_visp-3.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dkist_processing_visp-3.6.2.dist-info/top_level.txt,sha256=9GHSn-ZMGQxaRNGrPP3HNc5ZkE7ftzluO74Jz5vUSTE,46
-dkist_processing_visp-3.6.2.dist-info/RECORD,,
+dkist_processing_visp-4.0.0.dist-info/METADATA,sha256=4S8qtlI-Cp12PpvTDgD0ZgSA2ZaaOp0QnHtC94RZ4Ak,29073
+dkist_processing_visp-4.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dkist_processing_visp-4.0.0.dist-info/top_level.txt,sha256=9GHSn-ZMGQxaRNGrPP3HNc5ZkE7ftzluO74Jz5vUSTE,46
+dkist_processing_visp-4.0.0.dist-info/RECORD,,