dkist-processing-cryonirsp 1.9.0__py3-none-any.whl → 1.10.0__py3-none-any.whl

dkist_processing_cryonirsp/tests/local_trial_workflows/l0_cals_only.py

@@ -14,7 +14,7 @@ from dkist_service_configuration.logging import logger
 from dkist_processing_cryonirsp.models.constants import CryonirspBudName
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks import CIBeamBoundariesCalibration
-from dkist_processing_cryonirsp.tasks import SPDispersionAxisCorrection
+from dkist_processing_cryonirsp.tasks import SPWavelengthCalibration
 from dkist_processing_cryonirsp.tasks.bad_pixel_map import BadPixelMapCalibration
 from dkist_processing_cryonirsp.tasks.cryonirsp_base import CryonirspTaskBase
 from dkist_processing_cryonirsp.tasks.dark import DarkCalibration
@@ -47,9 +47,6 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
     LoadBeamBoundaryCal,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import LoadDarkCal
-from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    LoadDispersionAxisCorrection,
-)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     LoadGeometricCal,
 )
@@ -61,6 +58,9 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
     LoadLinearizedFiles,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import LoadSolarCal
+from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
+    LoadWavelengthCorrection,
+)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     save_parsing_task,
 )
@@ -71,9 +71,6 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
     SaveBeamBoundaryCal,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import SaveDarkCal
-from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    SaveDispersionAxisCorrection,
-)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     SaveGeometricCal,
 )
@@ -85,6 +82,9 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
     SaveLinearizedFiles,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import SaveSolarCal
+from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
+    SaveWavelengthCorrection,
+)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     tag_inputs_task,
 )
@@ -224,7 +224,7 @@ def SP_workflow(
     load_lamp: bool = False,
     load_geometric: bool = False,
     load_solar: bool = False,
-    load_dispersion_correction: bool = False,
+    load_wavelength_correction: bool = False,
     load_inst_pol: bool = False,
 ) -> None:
     if load_beam_boundaries:
@@ -257,11 +257,11 @@ def SP_workflow(
         manual_processing_run.run_task(task=SPSolarGainCalibration)
         manual_processing_run.run_task(task=SaveSolarCal)
 
-    if load_dispersion_correction:
-        manual_processing_run.run_task(task=LoadDispersionAxisCorrection)
+    if load_wavelength_correction:
+        manual_processing_run.run_task(task=LoadWavelengthCorrection)
     else:
-        manual_processing_run.run_task(task=SPDispersionAxisCorrection)
-        manual_processing_run.run_task(task=SaveDispersionAxisCorrection)
+        manual_processing_run.run_task(task=SPWavelengthCalibration)
+        manual_processing_run.run_task(task=SaveWavelengthCorrection)
 
     if load_inst_pol:
         manual_processing_run.run_task(task=LoadInstPolCal)
@@ -287,7 +287,7 @@ def main(
     load_lamp: bool = False,
     load_geometric: bool = False,
     load_solar: bool = False,
-    load_dispersion_correction: bool = False,
+    load_wavelength_correction: bool = False,
     load_inst_pol: bool = False,
     use_apm: bool = False,
     param_path: Path = None,
@@ -378,7 +378,7 @@ def main(
                 load_lamp=load_lamp,
                 load_geometric=load_geometric,
                 load_solar=load_solar,
-                load_dispersion_correction=load_dispersion_correction,
+                load_wavelength_correction=load_wavelength_correction,
                 load_inst_pol=load_inst_pol,
             )
         elif arm_id == "CI":
@@ -481,8 +481,8 @@ if __name__ == "__main__":
     )
     parser.add_argument(
         "-W",
-        "--load-dispersion-correction",
-        help="Load dispersion correction solution from previously saved run",
+        "--load-wavelength-correction",
+        help="Load wavelength correction solution from previously saved run",
         action="store_true",
     )
     parser.add_argument(
@@ -524,7 +524,7 @@ if __name__ == "__main__":
             load_lamp=args.load_lamp,
             load_geometric=args.load_geometric,
             load_solar=args.load_solar,
-            load_dispersion_correction=args.load_dispersion_correction,
+            load_wavelength_correction=args.load_wavelength_correction,
             load_inst_pol=args.load_inst_pol,
             use_apm=args.use_apm,
             param_path=Path(args.param_path),

dkist_processing_cryonirsp/tests/local_trial_workflows/l0_to_l1.py

@@ -39,12 +39,10 @@ from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspSPLinearizedD
 from dkist_processing_cryonirsp.tasks.quality_metrics import CryonirspL0QualityMetrics
 from dkist_processing_cryonirsp.tasks.quality_metrics import CryonirspL1QualityMetrics
 from dkist_processing_cryonirsp.tasks.sp_beam_boundaries import SPBeamBoundariesCalibration
-from dkist_processing_cryonirsp.tasks.sp_dispersion_axis_correction import (
-    SPDispersionAxisCorrection,
-)
 from dkist_processing_cryonirsp.tasks.sp_geometric import SPGeometricCalibration
 from dkist_processing_cryonirsp.tasks.sp_science import SPScienceCalibration
 from dkist_processing_cryonirsp.tasks.sp_solar_gain import SPSolarGainCalibration
+from dkist_processing_cryonirsp.tasks.sp_wavelength_calibration import SPWavelengthCalibration
 from dkist_processing_cryonirsp.tasks.write_l1 import CIWriteL1Frame
 from dkist_processing_cryonirsp.tasks.write_l1 import SPWriteL1Frame
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
@@ -61,9 +59,6 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
     LoadBeamBoundaryCal,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import LoadDarkCal
-from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    LoadDispersionAxisCorrection,
-)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     LoadGeometricCal,
 )
@@ -75,6 +70,9 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
     LoadLinearizedFiles,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import LoadSolarCal
+from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
+    LoadWavelengthCorrection,
+)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     save_parsing_task,
 )
@@ -85,9 +83,6 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
     SaveBeamBoundaryCal,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import SaveDarkCal
-from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    SaveDispersionAxisCorrection,
-)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     SaveGeometricCal,
 )
@@ -99,6 +94,9 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
     SaveLinearizedFiles,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import SaveSolarCal
+from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
+    SaveWavelengthCorrection,
+)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     tag_inputs_task,
 )
@@ -254,7 +252,7 @@ def SP_workflow(
     load_geometric: bool = False,
     load_solar: bool = False,
     load_inst_pol: bool = False,
-    load_dispersion_correction: bool = False,
+    load_wavelength_correction: bool = False,
 ) -> None:
     if load_beam_boundaries:
         manual_processing_run.run_task(task=LoadBeamBoundaryCal)
@@ -286,11 +284,11 @@ def SP_workflow(
         manual_processing_run.run_task(task=SPSolarGainCalibration)
         manual_processing_run.run_task(task=SaveSolarCal)
 
-    if load_dispersion_correction:
-        manual_processing_run.run_task(task=LoadDispersionAxisCorrection)
+    if load_wavelength_correction:
+        manual_processing_run.run_task(task=LoadWavelengthCorrection)
     else:
-        manual_processing_run.run_task(task=SPDispersionAxisCorrection)
-        manual_processing_run.run_task(task=SaveDispersionAxisCorrection)
+        manual_processing_run.run_task(task=SPWavelengthCalibration)
+        manual_processing_run.run_task(task=SaveWavelengthCorrection)
 
     if load_inst_pol:
         manual_processing_run.run_task(task=LoadInstPolCal)
@@ -322,8 +320,8 @@ def main(
     load_lamp: bool = False,
     load_geometric: bool = False,
     load_solar: bool = False,
-    load_dispersion_correction: bool = False,
     load_inst_pol: bool = False,
+    load_wavelength_calibration: bool = False,
     use_apm: bool = False,
     param_path: Path = None,
     transfer_trial_data: str | None = None,
@@ -414,7 +412,7 @@ def main(
                 load_lamp=load_lamp,
                 load_geometric=load_geometric,
                 load_solar=load_solar,
-                load_dispersion_correction=load_dispersion_correction,
+                load_wavelength_correction=load_wavelength_calibration,
                 load_inst_pol=load_inst_pol,
             )
         elif arm_id == "CI":
@@ -565,8 +563,8 @@ if __name__ == "__main__":
     )
     parser.add_argument(
         "-W",
-        "--load-dispersion-correction",
-        help="Load dispersion correction solution from previously saved run",
+        "--load-wavelength-calibration",
+        help="Load wavelength calibration solution from previously saved run",
         action="store_true",
     )
     parser.add_argument(
@@ -603,7 +601,7 @@ if __name__ == "__main__":
             load_lamp=args.load_lamp,
             load_geometric=args.load_geometric,
             load_solar=args.load_solar,
-            load_dispersion_correction=args.load_dispersion_correction,
+            load_wavelength_calibration=args.load_wavelength_calibration,
             load_inst_pol=args.load_inst_pol,
             use_apm=args.use_apm,
             param_path=Path(args.param_path),

dkist_processing_cryonirsp/tests/local_trial_workflows/local_trial_helpers.py

@@ -358,7 +358,7 @@ class SaveSolarCal(SaveTaskTags):
         ]
 
 
-class SaveDispersionAxisCorrection(SaveTaskTags):
+class SaveWavelengthCorrection(SaveTaskTags):
     @property
     def task_str(self) -> str:
         return CryonirspTaskName.spectral_fit.value
@@ -383,10 +383,10 @@ class LoadSolarCal(LoadTaskTags):
         return "solar_cal.asdf"
 
 
-class LoadDispersionAxisCorrection(LoadTaskTags):
+class LoadWavelengthCorrection(LoadTaskTags):
     @property
     def relative_save_file(self) -> str:
-        return "sp_dispersion_axis_correction.asdf"
+        return "sp_wavelength_correction.asdf"
 
 
 class SaveInstPolCal(SaveTaskTags):

dkist_processing_cryonirsp/tests/test_cryo_constants.py

@@ -1,6 +1,7 @@
 from dataclasses import asdict
 from dataclasses import dataclass
 
+import astropy.units as u
 import pytest
 
 from dkist_processing_cryonirsp.models.exposure_conditions import AllowableOpticalDensityFilterNames
@@ -29,6 +30,7 @@ def testing_constants(polarimetric):
         )
         modulator_spin_mode: str = "Continuous" if polarimetric else "Off"
         retarder_name: str = "SiO2 OC"
+        grating_constant: float = 6.28
         # We don't need all the common ones, but let's put one just to check
         instrument: str = "CHECK_OUT_THIS_INSTRUMENT"
         arm_id: str = "SP"
@@ -69,10 +71,11 @@ def cryo_science_task_with_constants(
 def test_cryo_constants(cryo_science_task_with_constants, expected_constant_dict, polarimetric):
     task = cryo_science_task_with_constants
     for k, v in expected_constant_dict.items():
-        if k.lower() in ["modulator_spin_mode", "retarder_name"]:
+        if k.lower() in ["modulator_spin_mode", "retarder_name", "grating_constant"]:
             continue
         if type(v) is tuple:
             v = list(v)
         assert getattr(task.constants, k.lower()) == v
     assert task.constants.correct_for_polarization == polarimetric
     assert task.constants.pac_init_set == "OCCal_VIS"
+    assert task.constants.grating_constant == expected_constant_dict["GRATING_CONSTANT"] / u.mm

dkist_processing_cryonirsp/tests/test_parameters.py

@@ -12,6 +12,7 @@ from hypothesis import given
 from hypothesis import HealthCheck
 from hypothesis import settings
 from hypothesis import strategies as st
+from pydantic import BaseModel
 
 from dkist_processing_cryonirsp.models.parameters import CryonirspParameters
 from dkist_processing_cryonirsp.models.parameters import CryonirspParsingParameters
@@ -199,9 +200,12 @@ def test_parameters(basic_science_task_with_parameter_mixin):
             or parameter_name in PARSE_PARAMETER_NAMES
         ):
             continue
+
         accessed_parameter_value = getattr(task_params, parameter_name)
         if isinstance(accessed_parameter_value, Quantity):
             assert pv == accessed_parameter_value.value
+        elif isinstance(accessed_parameter_value, BaseModel):
+            assert accessed_parameter_value.model_dump() == pv
         else:
             assert pv == getattr(task_params, parameter_name)
 

dkist_processing_cryonirsp/tests/test_parse.py

@@ -88,6 +88,8 @@ def write_solar_gain_frames_to_task(
     array_shape=(2, 2, 1),
     tags: list[str] | None = None,
     num_modstates: int = 1,
+    center_wavelength: float = 1080.0,
+    slit_width: float = 52.0,
 ):
     num_frames = 0
     for modstate in range(1, num_modstates + 1):
@@ -96,6 +98,8 @@ def write_solar_gain_frames_to_task(
             exposure_condition=exposure_condition,
             num_modstates=num_modstates,
             modstate=modstate,
+            center_wavelength=center_wavelength,
+            slit_width=slit_width,
         )
 
         num_frames += _write_frames_to_task(
@@ -146,6 +150,8 @@ def write_observe_frames_to_task(
     exposure_condition: ExposureConditions,
     change_translated_headers: Callable[[fits.Header | None], fits.Header] = lambda x: x,
     array_shape=(2, 2, 1),
+    center_wavelength: float = 1080.0,
+    slit_width: float = 52.0,
     tags: list[str] | None = None,
 ):
     num_frames = 0
@@ -174,6 +180,8 @@ def write_observe_frames_to_task(
                             num_meas=num_measurements,
                             meas_num=measurement,
                             arm_id=arm_id,
+                            center_wavelength=center_wavelength,
+                            slit_width=slit_width,
                         )
                         start_time += frame_delta_time
 
@@ -250,6 +258,8 @@ def make_linearized_test_frames(
     num_map_scans: int = 1,
     num_sub_repeats: int = 1,
     num_measurements: int = 1,
+    center_wavelength: float = 1080.0,
+    slit_width: float = 52.0,
     extra_headers: dict | None = None,
 ):
     if extra_headers is None:
@@ -271,13 +281,15 @@ def make_linearized_test_frames(
         task,
         tags=lin_tag,
         exposure_condition=lamp_exposure_condition,
-        num_modstates=num_modstates or 1,  # We *always* need dark frames
+        num_modstates=num_modstates or 1,  # We *always* need lamp frames
     )
     num_solar = write_solar_gain_frames_to_task(
         task,
         tags=lin_tag,
         exposure_condition=solar_exposure_condition,
-        num_modstates=num_modstates or 1,  # We *always* need dark frames
+        num_modstates=num_modstates or 1,  # We *always* need solar frames
+        center_wavelength=center_wavelength,
+        slit_width=slit_width,
     )
 
     num_polcal += write_polcal_frames_to_task(
@@ -299,6 +311,8 @@ def make_linearized_test_frames(
         num_measurements=num_measurements,
         tags=lin_tag,
         change_translated_headers=change_translated_headers,
+        center_wavelength=center_wavelength,
+        slit_width=slit_width,
     )
 
     return num_dark, num_lamp, num_solar, num_polcal, num_obs
@@ -1200,6 +1214,8 @@ def test_parse_cryonirsp_linearized_data_constants(
     num_scan_steps = 3
     num_map_scans = 2
     num_sub_repeats = 2
+    center_wavelength = 1234.0
+    slit_width = 6.28
 
     make_linearized_test_frames(
         task,
@@ -1213,6 +1229,8 @@ def test_parse_cryonirsp_linearized_data_constants(
         solar_exposure_condition=solar_exp_cond,
         polcal_exposure_condition=polcal_exp_cond,
         observe_exposure_condition=obs_exp_cond,
+        center_wavelength=center_wavelength,
+        slit_width=slit_width,
     )
 
     task()
@@ -1248,6 +1266,14 @@ def test_parse_cryonirsp_linearized_data_constants(
     assert task.constants._db_dict["MINIMUM_CADENCE"] == 10
     assert task.constants._db_dict["VARIANCE_CADENCE"] == 0
     assert task.constants._db_dict[BudName.retarder_name] == "Cool retarder"
+    if arm_id == "SP":
+        assert (
+            task.constants._db_dict[CryonirspBudName.center_wavelength.value] == center_wavelength
+        )
+        assert task.constants._db_dict[CryonirspBudName.slit_width.value] == slit_width
+        assert (
+            task.constants._db_dict[CryonirspBudName.grating_constant.value] == 770970.3576216539
+        )  # From `SimpleModulatedHeaders`
 
 
 @pytest.mark.parametrize("arm_id", ["SP"])

dkist_processing_cryonirsp/tests/{test_sp_dispersion_axis_correction.py → test_sp_wavelength_calibration.py}

@@ -2,19 +2,16 @@ from datetime import datetime
 
 import numpy as np
 import pytest
-from astropy import units as u
 from astropy.io import fits
 from dkist_header_validator import spec122_validator
 from dkist_processing_common._util.scratch import WorkflowFileSystem
-from dkist_processing_common.codecs.asdf import asdf_decoder
 from dkist_processing_common.codecs.fits import fits_array_encoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
+from dkist_processing_common.codecs.json import json_decoder
 from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
-from dkist_processing_cryonirsp.tasks.sp_dispersion_axis_correction import (
-    SPDispersionAxisCorrection,
-)
+from dkist_processing_cryonirsp.tasks.sp_wavelength_calibration import SPWavelengthCalibration
 from dkist_processing_cryonirsp.tests.conftest import cryonirsp_testing_parameters_factory
 from dkist_processing_cryonirsp.tests.conftest import CryonirspConstantsDb
 from dkist_processing_cryonirsp.tests.conftest import generate_fits_frame
@@ -47,7 +44,7 @@ def sp_dispersion_axis_correction_task(
         SOLAR_GAIN_IP_START_TIME="2021-01-01T00:00:00",
     )
     init_cryonirsp_constants_db(recipe_run_id, constants_db)
-    with SPDispersionAxisCorrection(
+    with SPWavelengthCalibration(
         recipe_run_id=recipe_run_id,
         workflow_name="sp_dispersion_axis_correction",
         workflow_version="VX.Y",
@@ -99,6 +96,8 @@ def sp_dispersion_axis_correction_task(
                 )
                 hdul = generate_fits_frame(header_generator=header_generator, shape=array_shape)
                 header = hdul[0].header
+                # set the slit width to a realistic Cryo value
+                header["CNSLITW"] = 175
                 task.write(
                     data=hdul,
                     tags=[
@@ -131,23 +130,7 @@ def test_sp_dispersion_axis_correction(sp_dispersion_axis_correction_task, mocke
         CryonirspTag.task_spectral_fit(),
         CryonirspTag.intermediate(),
     ]
-    fit_result = next(task.read(tags=tags, decoder=asdf_decoder))
-    del fit_result["asdf_library"]
-    del fit_result["history"]
-
-    expected_wavelength_vector = task.compute_expected_wavelength_vector(
-        np.random.rand(100), original_header
-    )
-
-    (
-        telluric_atlas_wave,
-        telluric_atlas_trans,
-        solar_atlas_wave_air,
-        solar_atlas_trans_flipped,
-    ) = task.load_and_resample_fts_atlas(expected_wavelength_vector)
-
-    assert len(telluric_atlas_wave) == len(telluric_atlas_trans)
-    assert len(solar_atlas_wave_air) == len(solar_atlas_trans_flipped)
+    fit_result = next(task.read(tags=tags, decoder=json_decoder))
 
     # make sure that the values have changed
     assert original_header["CRVAL1"] != fit_result["CRVAL1"]

dkist_processing_cryonirsp/tests/test_write_l1.py

@@ -7,8 +7,8 @@ from astropy.io import fits
 from astropy.time import Time
 from dkist_fits_specifications import __version__ as spec_version
 from dkist_header_validator import spec214_validator
-from dkist_processing_common.codecs.asdf import asdf_encoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
+from dkist_processing_common.codecs.json import json_encoder
 from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
@@ -100,7 +100,7 @@ def write_l1_task(
                 hdul[0].header["CNSPINMD"] = "None"
 
             if arm_id == "SP":
-                write_dummy_sp_dispersion_intermediate(task, hdul[0].header)
+                write_dummy_sp_dispersion_intermediate(task)
 
             for map_scan in range(1, num_map_scans + 1):
                 for scan_step in range(1, num_scan_steps + 1):
@@ -127,24 +127,24 @@ def write_l1_task(
             task._purge()
 
 
-def write_dummy_sp_dispersion_intermediate(task: SPWriteL1Frame, header: fits.Header) -> None:
-    overwrite_keys = [
-        "CRVAL1",
-        "CDELT1",
-        "CRVAL1A",
-        "CDELT1A",
-    ]
+def write_dummy_sp_dispersion_intermediate(task: SPWriteL1Frame) -> None:
+    dummy_fit_solution = {
+        "CTYPE1": "AWAV-GRA",
+        "CUNIT1": "nm",
+        "CRPIX1": 5,  # This needs to be 5 for `axis_flip_tests`
+        "CRVAL1": 9999.0,
+        "CDELT1": 4.56,
+        "PV1_0": 78.9,
+        "PV1_1": 51,
+        "PV1_2": 11121,
+    }
 
-    # Guaranteed to be different than the OG header values
-    dummy_fit_solution = {k: header[k] * (np.random.random() + 1.1) for k in overwrite_keys}
-    dummy_fit_solution["PV1_0"] = np.random.random()
-    dummy_fit_solution["PV1_1"] = np.random.randint(4)
-    dummy_fit_solution["PV1_2"] = np.random.random()
+    dummy_fit_solution = dummy_fit_solution | {f"{k}A": v for k, v in dummy_fit_solution.items()}
 
     task.write(
         data=dummy_fit_solution,
         tags=[CryonirspTag.intermediate(), CryonirspTag.task_spectral_fit()],
-        encoder=asdf_encoder,
+        encoder=json_encoder,
     )
 
 

dkist_processing_cryonirsp/workflows/sp_l0_processing.py

@@ -18,13 +18,13 @@ from dkist_processing_cryonirsp.tasks import LinearityCorrection
 from dkist_processing_cryonirsp.tasks import MakeCryonirspMovieFrames
 from dkist_processing_cryonirsp.tasks import ParseL0CryonirspRampData
 from dkist_processing_cryonirsp.tasks import SPBeamBoundariesCalibration
-from dkist_processing_cryonirsp.tasks import SPDispersionAxisCorrection
 from dkist_processing_cryonirsp.tasks import SPGeometricCalibration
 from dkist_processing_cryonirsp.tasks import (
     SPInstrumentPolarizationCalibration,
 )
 from dkist_processing_cryonirsp.tasks import SPScienceCalibration
 from dkist_processing_cryonirsp.tasks import SPSolarGainCalibration
+from dkist_processing_cryonirsp.tasks import SPWavelengthCalibration
 from dkist_processing_cryonirsp.tasks import SPWriteL1Frame
 from dkist_processing_cryonirsp.tasks.l1_output_data import SPAssembleQualityData
 from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspSPLinearizedData
@@ -52,11 +52,11 @@ l0_pipeline.add_node(task=DarkCalibration, upstreams=SPBeamBoundariesCalibration
 l0_pipeline.add_node(task=LampGainCalibration, upstreams=DarkCalibration)
 l0_pipeline.add_node(task=SPGeometricCalibration, upstreams=LampGainCalibration)
 l0_pipeline.add_node(task=SPSolarGainCalibration, upstreams=SPGeometricCalibration)
-l0_pipeline.add_node(task=SPDispersionAxisCorrection, upstreams=SPSolarGainCalibration)
+l0_pipeline.add_node(task=SPWavelengthCalibration, upstreams=SPSolarGainCalibration)
 l0_pipeline.add_node(task=SPInstrumentPolarizationCalibration, upstreams=SPSolarGainCalibration)
 l0_pipeline.add_node(
     task=SPScienceCalibration,
-    upstreams=[SPInstrumentPolarizationCalibration, SPDispersionAxisCorrection],
+    upstreams=[SPInstrumentPolarizationCalibration, SPWavelengthCalibration],
 )
 l0_pipeline.add_node(task=SPWriteL1Frame, upstreams=SPScienceCalibration)
 

dkist_processing_cryonirsp/workflows/trial_workflows.py

@@ -26,13 +26,13 @@ from dkist_processing_cryonirsp.tasks import LinearityCorrection
 from dkist_processing_cryonirsp.tasks import MakeCryonirspMovieFrames
 from dkist_processing_cryonirsp.tasks import ParseL0CryonirspRampData
 from dkist_processing_cryonirsp.tasks import SPBeamBoundariesCalibration
-from dkist_processing_cryonirsp.tasks import SPDispersionAxisCorrection
 from dkist_processing_cryonirsp.tasks import SPGeometricCalibration
 from dkist_processing_cryonirsp.tasks import (
     SPInstrumentPolarizationCalibration,
 )
 from dkist_processing_cryonirsp.tasks import SPScienceCalibration
 from dkist_processing_cryonirsp.tasks import SPSolarGainCalibration
+from dkist_processing_cryonirsp.tasks import SPWavelengthCalibration
 from dkist_processing_cryonirsp.tasks import SPWriteL1Frame
 from dkist_processing_cryonirsp.tasks.l1_output_data import CIAssembleQualityData
 from dkist_processing_cryonirsp.tasks.l1_output_data import SPAssembleQualityData
@@ -139,14 +139,14 @@ full_trial_sp_pipeline.add_node(task=DarkCalibration, upstreams=SPBeamBoundaries
 full_trial_sp_pipeline.add_node(task=LampGainCalibration, upstreams=DarkCalibration)
 full_trial_sp_pipeline.add_node(task=SPGeometricCalibration, upstreams=LampGainCalibration)
 full_trial_sp_pipeline.add_node(task=SPSolarGainCalibration, upstreams=SPGeometricCalibration)
-full_trial_sp_pipeline.add_node(task=SPDispersionAxisCorrection, upstreams=SPSolarGainCalibration)
+full_trial_sp_pipeline.add_node(task=SPWavelengthCalibration, upstreams=SPSolarGainCalibration)
 
 full_trial_sp_pipeline.add_node(
     task=SPInstrumentPolarizationCalibration, upstreams=SPSolarGainCalibration
 )
 full_trial_sp_pipeline.add_node(
     task=SPScienceCalibration,
-    upstreams=[SPInstrumentPolarizationCalibration, SPDispersionAxisCorrection],
+    upstreams=[SPInstrumentPolarizationCalibration, SPWavelengthCalibration],
 )
 full_trial_sp_pipeline.add_node(task=SPWriteL1Frame, upstreams=SPScienceCalibration)
 

{dkist_processing_cryonirsp-1.9.0.dist-info → dkist_processing_cryonirsp-1.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-cryonirsp
-Version: 1.9.0
+Version: 1.10.0
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -30,6 +30,7 @@ Requires-Dist: peakutils==1.3.5
 Requires-Dist: scikit-image==0.25.2
 Requires-Dist: scipy==1.15.3
 Requires-Dist: sunpy==6.1.1
+Requires-Dist: solar-wavelength-calibration==1.0
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
@@ -114,7 +115,7 @@ Requires-Dist: asdf_transform_schemas==0.6.0; extra == "frozen"
 Requires-Dist: asgiref==3.9.1; extra == "frozen"
 Requires-Dist: asteval==1.0.6; extra == "frozen"
 Requires-Dist: astropy==7.0.2; extra == "frozen"
-Requires-Dist: astropy-iers-data==0.2025.7.7.0.39.39; extra == "frozen"
+Requires-Dist: astropy-iers-data==0.2025.7.14.0.40.29; extra == "frozen"
 Requires-Dist: asyncpg==0.30.0; extra == "frozen"
 Requires-Dist: attrs==25.3.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
@@ -124,7 +125,7 @@ Requires-Dist: boto3==1.39.4; extra == "frozen"
 Requires-Dist: botocore==1.39.4; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
 Requires-Dist: celery==5.5.3; extra == "frozen"
-Requires-Dist: certifi==2025.7.9; extra == "frozen"
+Requires-Dist: certifi==2025.7.14; extra == "frozen"
 Requires-Dist: cffi==1.17.1; extra == "frozen"
 Requires-Dist: charset-normalizer==3.4.2; extra == "frozen"
 Requires-Dist: click==8.2.1; extra == "frozen"
@@ -146,7 +147,7 @@ Requires-Dist: dill==0.4.0; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.2.1; extra == "frozen"
 Requires-Dist: dkist-processing-common==11.0.1; extra == "frozen"
 Requires-Dist: dkist-processing-core==5.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-cryonirsp==1.9.0; extra == "frozen"
+Requires-Dist: dkist-processing-cryonirsp==1.10.0; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.0; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
 Requires-Dist: dkist-service-configuration==2.2; extra == "frozen"
@@ -208,14 +209,14 @@ Requires-Dist: networkx==3.5; extra == "frozen"
 Requires-Dist: numba==0.61.2; extra == "frozen"
 Requires-Dist: numpy==2.2.5; extra == "frozen"
 Requires-Dist: object-clerk==0.1.2; extra == "frozen"
-Requires-Dist: opentelemetry-api==1.34.1; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp==1.34.1; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.34.1; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.34.1; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.34.1; extra == "frozen"
-Requires-Dist: opentelemetry-proto==1.34.1; extra == "frozen"
-Requires-Dist: opentelemetry-sdk==1.34.1; extra == "frozen"
-Requires-Dist: opentelemetry-semantic-conventions==0.55b1; extra == "frozen"
+Requires-Dist: opentelemetry-api==1.35.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp==1.35.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.35.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.35.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.35.0; extra == "frozen"
+Requires-Dist: opentelemetry-proto==1.35.0; extra == "frozen"
+Requires-Dist: opentelemetry-sdk==1.35.0; extra == "frozen"
+Requires-Dist: opentelemetry-semantic-conventions==0.56b0; extra == "frozen"
 Requires-Dist: ordered-set==4.1.0; extra == "frozen"
 Requires-Dist: packaging==25.0; extra == "frozen"
 Requires-Dist: pandas==2.3.1; extra == "frozen"
@@ -233,7 +234,7 @@ Requires-Dist: proglog==0.1.12; extra == "frozen"
 Requires-Dist: prometheus_client==0.22.1; extra == "frozen"
 Requires-Dist: prompt_toolkit==3.0.51; extra == "frozen"
 Requires-Dist: propcache==0.3.2; extra == "frozen"
-Requires-Dist: protobuf==5.29.5; extra == "frozen"
+Requires-Dist: protobuf==6.31.1; extra == "frozen"
 Requires-Dist: psutil==7.0.0; extra == "frozen"
 Requires-Dist: psycopg2-binary==2.9.10; extra == "frozen"
 Requires-Dist: py==1.11.0; extra == "frozen"