dkist-processing-common 11.8.0rc1__py3-none-any.whl → 11.8.1rc1__py3-none-any.whl

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.

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/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/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.0rc1.dist-info → dkist_processing_common-11.8.1rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 11.8.0rc1
+Version: 11.8.1rc1
 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.0rc2
 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
@@ -57,9 +57,9 @@ Requires-Dist: pytest; extra == "docs"
 Requires-Dist: towncrier<22.12.0; extra == "docs"
 Requires-Dist: dkist-sphinx-theme; extra == "docs"
 Provides-Extra: inventory
-Requires-Dist: dkist-inventory<2.0,>=1.11.0; extra == "inventory"
+Requires-Dist: dkist-inventory<2.0,>=1.11.1; extra == "inventory"
 Provides-Extra: asdf
-Requires-Dist: dkist-inventory[asdf]<2.0,>=1.11.0; extra == "asdf"
+Requires-Dist: dkist-inventory[asdf]<2.0,>=1.11.1; extra == "asdf"
 Provides-Extra: quality
 Requires-Dist: dkist-quality<3.0,>=2.0.0; extra == "quality"
 

{dkist_processing_common-11.8.0rc1.dist-info → dkist_processing_common-11.8.1rc1.dist-info}/RECORD

@@ -1,5 +1,6 @@
 changelog/.gitempty,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-changelog/245.feature.1.rst,sha256=BBwCgALdFPqX7ZI0Uj-z9piaGplVKbgErZ6LuMH3qbA,148
+changelog/271.misc.2.rst,sha256=-nI7LQ8B_O6ZxNa0iBnfSbjIpo9uCvCMiGmKnwTigrA,99
+changelog/271.misc.rst,sha256=YxeCttyTuraW8dlIRP99Pf9XHQrjQMPdSO9bm8r2Kk0,104
 dkist_processing_common/__init__.py,sha256=GQ9EBnYhkOnt-qODclAoLS_g5YVhurxfg1tjVtI9rDI,320
 dkist_processing_common/config.py,sha256=kkFm-Q6jGGoV3Zdf3PSfk3xNYd2vSH0J2R8dBBav3Og,5218
 dkist_processing_common/manual.py,sha256=bIVVyLsbXMh-g_2L3kGROL-1TtJe0_XviHsp7Br31x8,7023
@@ -75,7 +76,7 @@ dkist_processing_common/tasks/mixin/metadata_store.py,sha256=QeZV3BITUzCErUt7mbk
 dkist_processing_common/tasks/mixin/object_store.py,sha256=zGAyRR1O6EN52p7sFQtDWxa7ASx3HJSsO4d4tJr-beE,3237
 dkist_processing_common/tasks/mixin/quality/__init__.py,sha256=GOI_PBUxTmYp5IIuYFbwpA5Vx0jUwpdBBYYrnZMTh0E,384
 dkist_processing_common/tasks/mixin/quality/_base.py,sha256=qt9TZZ140skFWFmabrjlGdm60OLWEfx_xZAaohr6dLM,8492
-dkist_processing_common/tasks/mixin/quality/_metrics.py,sha256=k0hlthVbW7Jso9q_P0-hWGfp190kQO_oUQyGBRvxgqo,60626
+dkist_processing_common/tasks/mixin/quality/_metrics.py,sha256=TtM6V7qy0U6ofFmjXNoJKkaECoPSfJsU4Ziu1UQgPZs,60457
 dkist_processing_common/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkist_processing_common/tests/conftest.py,sha256=Tm-Yq956EAafpDtu1d7JjdVY0Unp9e4z9ak-yf4wnH4,22320
 dkist_processing_common/tests/mock_metadata_store.py,sha256=-uzwbLeRn19_Pq1hr97R4hpUD5K5sv8Zy1U8gG0GdSQ,9657
@@ -98,7 +99,7 @@ dkist_processing_common/tests/test_parameters.py,sha256=CUEUIGBPMCUXPll0G0UxFDbM
 dkist_processing_common/tests/test_parse_l0_input_data.py,sha256=9OOqeMX8ReQO67ldoMHOBKLQg7Nd5qWHOEoHygcN5Ic,11889
 dkist_processing_common/tests/test_publish_catalog_messages.py,sha256=l6Wga1s2wNBIf4wGZ78ZIO_rtqjdidmtvlN9nMnQUAs,3222
 dkist_processing_common/tests/test_quality.py,sha256=IPz7liXcmoqWIsY78oX07Ui0nWHxoUH2FbKGEmMle7E,10258
-dkist_processing_common/tests/test_quality_mixin.py,sha256=qanm3SXEiLb0OJDawbh8ixVAG9uRglFMzwxTeYxkDsM,55369
+dkist_processing_common/tests/test_quality_mixin.py,sha256=L-_kSIKs8A48LGt9QaItZWZqIcRF0MhBCAZQZYdSflk,55575
 dkist_processing_common/tests/test_scratch.py,sha256=WO8C1VJlkcC5IzST9Hj08CyyrINwYcN8pyteD9x38xs,16482
 dkist_processing_common/tests/test_stems.py,sha256=p__51u-b8vfWLI71aLxF3w2tcWtv6M6DyHJ7_6FZMHI,38949
 dkist_processing_common/tests/test_submit_dataset_metadata.py,sha256=LHEyjoIxJHXXssqKkr8Qn1NzzHD1FLJiD3lP8yaLiXU,3764
@@ -120,7 +121,7 @@ docs/landing_page.rst,sha256=aPAuXFhBx73lEZ59B6E6JXxkK0LlxzD0n-HXqHrfumQ,746
 docs/make.bat,sha256=mBAhtURwhQ7yc95pqwJzlhqBSvRknr1aqZ5s8NKvdKs,4513
 docs/requirements.txt,sha256=Kbl_X4c7RQZw035YTeNB63We6I7pvXFU4T0Uflp2yDY,29
 licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
-dkist_processing_common-11.8.0rc1.dist-info/METADATA,sha256=k1cSXjEW_NNR3JwR7h55s9SFLH-H2k4XfT-RigHlAsQ,13325
-dkist_processing_common-11.8.0rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dkist_processing_common-11.8.0rc1.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
-dkist_processing_common-11.8.0rc1.dist-info/RECORD,,
+dkist_processing_common-11.8.1rc1.dist-info/METADATA,sha256=NYCeHObiAfRk7vTivtK12GGrN8deYQa4xCCxb649FpM,13332
+dkist_processing_common-11.8.1rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dkist_processing_common-11.8.1rc1.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
+dkist_processing_common-11.8.1rc1.dist-info/RECORD,,

changelog/245.feature.1.rst

@@ -1 +0,0 @@
-Add parameters and their associated values relevant to a particular processing pipeline run to the metadata ASDF file generated in trial workflows.