dkist-processing-visp 5.2.1__py3-none-any.whl → 5.2.2__py3-none-any.whl

dkist_processing_visp/tasks/__init__.py

@@ -12,4 +12,5 @@ from dkist_processing_visp.tasks.parse import *
 from dkist_processing_visp.tasks.quality_metrics import *
 from dkist_processing_visp.tasks.science import *
 from dkist_processing_visp.tasks.solar import *
+from dkist_processing_visp.tasks.wavelength_calibration import WavelengthCalibration
 from dkist_processing_visp.tasks.write_l1 import *

dkist_processing_visp/tasks/solar.py

@@ -46,6 +46,7 @@ from dkist_processing_visp.tasks.visp_base import VispTaskBase
 from dkist_processing_visp.tasks.wavelength_calibration import compute_initial_dispersion
 from dkist_processing_visp.tasks.wavelength_calibration import compute_input_wavelength_vector
 from dkist_processing_visp.tasks.wavelength_calibration import compute_order
+from dkist_processing_visp.tasks.wavelength_calibration import estimate_relative_continuum_level
 from dkist_processing_visp.tasks.wavelength_calibration import get_doppler_velocity
 
 __all__ = [
@@ -638,11 +639,12 @@ 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(
+        relative_atlas_scaling = estimate_relative_continuum_level(
             crval_init=crval_init,
             wavelength_range=wavelength_range,
             atlas=atlas,
             representative_spectrum=representative_spectrum,
+            normalization_percentile=self.parameters.wavecal_init_crval_guess_normalization_percentile,
         )
         logger.info(f"0th order coefficient initial guess: {relative_atlas_scaling}")
 
@@ -683,39 +685,6 @@ class SolarCalibration(
 
         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/tasks/wavelength_calibration.py

@@ -26,8 +26,6 @@ from sunpy.coordinates import HeliocentricInertial
 from dkist_processing_visp.models.tags import VispTag
 from dkist_processing_visp.tasks.visp_base import VispTaskBase
 
-__all__ = ["WavelengthCalibration"]
-
 
 class WavelengthCalibration(VispTaskBase, QualityMixin):
     """Task class for correcting the dispersion axis wavelength values.
@@ -125,6 +123,7 @@ class WavelengthCalibration(VispTaskBase, QualityMixin):
                 negative_limit=-wavelength_range / 2,
                 positive_limit=wavelength_range / 2,
                 num_steps=550,
+                normalization_percentile=self.parameters.wavecal_init_crval_guess_normalization_percentile,
             )
             logger.info(f"{crval_initial_guess = !s}")
 
@@ -135,6 +134,15 @@ class WavelengthCalibration(VispTaskBase, QualityMixin):
             resolving_power = self.parameters.wavecal_init_resolving_power
             logger.info(f"{resolving_power = }")
 
+            init_continuum_level = estimate_relative_continuum_level(
+                crval_init=crval_initial_guess,
+                wavelength_range=wavelength_range,
+                atlas=atlas,
+                representative_spectrum=input_spectrum,
+                normalization_percentile=self.parameters.wavecal_init_crval_guess_normalization_percentile,
+            )
+            logger.info(f"{init_continuum_level = !s}")
+
             logger.info("Setting bounds")
             wavelength_search_width = dispersion * self.parameters.wavecal_crval_bounds_px
             bounds = BoundsModel(
@@ -158,7 +166,9 @@ class WavelengthCalibration(VispTaskBase, QualityMixin):
                 ),
                 opacity_factor=UnitlessBoundRange(min=0.0, max=10.0),
                 straylight_fraction=UnitlessBoundRange(min=0.0, max=0.4),
-                continuum_level=UnitlessBoundRange(min=0.5, max=2.0),
+                continuum_level=UnitlessBoundRange(
+                    min=init_continuum_level * 0.7, max=init_continuum_level * 1.3
+                ),
             )
 
             fit_flags = FitFlagsModel(
@@ -180,6 +190,7 @@ class WavelengthCalibration(VispTaskBase, QualityMixin):
                 opacity_factor=self.parameters.wavecal_init_opacity_factor,
                 straylight_fraction=self.parameters.wavecal_init_straylight_fraction,
                 grating_constant=self.constants.grating_constant_inverse_mm,
+                continuum_level=init_continuum_level,
                 doppler_velocity=doppler_velocity,
                 order=order,
                 bounds=bounds,
@@ -428,3 +439,33 @@ def compute_initial_dispersion(
     dispersion = pixel_pitch / linear_dispersion
 
     return dispersion.to(u.nm / u.pix)
+
+
+def estimate_relative_continuum_level(
+    *,
+    crval_init: Quantity,
+    wavelength_range: Quantity,
+    atlas: Atlas,
+    representative_spectrum: np.ndarray,
+    normalization_percentile: float,
+) -> 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 continuum scaling. 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], normalization_percentile
+    )
+    spec_norm = np.nanpercentile(representative_spectrum, normalization_percentile)
+
+    return spec_norm / atlas_norm

dkist_processing_visp/workflows/l0_processing.py

@@ -22,7 +22,7 @@ from dkist_processing_visp.tasks import VispAssembleQualityData
 from dkist_processing_visp.tasks import VispL0QualityMetrics
 from dkist_processing_visp.tasks import VispL1QualityMetrics
 from dkist_processing_visp.tasks import VispWriteL1Frame
-from dkist_processing_visp.tasks.wavelength_calibration import WavelengthCalibration
+from dkist_processing_visp.tasks import WavelengthCalibration
 
 l0_pipeline = Workflow(
     category="visp",

dkist_processing_visp/workflows/trial_workflows.py

@@ -23,7 +23,7 @@ from dkist_processing_visp.tasks import VispAssembleQualityData
 from dkist_processing_visp.tasks import VispL0QualityMetrics
 from dkist_processing_visp.tasks import VispL1QualityMetrics
 from dkist_processing_visp.tasks import VispWriteL1Frame
-from dkist_processing_visp.tasks.wavelength_calibration import WavelengthCalibration
+from dkist_processing_visp.tasks import WavelengthCalibration
 
 full_trial_pipeline = Workflow(
     category="visp",

{dkist_processing_visp-5.2.1.dist-info → dkist_processing_visp-5.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-visp
-Version: 5.2.1
+Version: 5.2.2
 Summary: Science processing code for the ViSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -126,8 +126,8 @@ Requires-Dist: attrs==25.4.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
 Requires-Dist: billiard==4.2.4; extra == "frozen"
 Requires-Dist: blinker==1.9.0; extra == "frozen"
-Requires-Dist: boto3==1.42.10; extra == "frozen"
-Requires-Dist: botocore==1.42.10; extra == "frozen"
+Requires-Dist: boto3==1.42.11; extra == "frozen"
+Requires-Dist: botocore==1.42.11; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
 Requires-Dist: celery==5.6.0; extra == "frozen"
 Requires-Dist: certifi==2025.11.12; extra == "frozen"
@@ -154,7 +154,7 @@ Requires-Dist: dkist-processing-common==11.9.1; extra == "frozen"
 Requires-Dist: dkist-processing-core==6.0.1; 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.2.1; extra == "frozen"
+Requires-Dist: dkist-processing-visp==5.2.2; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.1.13; extra == "frozen"
 Requires-Dist: dkist-spectral-lines==3.0.0; extra == "frozen"
 Requires-Dist: dkist_fits_specifications==4.19.0; extra == "frozen"
@@ -170,6 +170,7 @@ Requires-Dist: globus-sdk==4.2.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.3.0; 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"

{dkist_processing_visp-5.2.1.dist-info → dkist_processing_visp-5.2.2.dist-info}/RECORD

@@ -18,7 +18,7 @@ dkist_processing_visp/parsers/spectrograph_configuration.py,sha256=YpMX1NhE7xySx
 dkist_processing_visp/parsers/time.py,sha256=uudQ5manYdL7SgxqABfFPDzW2iTNrTYF0klqCRsP0CI,4812
 dkist_processing_visp/parsers/visp_l0_fits_access.py,sha256=WDAgMp_70AKmzxGqboKA3McSGgF_mvgsGiihYmK1Nus,1973
 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/__init__.py,sha256=wleMYKy1OmAJdvxmPCwtktM0koSLS5Vnd2H8C2uLdjQ,798
 dkist_processing_visp/tasks/assemble_movie.py,sha256=8UujniXlV_sSGeuISud8wMHihLy6Gc5fKZpwkXLUQB8,3330
 dkist_processing_visp/tasks/background_light.py,sha256=qQ3r1LR5qaOz2qNHnO5_QK8l1zbVP0GaCS3aLqJfNYY,16201
 dkist_processing_visp/tasks/dark.py,sha256=VVitrat08U7e5L1-NVnNNJI_KIx791_DvKEJokvCqXE,4334
@@ -30,9 +30,9 @@ dkist_processing_visp/tasks/make_movie_frames.py,sha256=fw25ksKiJJNS57XV5a7rHpYG
 dkist_processing_visp/tasks/parse.py,sha256=Fe_2svvMSKBup--Ulxbu0uaNW3dzPxQreafMEw0CY6E,7897
 dkist_processing_visp/tasks/quality_metrics.py,sha256=Pw55-PXW0cl39FuNkEQCGGhvI_zMDimwmh-swVPVBD4,8133
 dkist_processing_visp/tasks/science.py,sha256=fm-LLWxmLEjea0a8fhmN3x1v3n1Od4BJ3BioyjPuih8,38318
-dkist_processing_visp/tasks/solar.py,sha256=-OnpKKkUG0EwYK8S4QsMD5UWU6cIHc837nEDc_3OLl4,41156
+dkist_processing_visp/tasks/solar.py,sha256=klV5TvSigFBvriR9YQE5YQzHSECk_J7Lfn1zxQHiWS4,39983
 dkist_processing_visp/tasks/visp_base.py,sha256=-yC-PVP9AqFeZJshJ_nqZpSyRsZyHWUlugWvkeWkPKA,1412
-dkist_processing_visp/tasks/wavelength_calibration.py,sha256=N-pYBRL6Iyb_Q8VrZBQXBWvVBty3LrdhyDVxgxk3n9g,17039
+dkist_processing_visp/tasks/wavelength_calibration.py,sha256=GLp24j4VfXnHdYmFO0Qd2mV-5hNolx6RQE4GwJo4gTk,18839
 dkist_processing_visp/tasks/write_l1.py,sha256=UbugV6ilmeYdq-bC9WUiJxkFjn9VzJIkZXtoA7cs71k,8798
 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
@@ -70,9 +70,9 @@ dkist_processing_visp/tests/local_trial_workflows/l0_solar_gain_as_science.py,sh
 dkist_processing_visp/tests/local_trial_workflows/l0_to_l1.py,sha256=q_rS8PVm6pA5EjayBhj2SfGSRnpsd_jY2IlIfiVpPC4,16101
 dkist_processing_visp/tests/local_trial_workflows/local_trial_helpers.py,sha256=R7NZNEv0VQwwZoBwPa6RYY94_VBnM4JQJ1AQdQaCrGQ,29078
 dkist_processing_visp/workflows/__init__.py,sha256=1-GP9tOzjCxLJtyq0ry_x4dPdArfSso8Hxu65ydPpXQ,103
-dkist_processing_visp/workflows/l0_processing.py,sha256=XW7tbQLlH06ecEZ3QAt982gK9T_y3eN2U9KtUUq1R_0,3529
+dkist_processing_visp/workflows/l0_processing.py,sha256=Gc-tlAPayg9WKq2jdRib83kvyaq1WuPaT_yrZ73sSu0,3506
 dkist_processing_visp/workflows/single_task_workflows.py,sha256=LK4dsshM0-lwy79WaMoTplyCxUyINnP9RU74MG_dhyc,33
-dkist_processing_visp/workflows/trial_workflows.py,sha256=IYdjVVZ6mCKGMQiy-_cqKLptHws3WzxrPZLjFccaZr0,4022
+dkist_processing_visp/workflows/trial_workflows.py,sha256=52y5gqigVsqVeNDXH-5tnOubEQOLAWy50cMRRTo1BaM,3999
 docs/Makefile,sha256=qnlVz6PuBqE39NfHWuUnHhNEA-EFgT2-WJNNNy9ttfk,4598
 docs/background_light.rst,sha256=FWj8KH7H51BtoqPCJ1A_VIWJkjaXD8-dwM9RdY1rkIc,5147
 docs/changelog.rst,sha256=ZpZPJIyl4nI0Eicku6uSrLdiinNOF2GcZwrvTEsb-Zs,346
@@ -91,7 +91,7 @@ docs/science_calibration.rst,sha256=VN_g7xSjN-nbXhlBaFnPCbNcsc_Qu0207jEUfRAjnBE,
 docs/scientific_changelog.rst,sha256=01AWBSHg8zElnodCgAq-hMxhk9CkX5rtEENx4iz0sjI,300
 docs/wavelength_calibration.rst,sha256=OSGYAeR8Acns2ZUectHzRj2xcAsuNEMLejcYfPYu-vw,3674
 licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
-dkist_processing_visp-5.2.1.dist-info/METADATA,sha256=srCdZcyRi9prrfFG7v5Eg84X71elIGN1gOw-i9QccUg,29973
-dkist_processing_visp-5.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dkist_processing_visp-5.2.1.dist-info/top_level.txt,sha256=9GHSn-ZMGQxaRNGrPP3HNc5ZkE7ftzluO74Jz5vUSTE,46
-dkist_processing_visp-5.2.1.dist-info/RECORD,,
+dkist_processing_visp-5.2.2.dist-info/METADATA,sha256=UCKkJRm8UpkRs67vUkPZ9B6cMPlIiWBJZZ_K0_ejB48,30023
+dkist_processing_visp-5.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dkist_processing_visp-5.2.2.dist-info/top_level.txt,sha256=9GHSn-ZMGQxaRNGrPP3HNc5ZkE7ftzluO74Jz5vUSTE,46
+dkist_processing_visp-5.2.2.dist-info/RECORD,,