dkist-processing-cryonirsp 1.4.20__py3-none-any.whl → 1.14.9rc1__py3-none-any.whl

dkist_processing_cryonirsp/tests/conftest.py

@@ -1,11 +1,9 @@
 import json
-import os
 from collections.abc import Iterable
 from dataclasses import asdict
 from dataclasses import dataclass
 from dataclasses import field
 from dataclasses import is_dataclass
-from pathlib import Path
 from random import randint
 from typing import Any
 from typing import Callable
@@ -21,8 +19,16 @@ from dkist_data_simulator.spec122 import Spec122Dataset
 from dkist_header_validator import spec122_validator
 from dkist_header_validator.translator import sanitize_to_spec214_level1
 from dkist_header_validator.translator import translate_spec122_to_spec214_l0
+from dkist_processing_common.codecs.array import array_encoder
+from dkist_processing_common.codecs.basemodel import basemodel_encoder
 from dkist_processing_common.codecs.fits import fits_array_encoder
+from dkist_processing_common.models.input_dataset import InputDatasetFilePointer
+from dkist_processing_common.models.input_dataset import InputDatasetObject
+from dkist_processing_common.models.input_dataset import InputDatasetPartDocumentList
 from dkist_processing_common.tasks import WorkflowTaskBase
+from dkist_processing_common.tests.mock_metadata_store import fake_gql_client
+from pydantic import Field
+from pydantic import model_validator
 
 from dkist_processing_cryonirsp.models.constants import CryonirspConstants
 from dkist_processing_cryonirsp.models.exposure_conditions import AllowableOpticalDensityFilterNames
@@ -143,6 +149,7 @@ class CryonirspConstantsDb:
     )
     SPECTRAL_LINE: str = "CRSP Ca II H"
     MODULATOR_SPIN_MODE: str = "Continuous"
+    RETARDER_NAME: str = "SiO2 OC"
     STOKES_PARAMS: tuple[str] = (
         "I",
         "Q",
@@ -160,7 +167,7 @@ class CryonirspConstantsDb:
         "EXPERID3",
     )
     # These are SP defaults...
-    AXIS_1_TYPE: str = "AWAV"
+    AXIS_1_TYPE: str = "AWAV-GRA"
     AXIS_2_TYPE: str = "HPLT-TAN"
     AXIS_3_TYPE: str = "HPLN-TAN"
     ROI_1_ORIGIN_X: int = 0
@@ -170,7 +177,9 @@ class CryonirspConstantsDb:
     GRATING_POSITION_DEG: float = 62.505829779431224
     GRATING_LITTROW_ANGLE_DEG: float = -5.5
     GRATING_CONSTANT: float = 31.6
-    SOLAR_GAIN_IP_START_TIME: str = "2021-01-01T00:00:00"
+    SOLAR_GAIN_START_TIME: str = "2021-01-01T00:00:00"
+    CENTER_WAVELENGTH: float = 1074.9
+    SLIT_WIDTH: int = 175
 
 
 @pytest.fixture()
@@ -249,65 +258,65 @@ class WavelengthParameter:
         return hash((self.values, self.wavelength))
 
 
-@dataclass
-class FileParameter:
-    """For parameters that are files on disk."""
-
-    param_path: str
-    is_file: bool = True
-    objectKey: str = "not_used_because_its_already_converted"
-    bucket: str = "not_used_because_we_dont_transfer"
-    # Note: we have these as already-parsed file parameter (i.e., no "__file__") mainly because it allows us to have
-    #       parameter files that are outside of the workflow basepath (where they would not be able to be tagged with
-    #       PARAMETER_FILE). This is a pattern that we see in grogu testing.
-    #       A downside of this approach is that we are slightly more fragile to changes in the underlying __file__ parsing
-    #       in `*-common`. Apologies to any future devs who run into this problem. To fix it you'll need to make
-    #       downstream fixtures aware of the actual files so they can be tagged prior to the instantiation of the
-    #       Parameter object on some Task.
+class FileObject(InputDatasetObject):
+    """For files on disk, with attributes overridden to have defaults."""
+
+    bucket: str | None = None
+    object_key: str | None = None
+
+    def __hash__(self):
+        return hash((self.bucket, self.object_key, self.tag))
+
+
+class FileParameter(InputDatasetFilePointer):
+    """For parameters that are files, with additional attributes to make FileObjects."""
+
+    object_key: str | None = Field(
+        default="dummy_default_value", exclude=True
+    )  # Not necessary, but useful for GROGU
+    file_pointer: FileObject = Field(default_factory=lambda: FileObject(), alias="__file__")
+
+    @model_validator(mode="after")
+    def _populate_file_object(self):
+        self.file_pointer.bucket = "not_used_because_we_dont_transfer"
+        self.file_pointer.object_key = self.object_key
+        self.file_pointer.tag = CryonirspTag.parameter((self.object_key))
+        return self
 
 
 # These constants are used to prevent name errors in _create_parameter_files
-# and in CryonirspTestingParameters
+# and in CryonirspTestingParameters.
 LINEARIZATION_THRESHOLDS_CI = "cryonirsp_linearization_thresholds_ci.npy"
 LINEARIZATION_THRESHOLDS_SP = "cryonirsp_linearization_thresholds_sp.npy"
-SOLAR_ATLAS = "cryonirsp_solar_atlas.npy"
-TELLURIC_ATLAS = "cryonirsp_telluric_atlas.npy"
 
 
-def _create_parameter_files(param_path: Path) -> None:
+def _create_parameter_files(task: WorkflowTaskBase) -> None:
     # linearization thresholds
     thresh = np.ones((10, 10), dtype=np.float64) * 100.0
-    np.save(os.path.join(param_path, LINEARIZATION_THRESHOLDS_CI), thresh)
-    np.save(os.path.join(param_path, LINEARIZATION_THRESHOLDS_SP), thresh)
-
-    # solar and telluric atlases
-    atlas_wavelengths = range(300, 16600)
-    atlas_transmission = np.random.rand(16300)
-    atlas = [atlas_wavelengths, atlas_transmission]
-    np.save(os.path.join(param_path, SOLAR_ATLAS), atlas)
-    np.save(os.path.join(param_path, TELLURIC_ATLAS), atlas)
+    task.write(
+        data=thresh, tags=CryonirspTag.parameter(LINEARIZATION_THRESHOLDS_CI), encoder=array_encoder
+    )
+    task.write(
+        data=thresh, tags=CryonirspTag.parameter(LINEARIZATION_THRESHOLDS_SP), encoder=array_encoder
+    )
 
 
 TestingParameters = TypeVar("TestingParameters", bound="CryonirspTestingParameters")
 
 
 def cryonirsp_testing_parameters_factory(
-    param_path: Path | str = "", create_files: bool = True
+    task: WorkflowTaskBase, create_files: bool = True
 ) -> TestingParameters:
     """Create the InputDatasetParameterValue objects and write the parameter files."""
-    if isinstance(param_path, str):
-        param_path = Path(param_path)
-    absolute_path = param_path.absolute()
 
     if create_files:
-        _create_parameter_files(absolute_path)
+        _create_parameter_files(task=task)
 
     @dataclass
     class CryonirspTestingParameters:
         cryonirsp_polcal_num_spatial_bins: int = 1
         cryonirsp_polcal_num_spectral_bins: int = 1
         cryonirsp_polcal_pac_fit_mode: str = "use_M12_I_sys_per_step"
-        cryonirsp_polcal_pac_init_set: str = "OCCal_VIS"
         cryonirsp_geo_upsample_factor: int = 100
         cryonirsp_geo_max_shift: int = 80
         cryonirsp_geo_poly_fit_order: int = 3
@@ -339,7 +348,7 @@ def cryonirsp_testing_parameters_factory(
         cryonirsp_fringe_correction_lowpass_cutoff_period: float = 40.0
         cryonirsp_linearization_thresholds_ci: FileParameter = field(
             default_factory=lambda: FileParameter(
-                param_path=str(absolute_path / LINEARIZATION_THRESHOLDS_CI)
+                object_key=LINEARIZATION_THRESHOLDS_CI,
             )
         )
         cryonirsp_linearization_polyfit_coeffs_ci: list[float] = field(
@@ -347,7 +356,7 @@ def cryonirsp_testing_parameters_factory(
         )
         cryonirsp_linearization_thresholds_sp: FileParameter = field(
             default_factory=lambda: FileParameter(
-                param_path=str(absolute_path / LINEARIZATION_THRESHOLDS_SP)
+                object_key=LINEARIZATION_THRESHOLDS_SP,
             )
         )
         cryonirsp_linearization_polyfit_coeffs_sp: list[float] = field(
@@ -363,14 +372,18 @@ def cryonirsp_testing_parameters_factory(
         cryonirsp_linearization_optical_density_filter_attenuation_g408: WavelengthParameter = (
             WavelengthParameter(values=(-4.26, -4.26, -4.26, -4.26))
         )
-        cryonirsp_solar_atlas: FileParameter = field(
-            default_factory=lambda: FileParameter(param_path=str(absolute_path / SOLAR_ATLAS))
-        )
-        cryonirsp_telluric_atlas: FileParameter = field(
-            default_factory=lambda: FileParameter(param_path=str(absolute_path / TELLURIC_ATLAS))
-        )
         cryonirsp_camera_mirror_focal_length_mm: float = 932.0
         cryonirsp_pixel_pitch_micron: float = 18.0
+        cryonirsp_wavecal_atlas_download_config: dict[str, str] = field(
+            default_factory=lambda: {
+                "base_url": "https://g-a36282.cd214.a567.data.globus.org/atlas/",
+                "telluric_reference_atlas_file_name": "telluric_reference_atlas.npy",
+                "telluric_reference_atlas_hash_id": "md5:8db5e12508b293bca3495d81a0747447",
+                "solar_reference_atlas_file_name": "solar_reference_atlas.npy",
+                "solar_reference_atlas_hash_id": "md5:84ab4c50689ef235fe5ed4f7ee905ca0",
+            }
+        )
+        cryonirsp_wavecal_fraction_of_unweighted_edge_pixels: int = 10
 
     return CryonirspTestingParameters
 
@@ -387,11 +400,15 @@ def testing_obs_ip_start_time() -> str:
 
 @pytest.fixture(scope="session")
 def input_dataset_document_simple_parameters_part():
-    def get_input_dataset_parameters_part(parameters):
+    """Convert a dataclass of parameterValues into an actual input dataset parameters part."""
+
+    def make_input_dataset_parameters_part(parameters):
         parameters_list = []
 
         value_id = randint(1000, 2000)
         for pn, pv in asdict(parameters).items():
+            if isinstance(pv, FileParameter):
+                pv = pv.model_dump()
             values = [
                 {
                     "parameterValueId": value_id,
@@ -403,7 +420,7 @@ def input_dataset_document_simple_parameters_part():
             parameters_list.append(parameter)
         return parameters_list
 
-    return get_input_dataset_parameters_part
+    return make_input_dataset_parameters_part
 
 
 @pytest.fixture(scope="session")
@@ -412,6 +429,8 @@ def assign_input_dataset_doc_to_task(
     testing_wavelength,
     testing_obs_ip_start_time,
 ):
+    """Load the parameters the way that tasks load the parameters in task init."""
+
     def update_task(
         task,
         parameters,
@@ -419,12 +438,15 @@ def assign_input_dataset_doc_to_task(
         arm_id: str = "SP",
         obs_ip_start_time=testing_obs_ip_start_time,
     ):
-        doc_path = task.scratch.workflow_base_path / "dataset_doc.json"
-        with open(doc_path, "w") as f:
-            f.write(json.dumps(input_dataset_document_simple_parameters_part(parameters)))
-        task.tag(doc_path, CryonirspTag.input_dataset_parameters())
+        task.write(
+            data=InputDatasetPartDocumentList(
+                doc_list=input_dataset_document_simple_parameters_part(parameters)
+            ),
+            tags=CryonirspTag.input_dataset_parameters(),
+            encoder=basemodel_encoder,
+        )
         task.parameters = parameter_class(
-            task.input_dataset_parameters,
+            scratch=task.scratch,
             wavelength=testing_wavelength,
             arm_id=arm_id,
             obs_ip_start_time=obs_ip_start_time,

dkist_processing_cryonirsp/tests/header_models.py

@@ -1,18 +1,16 @@
 """
 Model header objects
 """
+
 import datetime
 import random
 import uuid
 from random import choice
 
 import numpy as np
-import pytest
-from astropy.io import fits
 from astropy.wcs import WCS
 from dkist_data_simulator.dataset import key_function
 from dkist_data_simulator.spec122 import Spec122Dataset
-from dkist_header_validator import spec122_validator
 
 from dkist_processing_cryonirsp.models.exposure_conditions import AllowableOpticalDensityFilterNames
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
@@ -24,7 +22,8 @@ class CryonirspHeaders(Spec122Dataset):
         dataset_shape: tuple[int, ...],
         array_shape: tuple[int, ...],
         time_delta: 10,
-        instrument: str = "cryo-nirsp",
+        instrument: str = "cryonirsp",
+        exp_time: float = 15.0,
         **kwargs,
     ):
         super().__init__(
@@ -50,6 +49,20 @@ class CryonirspHeaders(Spec122Dataset):
         self.add_constant_key("CRSP_053", 1083.0)
         self.add_constant_key("CRSP_054", 1.0)
 
+        self.add_constant_key("CAM__004", exp_time)
+
+        self.add_constant_key("CAM__001", "camera_id")
+        self.add_constant_key("CAM__002", "camera_name")
+        self.add_constant_key("CAM__003", 1)
+        self.add_constant_key("CAM__009", 1)
+        self.add_constant_key("CAM__010", 1)
+        self.add_constant_key("CAM__011", 1)
+        self.add_constant_key("CAM__012", 1)
+        self.add_constant_key("ID___014", "v1")
+        self.add_constant_key("TELTRACK", "Fixed Solar Rotation Tracking")
+        self.add_constant_key("TTBLTRCK", "fixed angle on sun")
+        self.add_constant_key("CAM__014", 10)  # num_raw_frames_per_fpa
+
     @key_function("CRSP_042")
     # current modstate
     def current_modstate(self, key: str):
@@ -172,6 +185,13 @@ class CryonirspHeadersValidDarkFrames(CryonirspHeaders):
         self.add_constant_key("CRSP_041", 1)
         self.add_constant_key("CRSP_042", 1)
 
+        self.add_constant_key("TELSCAN", "Raster")
+        self.add_constant_key("PAC__002", "lamp")
+        self.add_constant_key("PAC__003", "on")
+        self.add_constant_key("PAC__004", "Sapphire Polarizer")
+        self.add_constant_key("PAC__006", "SiO2 OC")
+        self.add_constant_key("PAC__008", "FieldStop (5arcmin)")
+
 
 class CryonirspHeadersValidLampGainFrames(CryonirspHeaders):
     def __init__(
@@ -226,6 +246,10 @@ class CryonirspHeadersValidCISolarGainFrames(CryonirspHeaders):
         self.add_constant_key("CRSP_007", 1)
         # lamp (clear, lamp, undefined)
         self.add_constant_key("PAC__002", "clear")
+        self.add_constant_key("PAC__003", "off")
+        self.add_constant_key("PAC__004", "clear")
+        self.add_constant_key("PAC__006", "clear")
+        self.add_constant_key("PAC__008", "FieldStop (5arcmin)")
         self.add_constant_key("TELSCAN", "Raster")
         # inst prog id
         self.add_constant_key("ID___004")
@@ -259,6 +283,10 @@ class CryonirspHeadersValidSPSolarGainFrames(CryonirspHeaders):
         self.add_constant_key("CRSP_007", 1)
         # lamp (clear, lamp, undefined)
         self.add_constant_key("PAC__002", "clear")
+        self.add_constant_key("PAC__003", "off")
+        self.add_constant_key("PAC__004", "clear")
+        self.add_constant_key("PAC__006", "clear")
+        self.add_constant_key("PAC__008", "FieldStop (5arcmin)")
         self.add_constant_key("TELSCAN", "Raster")
         # inst prog id
         self.add_constant_key("ID___004")
@@ -374,6 +402,8 @@ class SimpleModulatedHeaders(CryonirspHeaders):
         ),
         start_date: str = "2023-01-01T01:23:45",
         modstate_length_sec: float = 0.5,
+        center_wavelength: float = 1080.0,
+        slit_width: float = 52.0,
     ):
         dataset_shape = (1, *array_shape)
         super().__init__(
@@ -395,9 +425,11 @@ class SimpleModulatedHeaders(CryonirspHeaders):
         self.add_constant_key("CRSP_042", modstate)
         self.add_constant_key("CAM__004", exposure_condition.exposure_time)
         self.add_constant_key("CRSP_048", exposure_condition.filter_name)
+        self.add_constant_key("CRSP_053", center_wavelength)
         self.add_constant_key("CRSP_074", grating_angle_deg)
         self.add_constant_key("CRSP_079", grating_littrow_angle)
         self.add_constant_key("CRSP_077", grating_constant)
+        self.add_constant_key("CRSP_082", slit_width)
         self.add_constant_key("CRVAL1", CRVAL1)
         self.add_constant_key("CRPIX1", CRPIX1)
         self.add_constant_key("CDELT1", CDELT1)
@@ -445,6 +477,8 @@ class ModulatedSolarGainHeaders(SimpleModulatedHeaders):
         modstate_length_sec: float = 0.5,
         num_modstates: int = 1,
         modstate: int = 1,
+        center_wavelength: float = 1080.0,
+        slit_width: float = 52.0,
     ):
         super().__init__(
             num_modstates=num_modstates,
@@ -454,6 +488,8 @@ class ModulatedSolarGainHeaders(SimpleModulatedHeaders):
             exposure_condition=exposure_condition,
             start_date=start_date,
             modstate_length_sec=modstate_length_sec,
+            center_wavelength=center_wavelength,
+            slit_width=slit_width,
         )
 
         self.add_constant_key("PAC__002", "clear")
@@ -469,6 +505,9 @@ class ModulatedSolarGainHeaders(SimpleModulatedHeaders):
         self.add_constant_key("CRSP_007", 1)
         # inst prog id
         self.add_constant_key("ID___004")
+        self.add_constant_key("PAC__004", "clear")
+        self.add_constant_key("PAC__006", "clear")
+        self.add_constant_key("PAC__008", "FieldStop (5arcmin)")
 
 
 class ModulatedDarkHeaders(SimpleModulatedHeaders):
@@ -502,6 +541,12 @@ class ModulatedDarkHeaders(SimpleModulatedHeaders):
         # inst prog id
         self.add_constant_key("ID___004")
         self.add_constant_key("WAVELNTH", 0.0)
+        self.add_constant_key("TELSCAN", "Raster")
+        self.add_constant_key("PAC__002", "lamp")
+        self.add_constant_key("PAC__003", "on")
+        self.add_constant_key("PAC__004", "Sapphire Polarizer")
+        self.add_constant_key("PAC__006", "SiO2 OC")
+        self.add_constant_key("PAC__008", "FieldStop (5arcmin)")
 
 
 class ModulatedPolcalHeaders(SimpleModulatedHeaders):
@@ -536,13 +581,15 @@ class ModulatedPolcalHeaders(SimpleModulatedHeaders):
         self.add_constant_key("PAC__007", "0.0")
         self.add_constant_key("CRSP_044", "Continuous")
 
-        if extra_headers != None:
-            for header, value in extra_headers.items():
-                self.add_constant_key(header, value)
-        else:
-            self.add_constant_key("PAC__004", "Sapphire Polarizer")
-            self.add_constant_key("PAC__006", "clear")
-            self.add_constant_key("PAC__008", "FieldStop (5arcmin)")
+        default_pac_values = {
+            "PAC__004": "Sapphire Polarizer",
+            "PAC__006": "clear",
+            "PAC__008": "FieldStop (5arcmin)",
+        }
+        if extra_headers is None:
+            extra_headers = dict()
+        for header, value in (default_pac_values | extra_headers).items():
+            self.add_constant_key(header, value)
 
 
 class ModulatedObserveHeaders(SimpleModulatedHeaders):
@@ -563,6 +610,8 @@ class ModulatedObserveHeaders(SimpleModulatedHeaders):
         start_date: str = "2023-01-01T01:23:45",
         modstate_length_sec: float = 0.5,
         meas_num: int = 1,
+        center_wavelength: float = 1080.0,
+        slit_width: float = 52.0,
     ):
         super().__init__(
             num_modstates=num_modstates,
@@ -572,6 +621,8 @@ class ModulatedObserveHeaders(SimpleModulatedHeaders):
             exposure_condition=exposure_condition,
             start_date=start_date,
             modstate_length_sec=modstate_length_sec,
+            center_wavelength=center_wavelength,
+            slit_width=slit_width,
         )
 
         self.num_map_scans = num_map_scans

dkist_processing_cryonirsp/tests/local_trial_workflows/l0_cals_only.py

@@ -1,5 +1,4 @@
 import argparse
-import json
 import os
 import sys
 from datetime import datetime
@@ -12,9 +11,10 @@ from dkist_processing_common.tasks import WorkflowTaskBase
 from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.constants import CryonirspBudName
+from dkist_processing_cryonirsp.models.fits_access import CryonirspMetadataKey
 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
@@ -33,13 +33,7 @@ from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspSPLinearizedD
 from dkist_processing_cryonirsp.tasks.sp_beam_boundaries import SPBeamBoundariesCalibration
 from dkist_processing_cryonirsp.tasks.sp_geometric import SPGeometricCalibration
 from dkist_processing_cryonirsp.tasks.sp_solar_gain import SPSolarGainCalibration
-from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    create_input_dataset_parameter_document,
-)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import DBAccess
-from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    load_parsing_task,
-)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     LoadBadPixelMap,
 )
@@ -47,9 +41,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,
 )
@@ -62,7 +53,7 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
 )
 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 (
-    save_parsing_task,
+    LoadWavelengthCorrection,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     SaveBadPixelMap,
@@ -71,9 +62,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 +73,18 @@ 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 (
+    create_input_dataset_parameter_document,
+)
+from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
+    load_parsing_task,
+)
+from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
+    save_parsing_task,
+)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     tag_inputs_task,
 )
@@ -134,7 +134,7 @@ def tag_linearized_inputs_task(suffix: str):
                     hdu = hdul[0]
                 else:
                     hdu = hdul[1]
-                arm_id = hdu.header["CNARMID"]
+                arm_id = hdu.header[CryonirspMetadataKey.arm_id]
             self.constants._update({CryonirspBudName.arm_id.value: arm_id})
 
     return TagLinearizedInputs
@@ -170,21 +170,6 @@ def spoof_obs_lin_parsed_constants(
     return SetCalOnlyConstants
 
 
-def setup_APM_config() -> None:
-    mesh_config = {
-        "system-monitoring-log-apm": {
-            "mesh_address": "system-monitoring-log-apm.service.sim.consul",
-            "mesh_port": 8200,
-        },
-        "automated-processing-scratch-inventory": {"mesh_address": "localhost", "mesh_port": 6379},
-        "internal-api-gateway": {"mesh_address": "localhost", "mesh_port": 80},
-    }
-    apm_options = {"TRANSACTION_MAX_SPANS": 10000}
-    os.environ["MESH_CONFIG"] = json.dumps(mesh_config)
-    os.environ["ELASTIC_APM_ENABLED"] = "true"
-    os.environ["ELASTIC_APM_OTHER_OPTIONS"] = json.dumps(apm_options)
-
-
 def CI_workflow(
     manual_processing_run: ManualProcessing,
     load_beam_boundaries: bool = False,
@@ -224,7 +209,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 +242,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,15 +272,12 @@ 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,
     dummy_wavelength: float = 1083.0,
     polarimetric: bool = True,
 ):
-    if use_apm:
-        setup_APM_config()
     with ManualProcessing(
         workflow_path=Path(scratch_path),
         recipe_run_id=recipe_run_id,
@@ -378,7 +360,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 +463,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(
@@ -491,7 +473,6 @@ if __name__ == "__main__":
         help="Load instrument polarization calibration from previously saved run",
         action="store_true",
     )
-    parser.add_argument("-A", "--use-apm", help="Send APM spans to SIM", action="store_true")
     parser.add_argument(
         "-p",
         "--param-path",
@@ -524,9 +505,8 @@ 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),
             polarimetric=not args.intensity_only,
         )