dkist-processing-cryonirsp 1.10.0rc1__py3-none-any.whl → 1.14.9rc1__py3-none-any.whl

dkist_processing_cryonirsp/tasks/write_l1.py

@@ -1,4 +1,5 @@
 """Cryonirsp write L1 task."""
+
 from abc import ABC
 from abc import abstractmethod
 from functools import cached_property
@@ -13,12 +14,14 @@ from astropy.io import fits
 from astropy.time.core import Time
 from dkist_processing_common.codecs.json import json_decoder
 from dkist_processing_common.models.dkist_location import location_of_dkist
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.wavelength import WavelengthRange
 from dkist_processing_common.tasks import WriteL1Frame
 from sunpy.coordinates import GeocentricEarthEquatorial
 from sunpy.coordinates import Helioprojective
 
 from dkist_processing_cryonirsp.models.constants import CryonirspConstants
+from dkist_processing_cryonirsp.models.fits_access import CryonirspMetadataKey
 from dkist_processing_cryonirsp.models.parameters import CryonirspParameters
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 
@@ -92,13 +95,13 @@ class CryonirspWriteL1Frame(WriteL1Frame, ABC):
             next_axis = self.add_map_scan_axis(header, axis_num=next_axis)
         if self.constants.correct_for_polarization:
             next_axis = self.add_stokes_axis(header, stokes=stokes, axis_num=next_axis)
-        self.add_wavelength_headers(header)
         last_axis = next_axis - 1
         self.add_common_headers(header, num_axes=last_axis)
         self.flip_spectral_axis(header)
         boresight_coordinates = self.get_boresight_coords(header)
         self.correct_spatial_wcs_info(header, boresight_coordinates)
         self.update_spectral_headers(header)
+        self.add_wavelength_headers(header)
 
         return header
 
@@ -143,7 +146,7 @@ class CryonirspWriteL1Frame(WriteL1Frame, ABC):
         header[f"DWNAME{axis_num}"] = "time"
         header[f"DUNIT{axis_num}"] = "s"
         # DINDEX and CNCMEAS are both one-based
-        header[f"DINDEX{axis_num}"] = header["CNCMEAS"]
+        header[f"DINDEX{axis_num}"] = header[CryonirspMetadataKey.meas_num]
         next_axis = axis_num + 1
         return next_axis
 
@@ -277,7 +280,7 @@ class CryonirspWriteL1Frame(WriteL1Frame, ABC):
         -------
         None
         """
-        t0 = Time(header["DATE-BEG"])
+        t0 = Time(header[MetadataKey.time_obs])
         sky_coordinates = SkyCoord(
             boresight_coordinates[0] * u.arcsec,
             boresight_coordinates[1] * u.arcsec,
@@ -396,7 +399,7 @@ class CryonirspWriteL1Frame(WriteL1Frame, ABC):
         """Get CryoNIRSP slit orientation measured relative to solar north at time of observation."""
         with Helioprojective.assume_spherical_screen(sky_coordinates.observer):
             sc_alt = sky_coordinates.transform_to(frame_altaz)
-            coude_minus_azimuth_elevation = header["TTBLANGL"] * u.deg - (
+            coude_minus_azimuth_elevation = header[MetadataKey.table_angle] * u.deg - (
                 (sc_alt.az.deg - sc_alt.alt.deg) * u.deg
             )
             cryo_instrument_alignment_angle = self.parameters.cryo_instrument_alignment_angle
@@ -470,6 +473,32 @@ class CryonirspWriteL1Frame(WriteL1Frame, ABC):
         """Update spectral headers after spectral correction."""
         pass
 
+    def add_timing_headers(self, header: fits.Header) -> fits.Header:
+        """
+        Add timing headers to the FITS header.
+
+        This method adds or updates headers related to frame timings.
+        """
+        # The source data is based on L0 data but L1 data takes L0 cadence * modstates * number of measurements to obtain.
+        # This causes the cadence to be num_modstates * num_measurements times longer.
+        # This causes the exposure time to be num_modstates times longer.
+        header["CADENCE"] = (
+            self.constants.average_cadence * self.constants.num_modstates * self.constants.num_meas
+        )
+        header["CADMIN"] = (
+            self.constants.minimum_cadence * self.constants.num_modstates * self.constants.num_meas
+        )
+        header["CADMAX"] = (
+            self.constants.maximum_cadence * self.constants.num_modstates * self.constants.num_meas
+        )
+        header["CADVAR"] = (
+            self.constants.variance_cadence * self.constants.num_modstates * self.constants.num_meas
+        )
+        header[MetadataKey.fpa_exposure_time_ms] = (
+            header[MetadataKey.fpa_exposure_time_ms] * self.constants.num_modstates
+        )
+        return header
+
 
 class CIWriteL1Frame(CryonirspWriteL1Frame):
     """
@@ -522,7 +551,7 @@ class CIWriteL1Frame(CryonirspWriteL1Frame):
             header[f"CNAME{axis_num}"] = "time"
         header[f"DUNIT{axis_num}"] = "s"
         # DINDEX and CNCURSCN are both one-based
-        header[f"DINDEX{axis_num}"] = header["CNCURSCN"]
+        header[f"DINDEX{axis_num}"] = header[CryonirspMetadataKey.scan_step]
         next_axis = axis_num + 1
         return next_axis
 
@@ -536,7 +565,7 @@ class CIWriteL1Frame(CryonirspWriteL1Frame):
 
         Range is the wavelengths at the edges of the filter full width half maximum.
         """
-        filter_central_wavelength = header["CNCENWAV"] * u.nm
+        filter_central_wavelength = header[CryonirspMetadataKey.center_wavelength] * u.nm
         filter_fwhm = header["CNFWHM"] * u.nm
         return WavelengthRange(
             min=filter_central_wavelength - (filter_fwhm / 2),
@@ -807,7 +836,7 @@ class SPWriteL1Frame(CryonirspWriteL1Frame):
         # NB: CUNIT axis number is hard coded here
         header[f"DUNIT{axis_num}"] = header[f"CUNIT3"]
         # DINDEX and CNCURSCN are both one-based
-        header[f"DINDEX{axis_num}"] = header["CNCURSCN"]
+        header[f"DINDEX{axis_num}"] = header[CryonirspMetadataKey.scan_step]
         next_axis = axis_num + 1
         return next_axis
 

dkist_processing_cryonirsp/tests/conftest.py

@@ -26,6 +26,7 @@ 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
 
@@ -176,7 +177,7 @@ 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
 
@@ -277,11 +278,9 @@ class FileParameter(InputDatasetFilePointer):
 
     @model_validator(mode="after")
     def _populate_file_object(self):
-        self.file_pointer = FileObject(
-            bucket="not_used_because_we_dont_transfer",
-            object_key=self.object_key,
-            tag=CryonirspTag.parameter((self.object_key)),
-        )
+        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
 
 
@@ -377,7 +376,7 @@ def cryonirsp_testing_parameters_factory(
         cryonirsp_pixel_pitch_micron: float = 18.0
         cryonirsp_wavecal_atlas_download_config: dict[str, str] = field(
             default_factory=lambda: {
-                "base_url": "doi:10.5281/zenodo.14646787/",
+                "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",

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
@@ -25,6 +23,7 @@ class CryonirspHeaders(Spec122Dataset):
         array_shape: tuple[int, ...],
         time_delta: 10,
         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")
@@ -477,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):
@@ -510,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):

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,6 +11,7 @@ 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 SPWavelengthCalibration
@@ -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,
 )
@@ -61,9 +55,6 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
 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,
-)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     SaveBadPixelMap,
 )
@@ -85,6 +76,15 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
 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,
@@ -289,13 +274,10 @@ def main(
     load_solar: 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,
@@ -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",
@@ -526,7 +507,6 @@ if __name__ == "__main__":
             load_solar=args.load_solar,
             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,
         )

dkist_processing_cryonirsp/tests/local_trial_workflows/l0_to_l1.py

@@ -14,6 +14,7 @@ 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 CIScienceCalibration
@@ -45,13 +46,7 @@ from dkist_processing_cryonirsp.tasks.sp_solar_gain import SPSolarGainCalibratio
 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 (
-    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,
 )
@@ -73,9 +68,6 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
 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,
-)
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     SaveBadPixelMap,
 )
@@ -97,6 +89,15 @@ from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers
 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,
 )
@@ -149,7 +150,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
@@ -191,21 +192,6 @@ class ValidateL1Output(CryonirspTaskBase):
             spec214_validator.validate(f, extra=False)
 
 
-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,
@@ -322,12 +308,9 @@ def main(
     load_solar: 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,
 ):
-    if use_apm:
-        setup_APM_config()
     with ManualProcessing(
         workflow_path=Path(scratch_path),
         recipe_run_id=recipe_run_id,
@@ -573,7 +556,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",
@@ -603,7 +585,6 @@ if __name__ == "__main__":
             load_solar=args.load_solar,
             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),
             transfer_trial_data=args.transfer_trial_data,
         )

dkist_processing_cryonirsp/tests/local_trial_workflows/linearize_only.py

@@ -8,13 +8,13 @@ from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.linearity_correction import LinearityCorrection
 from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspRampData
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    create_input_dataset_parameter_document,
+    SaveLinearizedFiles,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    save_parsing_task,
+    create_input_dataset_parameter_document,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
-    SaveLinearizedFiles,
+    save_parsing_task,
 )
 from dkist_processing_cryonirsp.tests.local_trial_workflows.local_trial_helpers import (
     tag_inputs_task,

dkist_processing_cryonirsp/tests/local_trial_workflows/local_trial_helpers.py

@@ -19,8 +19,8 @@ from dkist_service_configuration.logging import logger
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.models.task_name import CryonirspTaskName
 from dkist_processing_cryonirsp.tasks.cryonirsp_base import CryonirspTaskBase
-from dkist_processing_cryonirsp.tests.conftest import cryonirsp_testing_parameters_factory
 from dkist_processing_cryonirsp.tests.conftest import FileParameter
+from dkist_processing_cryonirsp.tests.conftest import cryonirsp_testing_parameters_factory
 
 # These are the workflow versions of the polyfit coefficient parameters
 WORKFLOW_LINEARIZATION_POLYFIT_COEFFS_CI = [
@@ -365,7 +365,7 @@ class SaveWavelengthCorrection(SaveTaskTags):
 
     @property
     def relative_save_file(self) -> str:
-        return "sp_dispersion_axis_correction.asdf"
+        return "sp_wavelength_correction.asdf"
 
     @property
     def tag_lists_to_save(self) -> list[list[str]]:
@@ -475,6 +475,7 @@ def create_input_dataset_parameter_document(param_path: Path):
                 relative_path=relative_path,
                 tags=CryonirspTag.input_dataset_parameters(),
                 encoder=basemodel_encoder,
+                overwrite=True,
             )
             logger.info(f"Wrote input dataset parameter doc to {relative_path}")
             self.copy_and_tag_parameter_files(param_path=param_path)

dkist_processing_cryonirsp/tests/test_assemble_movie.py

@@ -2,7 +2,6 @@ import numpy as np
 import pytest
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
-from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_cryonirsp.models.constants import CryonirspBudName
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
@@ -68,9 +67,9 @@ def assemble_movie_task_with_tagged_movie_frames(
             task._purge()
 
 
-def test_assemble_movie(assemble_movie_task_with_tagged_movie_frames, mocker):
+def test_assemble_movie(assemble_movie_task_with_tagged_movie_frames, mocker, fake_gql_client):
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     task, _, _ = assemble_movie_task_with_tagged_movie_frames
     task()
@@ -134,9 +133,9 @@ def assemble_sp_task_with_tagged_movie_frames(tmp_path, recipe_run_id, init_cryo
             task._purge()
 
 
-def test_assemble_sp_movie(assemble_sp_task_with_tagged_movie_frames, mocker):
+def test_assemble_sp_movie(assemble_sp_task_with_tagged_movie_frames, mocker, fake_gql_client):
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     assemble_sp_task_with_tagged_movie_frames()
     movie_file = list(assemble_sp_task_with_tagged_movie_frames.read(tags=[CryonirspTag.movie()]))

dkist_processing_cryonirsp/tests/test_assemble_qualilty.py

@@ -474,7 +474,11 @@ def test_assemble_quality_data(
     # Then
     # each quality_data file is a list - this will combine the elements of multiple lists into a single list
     quality_data = list(
-        chain.from_iterable(task.read(tags=CryonirspTag.quality_data(), decoder=json_decoder))
+        chain.from_iterable(
+            task.read(
+                tags=[CryonirspTag.output(), CryonirspTag.quality_data()], decoder=json_decoder
+            )
+        )
     )
     # 19 with polcal
     assert len(quality_data) == 19

dkist_processing_cryonirsp/tests/test_bad_pixel_maps.py

@@ -6,13 +6,12 @@ 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.fits import fits_hdulist_encoder
-from dkist_processing_common.tests.conftest import FakeGQLClient
 from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.bad_pixel_map import BadPixelMapCalibration
-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 cryonirsp_testing_parameters_factory
 from dkist_processing_cryonirsp.tests.conftest import generate_fits_frame
 from dkist_processing_cryonirsp.tests.header_models import CryonirspHeadersValidCISolarGainFrames
 
@@ -91,14 +90,14 @@ def compute_bad_pixel_map_task(
             task._purge()
 
 
-def test_compute_bad_pixel_map_task(compute_bad_pixel_map_task, mocker):
+def test_compute_bad_pixel_map_task(compute_bad_pixel_map_task, mocker, fake_gql_client):
     """
     Given: An BadPixelMapCalibration task
     When: Calling the task instance with known input data
     Then: The correct beam boundary values are created and saved as intermediate files
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     # Given
     task, num_zeros, num_hot = compute_bad_pixel_map_task

dkist_processing_cryonirsp/tests/test_ci_beam_boundaries.py

@@ -7,12 +7,11 @@ from dkist_header_validator import spec122_validator
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.codecs.fits import fits_array_encoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
-from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.ci_beam_boundaries import CIBeamBoundariesCalibration
-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 cryonirsp_testing_parameters_factory
 from dkist_processing_cryonirsp.tests.conftest import generate_fits_frame
 from dkist_processing_cryonirsp.tests.header_models import CryonirspHeadersValidCISolarGainFrames
 
@@ -85,14 +84,14 @@ def compute_beam_boundaries_task(
             task._purge()
 
 
-def test_compute_beam_boundaries_task(compute_beam_boundaries_task, mocker):
+def test_compute_beam_boundaries_task(compute_beam_boundaries_task, mocker, fake_gql_client):
     """
     Given: A CIBeamBoundariesCalibration task
     When: Calling the task instance with known input data
     Then: The correct beam boundary values are created and saved as intermediate files
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     # Given
     task, arm_id = compute_beam_boundaries_task