dkist-processing-visp 4.0.0rc1__tar.gz → 5.0.0rc1__tar.gz

{dkist_processing_visp-4.0.0rc1 → dkist_processing_visp-5.0.0rc1}/CHANGELOG.rst

@@ -1,3 +1,19 @@
+v4.0.0 (2025-11-12)
+===================
+
+Bugfixes
+--------
+
+- Change how interpolations are done by copying edge pixels as opposed to reflecting them when filling gaps left behind by shifts. This will eliminate "ghost" lines. (`#235 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/235>`__)
+- Update how edges are cropped in areas where both beams did not contribute to the L1 data array. The wrong edges were being cropped before. (`#242 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/242>`__)
+
+
+Misc
+----
+
+- Replace L1 frame pixels with NaNs where the source data comes from a single beam. (`#235 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/235>`__)
+
+
 v3.6.3 (2025-11-04)
 ===================
 

{dkist_processing_visp-4.0.0rc1 → dkist_processing_visp-5.0.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-visp
-Version: 4.0.0rc1
+Version: 5.0.0rc1
 Summary: Science processing code for the ViSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -13,13 +13,14 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
-Requires-Dist: dkist-processing-common==11.8.0
+Requires-Dist: dkist-processing-common==11.8.1rc2
 Requires-Dist: dkist-processing-math==2.2.1
 Requires-Dist: dkist-processing-pac==3.1.1
 Requires-Dist: dkist-header-validator==5.2.1
 Requires-Dist: dkist-fits-specifications==4.17.0
 Requires-Dist: dkist-service-configuration==4.1.7
 Requires-Dist: dkist-spectral-lines==3.0.0
+Requires-Dist: solar-wavelength-calibration==2.0.0rc3
 Requires-Dist: astropy==7.0.2
 Requires-Dist: numpy==2.2.5
 Requires-Dist: sunpy==6.1.1
@@ -116,19 +117,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.66; extra == "frozen"
-Requires-Dist: botocore==1.40.66; 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"
@@ -148,11 +149,11 @@ Requires-Dist: dacite==1.9.2; extra == "frozen"
 Requires-Dist: decorator==5.2.1; extra == "frozen"
 Requires-Dist: dill==0.4.0; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.2.1; extra == "frozen"
-Requires-Dist: dkist-processing-common==11.8.0; extra == "frozen"
+Requires-Dist: dkist-processing-common==11.8.1rc2; 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==4.0.0rc1; extra == "frozen"
+Requires-Dist: dkist-processing-visp==5.0.0rc1; 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"
@@ -165,7 +166,7 @@ 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.20251105; extra == "frozen"
-Requires-Dist: googleapis-common-protos==1.71.0; 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"
@@ -255,7 +256,7 @@ 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.4; extra == "frozen"
-Requires-Dist: pydantic-settings==2.11.0; 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"
@@ -281,7 +282,7 @@ Requires-Dist: semantic-version==2.10.0; extra == "frozen"
 Requires-Dist: setproctitle==1.3.7; extra == "frozen"
 Requires-Dist: six==1.17.0; extra == "frozen"
 Requires-Dist: sniffio==1.3.1; extra == "frozen"
-Requires-Dist: solar-wavelength-calibration==1.0.1; extra == "frozen"
+Requires-Dist: solar-wavelength-calibration==2.0.0rc3; extra == "frozen"
 Requires-Dist: sqids==0.5.1; extra == "frozen"
 Requires-Dist: sqlparse==0.5.3; extra == "frozen"
 Requires-Dist: sunpy==6.1.1; extra == "frozen"
@@ -300,7 +301,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-4.0.0rc1 → dkist_processing_visp-5.0.0rc1}/SCIENCE_CHANGELOG.rst

@@ -1,3 +1,13 @@
+v4.0.0 (2025-11-12)
+===================
+
+
+
+
+- Change how interpolations are done by copying edge pixels as opposed to reflecting them when filling gaps left behind by shifts. This will eliminate "ghost" lines. Replace L1 frame pixels with NaNs where the source data comes from a single beam. (`#235 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/235>`__)
+- Update how edges are cropped in areas where both beams did not contribute to the L1 data array. The wrong edges were being cropped before. (`#242 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/242>`__)
+
+
 v3.0.0 (2025-04-01)
 ===================
 

dkist_processing_visp-5.0.0rc1/changelog/246.doc.2.rst

@@ -0,0 +1,2 @@
+Add intersphinx mappings for `lmfit <https://lmfit.github.io/lmfit-py/>`_ and `scikit-learn <https://scikit-learn.org/stable/>`_
+for linking bliss.

dkist_processing_visp-5.0.0rc1/changelog/246.doc.rst

@@ -0,0 +1,2 @@
+Update the online doc page for `gain calibration <https://docs.dkist.nso.edu/projects/visp/en/stable/gain_correction.html>`_
+to reflect the updates to the Solar Gain task.

dkist_processing_visp-5.0.0rc1/changelog/246.feature.2.rst

@@ -0,0 +1 @@
+Only compute a single lamp gain for each beam. In the past a single map gain was also computed for each modulation state.

dkist_processing_visp-5.0.0rc1/changelog/246.feature.3.rst

@@ -0,0 +1 @@
+Add Buds to parse the spectrograph setup into pipeline constants to be used when fitting a solar atlas.

dkist_processing_visp-5.0.0rc1/changelog/246.feature.4.rst

@@ -0,0 +1 @@
+Add quality report metrics that show the quality of the vignette estimation in the Solar Gain tasks.

dkist_processing_visp-5.0.0rc1/changelog/246.feature.rst

@@ -0,0 +1,4 @@
+Update the Solar Gain task to measure vignetting signal, compute a single gain for each beam (as opposed to for each beam and modulator state),
+and stop applying residual spectral shifts to the characteristic spectra before removing from the input gain array.
+See the `Science Changelog <https://docs.dkist.nso.edu/projects/visp/en/stable/scientific_changelog.html>`_ and
+`gain algorithm docs <https://docs.dkist.nso.edu/projects/visp/en/stable/gain_correction.html>`_ for more information.

dkist_processing_visp-5.0.0rc1/changelog/246.misc.2.rst

@@ -0,0 +1 @@
+Remove the `LineZonesMixin` and move its methods directly to the Geometric calibration task, which is now the only task that uses them.

dkist_processing_visp-5.0.0rc1/changelog/246.misc.3.rst

@@ -0,0 +1 @@
+Rename the ``solar_spectral_avg_window`` to ``solar_spatial_median_filter_width_px`` to more accurately capture what it does.

dkist_processing_visp-5.0.0rc1/changelog/246.misc.rst

@@ -0,0 +1,2 @@
+Rename all line-zone parameters to be "geo_" parameters instead of "solar_" parameters. These parameters are now only used in the
+Geometric calibration task.

dkist_processing_visp-5.0.0rc1/changelog/246.science.rst

@@ -0,0 +1,11 @@
+Major update to the gain algorithm to mitigate polarization artifacts in L1 science frames. This change can be split into
+three parts. See the `gain correction <https://docs.dkist.nso.edu/projects/visp/en/stable/gain_correction.html>`_ page for more information.
+
+#. Compute a single gain correction image for each beam. In the past we had computed a separate gain image for each modstate as well, but this was found to couple residual polarization structure into the final science frames.
+
+#. Stop "refining" (i.e., applying small spectral offsets to) the characteristic solar spectrum on a per-spatial-pixel basis. This was initially done to minimize line residuals in Telluric lines but was found to have a more-negative on polarimetric residuals.
+
+#. Separate vignetting caused by aperture masks from the solar signal used to remove spectral lines in the final gain image. This is done by fitting a solar atlas and taking the deviation in continuum to be the vignetting signal.
+
+Computing a single gain per beam will greatly reduce the polarization artifacts in L1 data. Measuring the vignette
+signal directly will further reduce these artifacts and improve flatness across the array.

{dkist_processing_visp-4.0.0rc1 → dkist_processing_visp-5.0.0rc1}/dkist_processing_visp/models/constants.py

@@ -2,12 +2,15 @@
 
 from enum import Enum
 
+import astropy.units as u
+from astropy.units import Quantity
 from dkist_processing_common.models.constants import ConstantsBase
 
 
 class VispBudName(Enum):
     """Names to be used in Visp buds."""
 
+    arm_id = "ARM_ID"
     num_raster_steps = "NUM_RASTER_STEPS"
     polarimeter_mode = "POLARIMETER_MODE"
     wavelength = "WAVELENGTH"
@@ -22,6 +25,10 @@ class VispBudName(Enum):
     polcal_readout_exp_times = "POLCAL_READOUT_EXP_TIMES"
     non_dark_task_readout_exp_times = "NON_DARK_TASK_READOUT_EXP_TIMES"
     num_map_scans = "NUM_MAP_SCANS"
+    incident_light_angle_deg = "INCIDENT_LIGHT_ANGLE_DEG"
+    reflected_light_angle_deg = "REFLECTED_LIGHT_ANGLE_DEG"
+    grating_constant_inverse_mm = "GRATING_CONSTANT_INVERSE_MM"
+    solar_gain_ip_start_time = "SOLAR_GAIN_IP_START_TIME"
     axis_1_type = "AXIS_1_TYPE"
     axis_2_type = "AXIS_2_TYPE"
     axis_3_type = "AXIS_3_TYPE"
@@ -31,6 +38,16 @@ class VispBudName(Enum):
 class VispConstants(ConstantsBase):
     """Visp specific constants to add to the common constants."""
 
+    @property
+    def arm_id(self) -> str:
+        """
+        Return the current ViSP arm ID.
+
+        Arm IDs are ints in the headers, but we convert them to str here because that's what downstream machinery expects
+        the type to be.
+        """
+        return str(self._db_dict[VispBudName.arm_id])
+
     @property
     def wavelength(self) -> float:
         """Wavelength."""
@@ -76,17 +93,17 @@ class VispConstants(ConstantsBase):
                 raise ValueError(f"No init set known for {retarder_name = }")
 
     @property
-    def lamp_exposure_times(self) -> [float]:
+    def lamp_exposure_times(self) -> list[float]:
         """Find the lamp exposure time."""
         return self._db_dict[VispBudName.lamp_exposure_times.value]
 
     @property
-    def solar_exposure_times(self) -> [float]:
+    def solar_exposure_times(self) -> list[float]:
         """Find the solar exposure time."""
         return self._db_dict[VispBudName.solar_exposure_times.value]
 
     @property
-    def polcal_exposure_times(self) -> [float]:
+    def polcal_exposure_times(self) -> list[float]:
         """Find the polarization calibration exposure time."""
         if self.correct_for_polarization:
             return self._db_dict[VispBudName.polcal_exposure_times.value]
@@ -94,22 +111,22 @@ class VispConstants(ConstantsBase):
             return []
 
     @property
-    def observe_exposure_times(self) -> [float]:
+    def observe_exposure_times(self) -> list[float]:
         """Find the observation exposure time."""
         return self._db_dict[VispBudName.observe_exposure_times.value]
 
     @property
-    def lamp_readout_exp_times(self) -> [float]:
+    def lamp_readout_exp_times(self) -> list[float]:
         """Find the lamp readout exposure time."""
         return self._db_dict[VispBudName.lamp_readout_exp_times.value]
 
     @property
-    def solar_readout_exp_times(self) -> [float]:
+    def solar_readout_exp_times(self) -> list[float]:
         """Find the solar readout exposure time."""
         return self._db_dict[VispBudName.solar_readout_exp_times.value]
 
     @property
-    def polcal_readout_exp_times(self) -> [float]:
+    def polcal_readout_exp_times(self) -> list[float]:
         """Find the polarization calibration readout exposure time."""
         if self.correct_for_polarization:
             return self._db_dict[VispBudName.polcal_readout_exp_times.value]
@@ -117,7 +134,7 @@ class VispConstants(ConstantsBase):
             return []
 
     @property
-    def non_dark_task_readout_exp_times(self) -> [float]:
+    def non_dark_task_readout_exp_times(self) -> list[float]:
         """
         Find all readout exposure times that *need* to exist in a dark IP.
 
@@ -127,10 +144,34 @@ class VispConstants(ConstantsBase):
         return self._db_dict[VispBudName.non_dark_task_readout_exp_times.value]
 
     @property
-    def observe_readout_exp_times(self) -> [float]:
+    def observe_readout_exp_times(self) -> list[float]:
         """Find the observation readout exposure time."""
         return self._db_dict[VispBudName.observe_readout_exp_times.value]
 
+    @property
+    def incident_light_angle_deg(self) -> Quantity:
+        """Return the spectrograph incident light angle [deg]."""
+        return self._db_dict[VispBudName.incident_light_angle_deg] * u.deg
+
+    @property
+    def reflected_light_angle_deg(self) -> Quantity:
+        """
+        Return the spectrograph reflected light angle [deg].
+
+        This angle is the incident light angle plus the angular position of the ViSP arm.
+        """
+        return self._db_dict[VispBudName.reflected_light_angle_deg] * u.deg
+
+    @property
+    def grating_constant_inverse_mm(self) -> Quantity:
+        """Return the spectrograph grating constant [1/mm]."""
+        return self._db_dict[VispBudName.grating_constant_inverse_mm] / u.mm
+
+    @property
+    def solar_gain_ip_start_time(self) -> str:
+        """Return the start time of the SOLAR GAIN Instrument Program."""
+        return self._db_dict[VispBudName.solar_gain_ip_start_time]
+
     @property
     def axis_1_type(self) -> str:
         """Find the type of the first array axis."""

{dkist_processing_visp-4.0.0rc1 → dkist_processing_visp-5.0.0rc1}/dkist_processing_visp/models/fits_access.py

@@ -6,11 +6,15 @@ from enum import StrEnum
 class VispMetadataKey(StrEnum):
     """Controlled list of names for FITS metadata header keys."""
 
+    arm_id = "VSPARMID"
+    number_of_modulator_states = "VSPNUMST"
     raster_scan_step = "VSPSTP"
     total_raster_steps = "VSPNSTP"
     modulator_state = "VSPSTNUM"
-    number_of_modulator_states = "VSPNUMST"
     polarimeter_mode = "VISP_006"
+    grating_angle_deg = "VSPGRTAN"
+    arm_position_deg = "VSPARMPS"
+    grating_constant_inverse_mm = "VSPGRTCN"
     axis_1_type = "CTYPE1"
     axis_2_type = "CTYPE2"
     axis_3_type = "CTYPE3"

dkist_processing_visp-5.0.0rc1/dkist_processing_visp/models/metric_code.py

@@ -0,0 +1,10 @@
+"""Controlled list of quality metric codes."""
+
+from enum import StrEnum
+
+
+class VispMetricCode(StrEnum):
+    """Controlled list of quality metric codes."""
+
+    solar_first_vignette = "SOLAR_CAL_FIRST_VIGNETTE"
+    solar_final_vignette = "SOLAR_CAL_FINAL_VIGNETTE"

{dkist_processing_visp-4.0.0rc1 → dkist_processing_visp-5.0.0rc1}/dkist_processing_visp/models/parameters.py

@@ -1,9 +1,13 @@
 """Visp calibration pipeline parameters."""
 
 from datetime import datetime
+from typing import Any
 
+import astropy.units as u
+from dkist_processing_common.models.parameters import ParameterArmIdMixin
 from dkist_processing_common.models.parameters import ParameterBase
 from dkist_processing_common.models.parameters import ParameterWavelengthMixin
+from solar_wavelength_calibration import DownloadConfig
 
 
 class VispParsingParameters(ParameterBase):
@@ -22,7 +26,7 @@ class VispParsingParameters(ParameterBase):
         )
 
 
-class VispParameters(ParameterBase, ParameterWavelengthMixin):
+class VispParameters(ParameterBase, ParameterWavelengthMixin, ParameterArmIdMixin):
     """Put all Visp parameters parsed from the input dataset document in a single property."""
 
     @property
@@ -69,7 +73,7 @@ class VispParameters(ParameterBase, ParameterWavelengthMixin):
 
     @property
     def hairline_mask_spatial_smoothing_width_px(self) -> float:
-        """Amount to smooth the hairling mask in the spatial direction.
+        """Amount to smooth the hairline mask in the spatial direction.
 
         This helps capture the higher-flux wings of the hairlines that would otherwise require a `hairline_fraction`
         that was so low it captures other optical features.
@@ -134,9 +138,34 @@ class VispParameters(ParameterBase, ParameterWavelengthMixin):
         return self._find_most_recent_past_value("visp_geo_poly_fit_order")
 
     @property
-    def solar_spectral_avg_window(self):
+    def geo_zone_prominence(self):
+        """Relative peak prominence threshold used to identify strong spectral features."""
+        return self._find_parameter_closest_wavelength("visp_geo_zone_prominence")
+
+    @property
+    def geo_zone_width(self):
+        """Pixel width used to search for strong spectral features."""
+        return self._find_parameter_closest_wavelength("visp_geo_zone_width")
+
+    @property
+    def geo_zone_bg_order(self):
+        """Order of polynomial fit used to remove continuum when identifying strong spectral features."""
+        return self._find_parameter_closest_wavelength("visp_geo_zone_bg_order")
+
+    @property
+    def geo_zone_normalization_percentile(self):
+        """Fraction of CDF to use for normalizing spectrum when search for strong features."""
+        return self._find_parameter_closest_wavelength("visp_geo_zone_normalization_percentile")
+
+    @property
+    def geo_zone_rel_height(self):
+        """Relative height at which to compute the width of strong spectral features."""
+        return self._find_most_recent_past_value("visp_geo_zone_rel_height")
+
+    @property
+    def solar_spatial_median_filter_width_px(self):
         """Pixel width of spatial median filter used to compute characteristic solar spectra."""
-        return self._find_parameter_closest_wavelength("visp_solar_spectral_avg_window")
+        return self._find_parameter_closest_wavelength("visp_solar_spatial_median_filter_width_px")
 
     @property
     def solar_characteristic_spatial_normalization_percentile(self) -> float:
@@ -146,29 +175,73 @@ class VispParameters(ParameterBase, ParameterWavelengthMixin):
         )
 
     @property
-    def solar_zone_prominence(self):
-        """Relative peak prominence threshold used to identify strong spectral features."""
-        return self._find_parameter_closest_wavelength("visp_solar_zone_prominence")
+    def solar_vignette_initial_continuum_poly_fit_order(self) -> int:
+        """
+        Define the order of polynomial to use when fitting the initial continuum function.
+
+        Note that "initial" in this context does not refer to an initial guess in the wavecal fitter, but rather the
+        fact that this represents the initial estimate of the vignette signal.
+        """
+        return self._find_most_recent_past_value(
+            "visp_solar_vignette_initial_continuum_poly_fit_order"
+        )
 
     @property
-    def solar_zone_width(self):
-        """Pixel width used to search for strong spectral features."""
-        return self._find_parameter_closest_wavelength("visp_solar_zone_width")
+    def solar_vignette_wavecal_fit_kwargs(self) -> dict[str, Any]:
+        """Define extra keyword arguments to pass to the wavelength calibration fitter."""
+        return self._find_most_recent_past_value("visp_solar_vignette_wavecal_fit_kwargs")
 
     @property
-    def solar_zone_bg_order(self):
-        """Order of polynomial fit used to remove continuum when identifying strong spectral features."""
-        return self._find_parameter_closest_wavelength("visp_solar_zone_bg_order")
+    def solar_vignette_spectral_poly_fit_order(self) -> int:
+        """Define the order of spectral polynomial used when computing the full, 2D vignette signal."""
+        return self._find_most_recent_past_value("visp_solar_vignette_spectral_poly_fit_order")
 
     @property
-    def solar_zone_normalization_percentile(self):
-        """Fraction of CDF to use for normalzing spectrum when search for strong features."""
-        return self._find_parameter_closest_wavelength("visp_solar_zone_normalization_percentile")
+    def solar_vignette_min_samples(self) -> float:
+        """Return fractional number of samples required for the RANSAC regressor used to fit the 2D vignette signal."""
+        return self._find_most_recent_past_value("visp_solar_vignette_min_samples")
 
     @property
-    def solar_zone_rel_height(self):
-        """Relative height at which to compute the width of strong spectral features."""
-        return self._find_most_recent_past_value("visp_solar_zone_rel_height")
+    def wavecal_camera_lens_parameters(self) -> list[u.Quantity]:
+        r"""
+        Define the 2nd order polynomial coefficients for computing the total camera focal length as a function of wavelength.
+
+        The total focal length of the lens is :math:`f = a_0 + a_1\lambda + a_2\lambda^2` where this property is
+        :math:`[a_0, a_1, a_2]`
+        """
+        value_list = self._find_parameter_for_arm("visp_wavecal_camera_lens_parameters")
+        unit_list = [u.m, u.m / u.nm, u.m / u.nm**2]
+        return [v * u for v, u in zip(value_list, unit_list)]
+
+    @property
+    def wavecal_pixel_pitch_micron_per_pix(self) -> u.Quantity:
+        """Define the physical size of ViSP detector pixels."""
+        return (
+            self._find_most_recent_past_value("visp_wavecal_pixel_pitch_micron_per_pix")
+            * u.micron
+            / u.pix
+        )
+
+    @property
+    def wavecal_atlas_download_config(self) -> DownloadConfig:
+        """Define the `~solar_wavelength_calibration.DownloadConfig` used to grab the Solar atlas used for wavelength calibration."""
+        config_dict = self._find_most_recent_past_value("visp_wavecal_atlas_download_config")
+        return DownloadConfig.model_validate(config_dict)
+
+    @property
+    def wavecal_init_resolving_power(self) -> int:
+        """Define the initial guess for ViSP resolving power in wavecal fits."""
+        return self._find_most_recent_past_value("visp_wavecal_init_resolving_power")
+
+    @property
+    def wavecal_init_straylight_fraction(self) -> float:
+        """Define the initial guess for straylight fraction in wavecal fits."""
+        return self._find_most_recent_past_value("visp_wavecal_init_straylight_fraction")
+
+    @property
+    def wavecal_init_opacity_factor(self) -> float:
+        """Define the initial guess for opacity factor in wavecal fits."""
+        return self._find_most_recent_past_value("visp_wavecal_init_opacity_factor")
 
     @property
     def polcal_spatial_median_filter_width_px(self) -> int:

dkist_processing_visp-5.0.0rc1/dkist_processing_visp/parsers/spectrograph_configuration.py

@@ -0,0 +1,75 @@
+"""Buds for parsing the incident and reflected light angles of the ViSP spectrograph."""
+
+from dkist_processing_common.models.flower_pot import SpilledDirt
+from dkist_processing_common.models.flower_pot import Stem
+from dkist_processing_common.models.task_name import TaskName
+from dkist_processing_common.parsers.task import parse_header_ip_task_with_gains
+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
+from dkist_processing_visp.parsers.visp_l0_fits_access import VispL0FitsAccess
+
+
+def convert_grating_angle_to_incident_light_angle(grating_angle: float) -> float:
+    """Convert the raw header "grating angle" to the incident light angle expected by the solar wavecal library."""
+    return -1 * grating_angle
+
+
+class IncidentLightAngleBud(TaskUniqueBud):
+    """Special case of `TaskUniqueBud` so we can apply the sign shift to the header incident light angle values."""
+
+    def __init__(self):
+        super().__init__(
+            constant_name=VispBudName.incident_light_angle_deg.value,
+            metadata_key=VispMetadataKey.grating_angle_deg,
+            ip_task_types=[TaskName.observe.value, TaskName.solar_gain.value],
+            task_type_parsing_function=parse_header_ip_task_with_gains,
+        )
+
+    def setter(self, fits_obj: VispL0FitsAccess) -> float | type[SpilledDirt]:
+        """Apply a sign flip to the raw header value for incident light angle."""
+        grating_angle = super().setter(fits_obj)
+
+        if grating_angle is SpilledDirt:
+            return grating_angle
+
+        return convert_grating_angle_to_incident_light_angle(grating_angle)
+
+
+class ReflectedLightAngleBud(Stem):
+    """Bud that combines the incident light angle and arm position header values to compute the reflected light angle."""
+
+    key_to_petal_dict: dict[str, float]
+
+    def __init__(self):
+        super().__init__(stem_name=VispBudName.reflected_light_angle_deg.value)
+        self.ip_task_types = [
+            task.casefold() for task in [TaskName.observe.value, TaskName.solar_gain.value]
+        ]
+
+    def setter(self, fits_obj: VispL0FitsAccess) -> float | type[SpilledDirt]:
+        """
+        Compute the reflected light angle.
+
+        The reflected light angle is `-1 * fits_objs.grating_angle_deg + fits_obj.arm_position_deg`.
+        """
+        task = parse_header_ip_task_with_gains(fits_obj)
+
+        if task.casefold() in self.ip_task_types:
+            incident_light_angle = convert_grating_angle_to_incident_light_angle(
+                fits_obj.grating_angle_deg
+            )
+            arm_position = fits_obj.arm_position_deg
+            return incident_light_angle + arm_position
+
+        return SpilledDirt
+
+    def getter(self, key: str) -> float:
+        """Get the value for the reflected light angle and raise an error if it is not unique."""
+        value_set = set(self.key_to_petal_dict.values())
+        if len(value_set) > 1:
+            raise ValueError(
+                f"Multiple {self.stem_name} values found for key {key}. Values: {value_set}"
+            )
+        return value_set.pop()

{dkist_processing_visp-4.0.0rc1 → dkist_processing_visp-5.0.0rc1}/dkist_processing_visp/parsers/visp_l0_fits_access.py

@@ -32,6 +32,7 @@ class VispL0FitsAccess(L0FitsAccess):
     ):
         super().__init__(hdu=hdu, name=name, auto_squeeze=auto_squeeze)
 
+        self.arm_id: int = self.header[VispMetadataKey.arm_id]
         self.number_of_modulator_states: int = self.header[
             VispMetadataKey.number_of_modulator_states
         ]
@@ -39,6 +40,11 @@ class VispL0FitsAccess(L0FitsAccess):
         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.grating_angle_deg: float = self.header[VispMetadataKey.grating_angle_deg]
+        self.arm_position_deg: float = self.header[VispMetadataKey.arm_position_deg]
+        self.grating_constant_inverse_mm: float = self.header[
+            VispMetadataKey.grating_constant_inverse_mm
+        ]
         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]