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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-visp
-Version: 5.0.0rc1
+Version: 5.0.0rc3
 Summary: Science processing code for the ViSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -13,14 +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.1rc2
+Requires-Dist: dkist-processing-common==11.8.1rc3
 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: solar-wavelength-calibration==2.0.0rc4
 Requires-Dist: astropy==7.0.2
 Requires-Dist: numpy==2.2.5
 Requires-Dist: sunpy==6.1.1
@@ -95,44 +95,44 @@ Requires-Dist: aiohappyeyeballs==2.6.1; extra == "frozen"
 Requires-Dist: aiohttp==3.13.2; extra == "frozen"
 Requires-Dist: aiosignal==1.4.0; extra == "frozen"
 Requires-Dist: aiosmtplib==5.0.0; extra == "frozen"
-Requires-Dist: alembic==1.17.1; extra == "frozen"
+Requires-Dist: alembic==1.17.2; extra == "frozen"
 Requires-Dist: amqp==5.3.1; extra == "frozen"
 Requires-Dist: annotated-types==0.7.0; extra == "frozen"
 Requires-Dist: anyio==4.11.0; extra == "frozen"
 Requires-Dist: apache-airflow==2.11.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-celery==3.10.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-compat==1.8.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-io==1.6.4; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-sql==1.28.2; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-compat==1.9.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-io==1.6.5; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-sql==1.29.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-fab==1.5.3; extra == "frozen"
-Requires-Dist: apache-airflow-providers-ftp==3.13.2; extra == "frozen"
-Requires-Dist: apache-airflow-providers-http==5.4.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-imap==3.9.3; extra == "frozen"
-Requires-Dist: apache-airflow-providers-postgres==6.4.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-smtp==2.3.1; extra == "frozen"
-Requires-Dist: apache-airflow-providers-sqlite==4.1.2; extra == "frozen"
+Requires-Dist: apache-airflow-providers-ftp==3.13.3; extra == "frozen"
+Requires-Dist: apache-airflow-providers-http==5.5.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-imap==3.9.4; extra == "frozen"
+Requires-Dist: apache-airflow-providers-postgres==6.4.1; extra == "frozen"
+Requires-Dist: apache-airflow-providers-smtp==2.3.2; extra == "frozen"
+Requires-Dist: apache-airflow-providers-sqlite==4.1.3; extra == "frozen"
 Requires-Dist: apispec==6.8.4; extra == "frozen"
 Requires-Dist: argcomplete==3.6.3; extra == "frozen"
 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: asgiref==3.11.0; 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.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: billiard==4.2.3; extra == "frozen"
 Requires-Dist: blinker==1.9.0; extra == "frozen"
-Requires-Dist: boto3==1.40.71; extra == "frozen"
-Requires-Dist: botocore==1.40.71; extra == "frozen"
+Requires-Dist: boto3==1.41.1; extra == "frozen"
+Requires-Dist: botocore==1.41.1; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
 Requires-Dist: celery==5.3.1; 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"
+Requires-Dist: click==8.3.1; extra == "frozen"
 Requires-Dist: click-didyoumean==0.3.1; extra == "frozen"
 Requires-Dist: click-plugins==1.1.1.2; extra == "frozen"
 Requires-Dist: click-repl==0.3.0; extra == "frozen"
@@ -149,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.1rc2; extra == "frozen"
+Requires-Dist: dkist-processing-common==11.8.1rc3; 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==5.0.0rc1; extra == "frozen"
+Requires-Dist: dkist-processing-visp==5.0.0rc3; 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"
@@ -251,7 +251,7 @@ Requires-Dist: proglog==0.1.12; extra == "frozen"
 Requires-Dist: prometheus_client==0.23.1; extra == "frozen"
 Requires-Dist: prompt_toolkit==3.0.52; extra == "frozen"
 Requires-Dist: propcache==0.4.1; extra == "frozen"
-Requires-Dist: protobuf==6.33.0; extra == "frozen"
+Requires-Dist: protobuf==6.33.1; 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"
@@ -273,8 +273,8 @@ Requires-Dist: requests-toolbelt==1.0.0; extra == "frozen"
 Requires-Dist: rfc3339-validator==0.1.4; extra == "frozen"
 Requires-Dist: rich==13.9.4; extra == "frozen"
 Requires-Dist: rich-argparse==1.7.2; extra == "frozen"
-Requires-Dist: rpds-py==0.28.0; extra == "frozen"
-Requires-Dist: s3transfer==0.14.0; extra == "frozen"
+Requires-Dist: rpds-py==0.29.0; extra == "frozen"
+Requires-Dist: s3transfer==0.15.0; extra == "frozen"
 Requires-Dist: scikit-image==0.25.2; extra == "frozen"
 Requires-Dist: scikit-learn==1.6.1; extra == "frozen"
 Requires-Dist: scipy==1.15.3; extra == "frozen"
@@ -282,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==2.0.0rc3; extra == "frozen"
+Requires-Dist: solar-wavelength-calibration==2.0.0rc4; 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"
@@ -301,14 +301,14 @@ 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.5; extra == "frozen"
+Requires-Dist: universal_pathlib==0.3.6; 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"
 Requires-Dist: wcwidth==0.2.14; extra == "frozen"
 Requires-Dist: wirerope==1.0.0; extra == "frozen"
 Requires-Dist: wrapt==1.17.3; extra == "frozen"
-Requires-Dist: yamale==6.0.0; extra == "frozen"
+Requires-Dist: yamale==6.1.0; extra == "frozen"
 Requires-Dist: yarl==1.22.0; extra == "frozen"
 Requires-Dist: zipp==3.23.0; extra == "frozen"
 

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

@@ -186,6 +186,25 @@ class VispParameters(ParameterBase, ParameterWavelengthMixin, ParameterArmIdMixi
             "visp_solar_vignette_initial_continuum_poly_fit_order"
         )
 
+    @property
+    def solar_vignette_crval_bounds_px(self) -> float:
+        """
+        Define the bounds (in *pixels*) on crval when fitting the initial vignette signal.
+
+        The actual bounds on the value of crval are equal to ± the initial dispersion times this number. Note that the
+        total range searched by the fitting algorithm will be twice this number (in pixels).
+        """
+        return self._find_most_recent_past_value("visp_solar_vignette_crval_bounds_px") * u.pix
+
+    @property
+    def solar_vignette_dispersion_bounds_fraction(self) -> float:
+        """
+        Define the ± fraction away from the initial value for bounds on dispersion when fitting the initial vignette signal.
+
+        This value should be between 0 and 1. For example, the minimum bound is `init_value * (1 - solar_vignette_dispersion_bounds_fraction)`.
+        """
+        return self._find_most_recent_past_value("visp_solar_vignette_dispersion_bounds_fraction")
+
     @property
     def solar_vignette_wavecal_fit_kwargs(self) -> dict[str, Any]:
         """Define extra keyword arguments to pass to the wavelength calibration fitter."""
@@ -228,6 +247,13 @@ class VispParameters(ParameterBase, ParameterWavelengthMixin, ParameterArmIdMixi
         config_dict = self._find_most_recent_past_value("visp_wavecal_atlas_download_config")
         return DownloadConfig.model_validate(config_dict)
 
+    @property
+    def wavecal_init_crval_guess_normalization_percentile(self) -> float | None:
+        """Define the CDF percentage used to normalize the Atlas to the input spectrum level when computing an initial CRVAL guess."""
+        return self._find_most_recent_past_value(
+            "visp_wavecal_init_crval_guess_normalization_percentile"
+        )
+
     @property
     def wavecal_init_resolving_power(self) -> int:
         """Define the initial guess for ViSP resolving power in wavecal fits."""

{dkist_processing_visp-5.0.0rc1 → dkist_processing_visp-5.0.0rc3}/dkist_processing_visp/tasks/l1_output_data.py

@@ -132,6 +132,7 @@ class VispAssembleQualityData(AssembleQualityData):
             description="These plots show the solar atlas fit used to estimate the initial, 1D spectral vignette "
             "present in solar gain frames. The vignette signature is taken to be the fit continuum shown.",
             metric_code=VispMetricCode.solar_first_vignette,
+            facet=self._format_facet(f"Beam {beam}"),
             multi_plot_data=full_plot,
         )
 
@@ -208,6 +209,7 @@ class VispAssembleQualityData(AssembleQualityData):
             "The 5th and 9th percentile ranges show how stable this spectrum is along the spatial dimension "
             "after removing the vignette signal.",
             metric_code=VispMetricCode.solar_final_vignette,
+            facet=self._format_facet(f"Beam {beam}"),
             multi_plot_data=full_plot,
         )
 

{dkist_processing_visp-5.0.0rc1 → dkist_processing_visp-5.0.0rc3}/dkist_processing_visp/tasks/solar.py

@@ -70,6 +70,7 @@ class WavelengthCalibrationParametersWithContinuum(WavelengthCalibrationParamete
 
     continuum_poly_fit_order: int
     normalized_abscissa: np.ndarray
+    zeroth_order_continuum_coefficient: float
 
     @property
     def continuum_function(self) -> Callable[[np.ndarray, Parameters], np.ndarray]:
@@ -93,16 +94,26 @@ class WavelengthCalibrationParametersWithContinuum(WavelengthCalibrationParamete
         #       dynamically create the required number of "poly_coeff_{o:02n}" fields. Sorry if this bites you!
         params = super().lmfit_parameters
         for o in range(self.continuum_poly_fit_order + 1):
+            # `np.polyval` uses its input coefficient list "backwards", so `poly_coeff_{self.continuum_poly_fit_order}`
+            # is the 0th order polynomial term.
             params.add(
                 f"poly_coeff_{o:02n}",
                 vary=True,
-                value=o // self.continuum_poly_fit_order,
+                value=(
+                    self.zeroth_order_continuum_coefficient
+                    if o == self.continuum_poly_fit_order
+                    else 0
+                ),
                 min=-1,
                 max=1,
             )
 
-        params[f"poly_coeff_{self.continuum_poly_fit_order:02n}"].min = 0.7
-        params[f"poly_coeff_{self.continuum_poly_fit_order:02n}"].max = 1.3
+        params[f"poly_coeff_{self.continuum_poly_fit_order:02n}"].min = (
+            self.zeroth_order_continuum_coefficient * 0.5
+        )
+        params[f"poly_coeff_{self.continuum_poly_fit_order:02n}"].max = (
+            self.zeroth_order_continuum_coefficient * 1.5
+        )
 
         # Remove the default continuum parameterization
         del params["continuum_level"]
@@ -551,9 +562,19 @@ class SolarCalibration(
 
         fitter = WavelengthCalibrationFitter(input_parameters=init_parameters, atlas=atlas)
         with self.telemetry_span("Fit atlas and continuum"):
+            rng_kwarg = dict()
+            fitting_method = self.parameters.solar_vignette_wavecal_fit_kwargs.get("method", False)
+            if fitting_method in ["basinhopping", "differential_evolution", "dual_annealing"]:
+                # For methods that support the `rng` kwarg we use the recipe run id as the rng seed
+                rng = self.recipe_run_id
+                rng_kwarg["rng"] = rng
+
+            # The order here allows us to override the default `rng` (above) in a parameter value
+            extra_kwargs = rng_kwarg | self.parameters.solar_vignette_wavecal_fit_kwargs
+            logger.info(f"Calling fitter with extra kwargs: {extra_kwargs}")
             fit_result = fitter(
                 input_spectrum=representative_spectrum,
-                **self.parameters.solar_vignette_wavecal_fit_kwargs,
+                **extra_kwargs,
             )
 
         return fit_result
@@ -610,6 +631,7 @@ class SolarCalibration(
             negative_limit=-wavelength_range / 2,
             positive_limit=wavelength_range / 2,
             num_steps=500,
+            normalization_percentile=self.parameters.wavecal_init_crval_guess_normalization_percentile,
         )
 
         logger.info(f"{crval_init = !s}")
@@ -627,18 +649,22 @@ class SolarCalibration(
         resolving_power = self.parameters.wavecal_init_resolving_power
         opacity_factor = self.parameters.wavecal_init_opacity_factor
         straylight_faction = self.parameters.wavecal_init_straylight_fraction
+        relative_atlas_scaling = self.estimate_relative_continuum_level(
+            crval_init=crval_init,
+            wavelength_range=wavelength_range,
+            atlas=atlas,
+            representative_spectrum=representative_spectrum,
+        )
+        logger.info(f"0th order coefficient initial guess: {relative_atlas_scaling}")
 
-        # The first time we have to change these ranges (which may never happen!) we should at least consider making
-        # them parameters.
-        wavelength_search_width = wavelength_range * 0.15
+        wavelength_search_width = dispersion * self.parameters.solar_vignette_crval_bounds_px
         bounds = BoundsModel(
-            # An alternative for the crval bounds would be `[input_wavelength_vector.min(), input_wavelength_vector.max()]`
             crval=LengthBoundRange(
                 min=crval_init - wavelength_search_width, max=crval_init + wavelength_search_width
             ),
             dispersion=DispersionBoundRange(
-                min=dispersion * 0.96,
-                max=dispersion * 1.04,
+                min=dispersion * (1 - self.parameters.solar_vignette_dispersion_bounds_fraction),
+                max=dispersion * (1 + self.parameters.solar_vignette_dispersion_bounds_fraction),
             ),
             incident_light_angle=AngleBoundRange(
                 min=incident_light_angle - 1 * u.deg, max=incident_light_angle + 1 * u.deg
@@ -646,7 +672,6 @@ class SolarCalibration(
             resolving_power=UnitlessBoundRange(min=1e5, max=5e5),
             opacity_factor=UnitlessBoundRange(min=1.0, max=10),
             straylight_fraction=UnitlessBoundRange(min=0.0, max=0.8),
-            continuum_level=UnitlessBoundRange(min=0.99, max=1.1),
         )
 
         init_params = WavelengthCalibrationParametersWithContinuum(
@@ -656,7 +681,7 @@ class SolarCalibration(
             grating_constant=grating_constant,
             doppler_velocity=doppler_velocity,
             order=spectral_order,
-            continuum_level=1.0,
+            continuum_level=1,
             resolving_power=resolving_power,
             opacity_factor=opacity_factor,
             straylight_fraction=straylight_faction,
@@ -664,10 +689,44 @@ class SolarCalibration(
             bounds=bounds,
             continuum_poly_fit_order=self.parameters.solar_vignette_initial_continuum_poly_fit_order,
             normalized_abscissa=normalized_abscissa,
+            zeroth_order_continuum_coefficient=relative_atlas_scaling,
         )
 
         return init_params
 
+    def estimate_relative_continuum_level(
+        self,
+        *,
+        crval_init: Quantity,
+        wavelength_range: Quantity,
+        atlas: Atlas,
+        representative_spectrum: np.ndarray,
+    ) -> float:
+        """
+        Estimate the multiplicative scaling between the representative spectrum and atlas solar transmission.
+
+        This scaling is used to set the initial guess of 0th-order polynomial fit coefficient. We estimate the scaling
+        factor by comparing the values of the two spectra at a given percent of the CDF. This percent is taken from
+        the `~dkist_processing_visp.models.parameters.VispParameters.wavecal_init_crval_guess_normalization_percentile`
+        pipeline parameter.
+        """
+        wave_min = crval_init - wavelength_range / 2
+        wave_max = crval_init + wavelength_range / 2
+
+        atlas_idx = np.where(
+            (atlas.solar_atlas_wavelength >= wave_min) & (atlas.solar_atlas_wavelength <= wave_max)
+        )
+        atlas_norm = np.nanpercentile(
+            atlas.solar_atlas_transmission[atlas_idx],
+            self.parameters.wavecal_init_crval_guess_normalization_percentile,
+        )
+        spec_norm = np.nanpercentile(
+            representative_spectrum,
+            self.parameters.wavecal_init_crval_guess_normalization_percentile,
+        )
+
+        return spec_norm / atlas_norm
+
     def compute_final_vignette_estimate(self, init_vignette_correction: np.ndarray) -> np.ndarray:
         """
         Fit the spectral shape of continuum residuals for each spatial pixel.

{dkist_processing_visp-5.0.0rc1 → dkist_processing_visp-5.0.0rc3}/dkist_processing_visp/tests/conftest.py

@@ -149,6 +149,8 @@ class VispInputDatasetParameterValues:
     )
     visp_solar_characteristic_spatial_normalization_percentile: float = 90.0
     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",
@@ -184,6 +186,7 @@ class VispInputDatasetParameterValues:
             "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

{dkist_processing_visp-5.0.0rc1 → dkist_processing_visp-5.0.0rc3}/dkist_processing_visp/tests/test_assemble_quality.py

@@ -86,19 +86,27 @@ def test_vignette_metrics_built(visp_assemble_quality_data_task):
         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(

{dkist_processing_visp-5.0.0rc1 → dkist_processing_visp-5.0.0rc3}/dkist_processing_visp/tests/test_parameters.py

@@ -34,6 +34,7 @@ def arm_parameter_names() -> list[str]:
 @pytest.fixture(scope="session")
 def unit_parameter_names_and_units() -> dict[str, u.Unit | list[u.Unit]]:
     return {
+        "solar_vignette_crval_bounds_px": u.pix,
         "wavecal_camera_lens_parameters": [u.m, u.m / u.nm, u.m / u.nm**2],
         "wavecal_pixel_pitch_micron_per_pix": u.um / u.pix,
     }

{dkist_processing_visp-5.0.0rc1 → dkist_processing_visp-5.0.0rc3}/dkist_processing_visp/tests/test_solar.py

@@ -310,8 +310,17 @@ def solar_gain_task(
 
 
 @pytest.mark.parametrize(
-    "background_on",
-    [pytest.param(True, id="background_on"), pytest.param(False, id="background_off")],
+    "background_on, fit_kwargs",
+    [
+        pytest.param(True, {"method": "nelder"}, id="background_on-non_rng_method"),
+        pytest.param(False, "conftest", id="background_off-conftest_fit_kwargs"),
+        pytest.param(
+            False,
+            {"method": "differential_evolution", "rng": 6.28},
+            id="background_off-override_rng",
+        ),
+        pytest.param(False, dict(), id="background_off-no_fit_kwargs"),
+    ],
 )
 def test_solar_gain_task(
     solar_gain_task,
@@ -326,6 +335,7 @@ def test_solar_gain_task(
     assign_input_dataset_doc_to_task,
     mocker,
     fake_gql_client,
+    fit_kwargs,
 ):
     """
     Given: A set of raw solar gain images and necessary intermediate calibrations
@@ -341,6 +351,7 @@ def test_solar_gain_task(
     input_shape = (num_wave_pix * 2, 100)
     intermediate_shape = (num_wave_pix, 100)
     beam_border = input_shape[0] // 2
+    conftest_fit_kwargs = VispInputDatasetParameterValues().visp_solar_vignette_wavecal_fit_kwargs
     assign_input_dataset_doc_to_task(
         task,
         VispInputDatasetParameterValues(
@@ -350,6 +361,9 @@ def test_solar_gain_task(
             visp_wavecal_init_resolving_power=resolving_power,
             visp_wavecal_camera_lens_parameters_1=lens_parameters_no_units,
             visp_solar_vignette_initial_continuum_poly_fit_order=1,
+            visp_solar_vignette_wavecal_fit_kwargs=(
+                conftest_fit_kwargs if fit_kwargs == "conftest" else fit_kwargs
+            ),
         ),
         arm_id=1,
     )
@@ -447,8 +461,10 @@ def test_continuum_wavecal_parameters():
     Then: The polynomial coefficients are present
     """
     order = 3
+    zeroth_order = 6.28
     param_object = WavelengthCalibrationParametersWithContinuum(
         continuum_poly_fit_order=order,
+        zeroth_order_continuum_coefficient=zeroth_order,
         crval=400 * u.nm,
         dispersion=3 * u.nm / u.pix,
         incident_light_angle=4 * u.deg,
@@ -456,6 +472,7 @@ def test_continuum_wavecal_parameters():
         doppler_velocity=0 * u.km / u.s,
         order=1,
         normalized_abscissa=np.arange(10),
+        continuum_level=99999.9,
     )
     lmfit_params = param_object.lmfit_parameters
 
@@ -464,13 +481,13 @@ def test_continuum_wavecal_parameters():
     assert "poly_coeff_01" in lmfit_params
     assert "poly_coeff_00" in lmfit_params
 
-    assert lmfit_params["poly_coeff_03"].value == 1
-    assert lmfit_params["poly_coeff_02"].value == 0
-    assert lmfit_params["poly_coeff_01"].value == 0
-    assert lmfit_params["poly_coeff_00"].value == 0
+    assert lmfit_params["poly_coeff_03"].init_value == zeroth_order
+    assert lmfit_params["poly_coeff_02"].init_value == 0
+    assert lmfit_params["poly_coeff_01"].init_value == 0
+    assert lmfit_params["poly_coeff_00"].init_value == 0
 
-    assert lmfit_params["poly_coeff_03"].min == 0.7
-    assert lmfit_params["poly_coeff_03"].max == 1.3
+    assert lmfit_params["poly_coeff_03"].min == zeroth_order * 0.5
+    assert lmfit_params["poly_coeff_03"].max == zeroth_order * 1.5
     assert lmfit_params["poly_coeff_02"].min == -1
     assert lmfit_params["poly_coeff_02"].max == 1
     assert lmfit_params["poly_coeff_01"].min == -1

{dkist_processing_visp-5.0.0rc1 → dkist_processing_visp-5.0.0rc3}/dkist_processing_visp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-visp
-Version: 5.0.0rc1
+Version: 5.0.0rc3
 Summary: Science processing code for the ViSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -13,14 +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.1rc2
+Requires-Dist: dkist-processing-common==11.8.1rc3
 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: solar-wavelength-calibration==2.0.0rc4
 Requires-Dist: astropy==7.0.2
 Requires-Dist: numpy==2.2.5
 Requires-Dist: sunpy==6.1.1
@@ -95,44 +95,44 @@ Requires-Dist: aiohappyeyeballs==2.6.1; extra == "frozen"
 Requires-Dist: aiohttp==3.13.2; extra == "frozen"
 Requires-Dist: aiosignal==1.4.0; extra == "frozen"
 Requires-Dist: aiosmtplib==5.0.0; extra == "frozen"
-Requires-Dist: alembic==1.17.1; extra == "frozen"
+Requires-Dist: alembic==1.17.2; extra == "frozen"
 Requires-Dist: amqp==5.3.1; extra == "frozen"
 Requires-Dist: annotated-types==0.7.0; extra == "frozen"
 Requires-Dist: anyio==4.11.0; extra == "frozen"
 Requires-Dist: apache-airflow==2.11.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-celery==3.10.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-compat==1.8.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-io==1.6.4; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-sql==1.28.2; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-compat==1.9.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-io==1.6.5; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-sql==1.29.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-fab==1.5.3; extra == "frozen"
-Requires-Dist: apache-airflow-providers-ftp==3.13.2; extra == "frozen"
-Requires-Dist: apache-airflow-providers-http==5.4.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-imap==3.9.3; extra == "frozen"
-Requires-Dist: apache-airflow-providers-postgres==6.4.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-smtp==2.3.1; extra == "frozen"
-Requires-Dist: apache-airflow-providers-sqlite==4.1.2; extra == "frozen"
+Requires-Dist: apache-airflow-providers-ftp==3.13.3; extra == "frozen"
+Requires-Dist: apache-airflow-providers-http==5.5.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-imap==3.9.4; extra == "frozen"
+Requires-Dist: apache-airflow-providers-postgres==6.4.1; extra == "frozen"
+Requires-Dist: apache-airflow-providers-smtp==2.3.2; extra == "frozen"
+Requires-Dist: apache-airflow-providers-sqlite==4.1.3; extra == "frozen"
 Requires-Dist: apispec==6.8.4; extra == "frozen"
 Requires-Dist: argcomplete==3.6.3; extra == "frozen"
 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: asgiref==3.11.0; 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.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: billiard==4.2.3; extra == "frozen"
 Requires-Dist: blinker==1.9.0; extra == "frozen"
-Requires-Dist: boto3==1.40.71; extra == "frozen"
-Requires-Dist: botocore==1.40.71; extra == "frozen"
+Requires-Dist: boto3==1.41.1; extra == "frozen"
+Requires-Dist: botocore==1.41.1; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
 Requires-Dist: celery==5.3.1; 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"
+Requires-Dist: click==8.3.1; extra == "frozen"
 Requires-Dist: click-didyoumean==0.3.1; extra == "frozen"
 Requires-Dist: click-plugins==1.1.1.2; extra == "frozen"
 Requires-Dist: click-repl==0.3.0; extra == "frozen"
@@ -149,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.1rc2; extra == "frozen"
+Requires-Dist: dkist-processing-common==11.8.1rc3; 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==5.0.0rc1; extra == "frozen"
+Requires-Dist: dkist-processing-visp==5.0.0rc3; 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"
@@ -251,7 +251,7 @@ Requires-Dist: proglog==0.1.12; extra == "frozen"
 Requires-Dist: prometheus_client==0.23.1; extra == "frozen"
 Requires-Dist: prompt_toolkit==3.0.52; extra == "frozen"
 Requires-Dist: propcache==0.4.1; extra == "frozen"
-Requires-Dist: protobuf==6.33.0; extra == "frozen"
+Requires-Dist: protobuf==6.33.1; 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"
@@ -273,8 +273,8 @@ Requires-Dist: requests-toolbelt==1.0.0; extra == "frozen"
 Requires-Dist: rfc3339-validator==0.1.4; extra == "frozen"
 Requires-Dist: rich==13.9.4; extra == "frozen"
 Requires-Dist: rich-argparse==1.7.2; extra == "frozen"
-Requires-Dist: rpds-py==0.28.0; extra == "frozen"
-Requires-Dist: s3transfer==0.14.0; extra == "frozen"
+Requires-Dist: rpds-py==0.29.0; extra == "frozen"
+Requires-Dist: s3transfer==0.15.0; extra == "frozen"
 Requires-Dist: scikit-image==0.25.2; extra == "frozen"
 Requires-Dist: scikit-learn==1.6.1; extra == "frozen"
 Requires-Dist: scipy==1.15.3; extra == "frozen"
@@ -282,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==2.0.0rc3; extra == "frozen"
+Requires-Dist: solar-wavelength-calibration==2.0.0rc4; 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"
@@ -301,14 +301,14 @@ 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.5; extra == "frozen"
+Requires-Dist: universal_pathlib==0.3.6; 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"
 Requires-Dist: wcwidth==0.2.14; extra == "frozen"
 Requires-Dist: wirerope==1.0.0; extra == "frozen"
 Requires-Dist: wrapt==1.17.3; extra == "frozen"
-Requires-Dist: yamale==6.0.0; extra == "frozen"
+Requires-Dist: yamale==6.1.0; extra == "frozen"
 Requires-Dist: yarl==1.22.0; extra == "frozen"
 Requires-Dist: zipp==3.23.0; extra == "frozen"