dkist-processing-common 11.8.0__tar.gz → 11.8.1rc2__tar.gz

{dkist_processing_common-11.8.0 → dkist_processing_common-11.8.1rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 11.8.0
+Version: 11.8.1rc2
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -21,7 +21,7 @@ Requires-Dist: dkist-processing-core==6.0.0
 Requires-Dist: dkist-processing-pac<4.0,>=3.1
 Requires-Dist: dkist-service-configuration<5.0,>=4.1.7
 Requires-Dist: dkist-spectral-lines<4.0,>=3.0.0
-Requires-Dist: solar-wavelength-calibration<2.0,>=1.0
+Requires-Dist: solar-wavelength-calibration<3.0,>=2.0.0rc3
 Requires-Dist: globus-sdk<4.0.0,>=3.12.0
 Requires-Dist: gqlclient[pydantic]==1.2.3
 Requires-Dist: sqids==0.5.1
@@ -31,7 +31,7 @@ Requires-Dist: numpy>=1.26.4
 Requires-Dist: object-clerk==1.0.0
 Requires-Dist: pandas>=1.4.2
 Requires-Dist: pillow>=10.2.0
-Requires-Dist: pydantic>=2.0
+Requires-Dist: pydantic>=2.7.2
 Requires-Dist: redis==6.4.0
 Requires-Dist: requests>=2.23
 Requires-Dist: scipy>=1.15.1

dkist_processing_common-11.8.1rc2/changelog/271.misc.2.rst

@@ -0,0 +1 @@
+Bump minimum version of `pydantic` to 2.7.2 to avoid install failures for python versions >= 3.12.

dkist_processing_common-11.8.1rc2/changelog/271.misc.rst

@@ -0,0 +1 @@
+Move `solar-wavelength-calibration` dep to 2.0.0 and make use of new helper properties in that release.

{dkist_processing_common-11.8.0 → dkist_processing_common-11.8.1rc2}/dkist_processing_common/tasks/mixin/quality/_metrics.py

@@ -1356,15 +1356,13 @@ class _WavecalQualityMixin:
         Note that the residuals are the *unweighed* residuals.
         """
         weight_data = np.ones(input_wavelength.size) if weights is None else weights
-        prepared_weights = np.sqrt(weight_data / np.sum(weight_data))
+        prepared_weights = fit_result.prepared_weights
         residuals = fit_result.minimizer_result.residual / prepared_weights
         residuals[~np.isfinite(residuals)] = 0.0
-        best_fit_atlas = input_spectrum - residuals
         normalized_residuals = residuals / input_spectrum
 
-        best_fit_header = fit_result.wavelength_parameters.to_header(axis_num=1)
-        wcs = WCS(best_fit_header)
-        best_fit_wavelength = wcs.spectral.pixel_to_world(np.arange(input_spectrum.size))
+        best_fit_atlas = fit_result.best_fit_atlas
+        best_fit_wavelength = fit_result.best_fit_wavelength_vector
 
         finite_idx = (
             np.isfinite(input_wavelength)
@@ -1378,7 +1376,7 @@ class _WavecalQualityMixin:
         data = {
             "input_wavelength_nm": input_wavelength.to_value(u.nm)[finite_idx].tolist(),
             "input_spectrum": input_spectrum[finite_idx].tolist(),
-            "best_fit_wavelength_nm": best_fit_wavelength.to_value(u.nm)[finite_idx].tolist(),
+            "best_fit_wavelength_nm": best_fit_wavelength[finite_idx].tolist(),
             "best_fit_atlas": best_fit_atlas[finite_idx].tolist(),
             "normalized_residuals": normalized_residuals[finite_idx].tolist(),
             "weights": None if weights is None else weight_data[finite_idx].tolist(),

{dkist_processing_common-11.8.0 → dkist_processing_common-11.8.1rc2}/dkist_processing_common/tests/test_quality_mixin.py

@@ -1214,12 +1214,20 @@ def wavecal_weights(wavecal_input_wavelength) -> np.ndarray:
 
 
 @pytest.fixture(scope="session")
-def wavecal_fit_result(wavecal_input_wavelength) -> FitResult:
+def wavecal_fit_result(wavecal_input_wavelength, wavecal_input_spectrum) -> FitResult:
     wavelength_params = WavelengthParameters(
         crpix=1, crval=10.0, dispersion=1, grating_constant=1, order=1, incident_light_angle=0
     )
-    minimizer_result = MinimizerResult(residual=np.random.random(wavecal_input_wavelength.size))
-    return FitResult(wavelength_parameters=wavelength_params, minimizer_result=minimizer_result)
+
+    residuals = np.random.random(wavecal_input_wavelength.size)
+    residuals[-1] = np.nan
+    minimizer_result = MinimizerResult(residual=residuals)
+    return FitResult(
+        wavelength_parameters=wavelength_params,
+        minimizer_result=minimizer_result,
+        input_wavelength_vector=wavecal_input_wavelength,
+        input_spectrum=wavecal_input_spectrum,
+    )
 
 
 @pytest.mark.parametrize(

{dkist_processing_common-11.8.0 → dkist_processing_common-11.8.1rc2}/dkist_processing_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 11.8.0
+Version: 11.8.1rc2
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -21,7 +21,7 @@ Requires-Dist: dkist-processing-core==6.0.0
 Requires-Dist: dkist-processing-pac<4.0,>=3.1
 Requires-Dist: dkist-service-configuration<5.0,>=4.1.7
 Requires-Dist: dkist-spectral-lines<4.0,>=3.0.0
-Requires-Dist: solar-wavelength-calibration<2.0,>=1.0
+Requires-Dist: solar-wavelength-calibration<3.0,>=2.0.0rc3
 Requires-Dist: globus-sdk<4.0.0,>=3.12.0
 Requires-Dist: gqlclient[pydantic]==1.2.3
 Requires-Dist: sqids==0.5.1
@@ -31,7 +31,7 @@ Requires-Dist: numpy>=1.26.4
 Requires-Dist: object-clerk==1.0.0
 Requires-Dist: pandas>=1.4.2
 Requires-Dist: pillow>=10.2.0
-Requires-Dist: pydantic>=2.0
+Requires-Dist: pydantic>=2.7.2
 Requires-Dist: redis==6.4.0
 Requires-Dist: requests>=2.23
 Requires-Dist: scipy>=1.15.1

{dkist_processing_common-11.8.0 → dkist_processing_common-11.8.1rc2}/dkist_processing_common.egg-info/SOURCES.txt

@@ -7,6 +7,8 @@ README.rst
 bitbucket-pipelines.yml
 pyproject.toml
 changelog/.gitempty
+changelog/271.misc.2.rst
+changelog/271.misc.rst
 dkist_processing_common/__init__.py
 dkist_processing_common/config.py
 dkist_processing_common/manual.py

{dkist_processing_common-11.8.0 → dkist_processing_common-11.8.1rc2}/dkist_processing_common.egg-info/requires.txt

@@ -6,7 +6,7 @@ dkist-processing-core==6.0.0
 dkist-processing-pac<4.0,>=3.1
 dkist-service-configuration<5.0,>=4.1.7
 dkist-spectral-lines<4.0,>=3.0.0
-solar-wavelength-calibration<2.0,>=1.0
+solar-wavelength-calibration<3.0,>=2.0.0rc3
 globus-sdk<4.0.0,>=3.12.0
 gqlclient[pydantic]==1.2.3
 sqids==0.5.1
@@ -16,7 +16,7 @@ numpy>=1.26.4
 object-clerk==1.0.0
 pandas>=1.4.2
 pillow>=10.2.0
-pydantic>=2.0
+pydantic>=2.7.2
 redis==6.4.0
 requests>=2.23
 scipy>=1.15.1

{dkist_processing_common-11.8.0 → dkist_processing_common-11.8.1rc2}/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
   "dkist-processing-pac >= 3.1, <4.0",
   "dkist-service-configuration >= 4.1.7, <5.0",
   "dkist-spectral-lines >= 3.0.0, <4.0",
-  "solar-wavelength-calibration >= 1.0, <2.0",
+  "solar-wavelength-calibration >= 2.0.0rc3, <3.0",
   "globus-sdk >= 3.12.0, <4.0.0",
   "gqlclient[pydantic] == 1.2.3",
   "sqids == 0.5.1",
@@ -39,7 +39,7 @@ dependencies = [
   "object-clerk == 1.0.0",
   "pandas >= 1.4.2",
   "pillow >= 10.2.0",
-  "pydantic >= 2.0",
+  "pydantic >= 2.7.2",
   "redis == 6.4.0",
   "requests >= 2.23",
   "scipy >= 1.15.1",