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

dkist_processing_cryonirsp/tests/test_quality.py

@@ -8,7 +8,6 @@ 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.models.task_name import TaskName
-from dkist_processing_common.tests.conftest import FakeGQLClient
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.quality_metrics import CryonirspL0QualityMetrics
@@ -161,7 +160,7 @@ def test_l0_quality_task(
         assert len(files) > 0
 
 
-def test_l1_quality_task(cryo_l1_quality_task, mocker):
+def test_l1_quality_task(cryo_l1_quality_task, mocker, fake_gql_client):
     """
     Given: A CryonirspL1QualityMetrics task
     When: Calling the task instance
@@ -169,7 +168,7 @@ def test_l1_quality_task(cryo_l1_quality_task, mocker):
             and a single noise measurement and datetime is recorded for L1 file for each Stokes Q, U, and V
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     # When
     task = cryo_l1_quality_task

dkist_processing_cryonirsp/tests/test_sp_beam_boundaries.py

@@ -7,12 +7,12 @@ 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.sp_beam_boundaries import SPBeamBoundariesCalibration
-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 fake_gql_client
 from dkist_processing_cryonirsp.tests.conftest import generate_fits_frame
 from dkist_processing_cryonirsp.tests.header_models import CryonirspHeadersValidSPSolarGainFrames
 
@@ -38,7 +38,7 @@ def compute_beam_boundaries_task(
             task.scratch = WorkflowFileSystem(
                 scratch_base_path=tmp_path, recipe_run_id=recipe_run_id
             )
-            param_class = cryonirsp_testing_parameters_factory(param_path=tmp_path)
+            param_class = cryonirsp_testing_parameters_factory(task)
             assign_input_dataset_doc_to_task(task, param_class())
             # Create fake bad pixel map
             task.write(
@@ -85,14 +85,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 SPBeamBoundariesCalibration 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

dkist_processing_cryonirsp/tests/test_sp_geometric.py

@@ -5,7 +5,6 @@ import pytest
 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_math import transform
 
 from dkist_processing_cryonirsp.codecs.fits import cryo_fits_array_decoder
@@ -13,8 +12,8 @@ from dkist_processing_cryonirsp.models.exposure_conditions import AllowableOptic
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.sp_geometric import SPGeometricCalibration
-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_214_l0_fits_frame
 from dkist_processing_cryonirsp.tests.header_models import CryonirspHeadersValidSPSolarGainFrames
 
@@ -52,7 +51,7 @@ def geometric_calibration_task_that_completes(
             task.scratch = WorkflowFileSystem(
                 scratch_base_path=tmp_path, recipe_run_id=recipe_run_id
             )
-            param_class = cryonirsp_testing_parameters_factory(param_path=tmp_path)
+            param_class = cryonirsp_testing_parameters_factory(task)
             assign_input_dataset_doc_to_task(task, param_class())
 
             task.angles = [0.0, 0.0]
@@ -188,7 +187,7 @@ def geometric_calibration_task_with_simple_raw_data(
             task.scratch = WorkflowFileSystem(
                 scratch_base_path=tmp_path, recipe_run_id=recipe_run_id
             )
-            param_class = cryonirsp_testing_parameters_factory(param_path=tmp_path)
+            param_class = cryonirsp_testing_parameters_factory(task)
             assign_input_dataset_doc_to_task(task, param_class())
 
             # Create the intermediate frames needed
@@ -287,7 +286,7 @@ def geometric_calibration_task_with_simple_raw_data(
             task._purge()
 
 
-def test_geometric_task(geometric_calibration_task_that_completes, mocker):
+def test_geometric_task(geometric_calibration_task_that_completes, mocker, fake_gql_client):
     """
     Given: A set of raw solar gain images and necessary intermediate calibrations
     When: Running the geometric task
@@ -295,7 +294,7 @@ def test_geometric_task(geometric_calibration_task_that_completes, mocker):
     """
     # See the note in the fixture above: this test does NOT test for accuracy of the calibration
     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, beam_shape = geometric_calibration_task_that_completes
     task()

dkist_processing_cryonirsp/tests/test_sp_make_movie_frames.py

@@ -6,7 +6,6 @@ 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_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.make_movie_frames import SPMakeCryonirspMovieFrames
@@ -95,14 +94,14 @@ def sp_movie_frames_task(tmp_path, recipe_run_id, init_cryonirsp_constants_db, r
             task._purge()
 
 
-def test_sp_make_movie_frames(sp_movie_frames_task, mocker):
+def test_sp_make_movie_frames(sp_movie_frames_task, mocker, fake_gql_client):
     """
     Given: A SPMakeCryonirspMovieFrames task
     When: Calling the task instance
     Then: a fits file is made for each scan containing the movie frame for that scan
     """
     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, map_scans, scan_steps, array_shape, is_polarimetric = sp_movie_frames_task
     if scan_steps > 1:

dkist_processing_cryonirsp/tests/test_sp_science.py

@@ -11,7 +11,6 @@ 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.exposure_conditions import AllowableOpticalDensityFilterNames
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
@@ -20,8 +19,8 @@ from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.parsers.cryonirsp_l0_fits_access import CryonirspL0FitsAccess
 from dkist_processing_cryonirsp.tasks.sp_science import CalibrationCollection
 from dkist_processing_cryonirsp.tasks.sp_science import SPScienceCalibration
-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 CryonirspHeadersValidObserveFrames
 
@@ -67,7 +66,7 @@ def sp_science_calibration_task(
             task.scratch = WorkflowFileSystem(
                 scratch_base_path=tmp_path, recipe_run_id=recipe_run_id
             )
-            param_class = cryonirsp_testing_parameters_factory(param_path=tmp_path)
+            param_class = cryonirsp_testing_parameters_factory(task)
             assign_input_dataset_doc_to_task(task, param_class())
             # Create fake bad pixel map
             task.write(
@@ -320,7 +319,7 @@ def calibrated_array_and_header_dicts(
     return array_dict, header_dict, array_shape
 
 
-def test_sp_science_calibration_task(sp_science_calibration_task, mocker):
+def test_sp_science_calibration_task(sp_science_calibration_task, mocker, fake_gql_client):
     """
     Given: A SPScienceCalibration task
     When: Calling the task instance
@@ -328,7 +327,7 @@ def test_sp_science_calibration_task(sp_science_calibration_task, mocker):
     """
 
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
 
     # When

dkist_processing_cryonirsp/tests/test_sp_solar.py

@@ -5,15 +5,14 @@ import pytest
 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.codecs.fits import cryo_fits_array_decoder
 from dkist_processing_cryonirsp.models.exposure_conditions import AllowableOpticalDensityFilterNames
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.sp_solar_gain import SPSolarGainCalibration
-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_214_l0_fits_frame
 from dkist_processing_cryonirsp.tests.header_models import CryonirspHeadersValidSPSolarGainFrames
 
@@ -51,7 +50,7 @@ def solar_gain_calibration_task_that_completes(
             task.scratch = WorkflowFileSystem(
                 scratch_base_path=tmp_path, recipe_run_id=recipe_run_id
             )
-            param_class = cryonirsp_testing_parameters_factory(param_path=tmp_path)
+            param_class = cryonirsp_testing_parameters_factory(task)
             assign_input_dataset_doc_to_task(
                 task, param_class(cryonirsp_fringe_correction_on=fringe_correction)
             )
@@ -178,14 +177,16 @@ def solar_gain_calibration_task_with_no_data(tmp_path, recipe_run_id, init_cryon
 
 
 @pytest.mark.parametrize("fringe_correction", [False, True])
-def test_solar_gain_task(solar_gain_calibration_task_that_completes, mocker, fringe_correction):
+def test_solar_gain_task(
+    solar_gain_calibration_task_that_completes, mocker, fake_gql_client, fringe_correction
+):
     """
     Given: A set of raw solar gain images and necessary intermediate calibrations
     When: Running the solargain task
     Then: The task completes and the outputs are correct
     """
     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, true_solar_single_beam = solar_gain_calibration_task_that_completes

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

@@ -2,21 +2,17 @@ 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.tests.conftest import FakeGQLClient
+from dkist_processing_common.codecs.json import json_decoder
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
-from dkist_processing_cryonirsp.tasks.sp_dispersion_axis_correction import (
-    SPDispersionAxisCorrection,
-)
-from dkist_processing_cryonirsp.tests.conftest import cryonirsp_testing_parameters_factory
+from dkist_processing_cryonirsp.tasks.sp_wavelength_calibration import SPWavelengthCalibration
 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 CryonirspHeadersValidSPSolarGainFrames
 
@@ -44,10 +40,10 @@ def sp_dispersion_axis_correction_task(
         GRATING_POSITION_DEG=grating_position_deg,
         GRATING_LITTROW_ANGLE_DEG=grating_littrow_angle,
         GRATING_CONSTANT=grating_constant,
-        SOLAR_GAIN_IP_START_TIME="2021-01-01T00:00:00",
+        SOLAR_GAIN_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",
@@ -57,7 +53,7 @@ def sp_dispersion_axis_correction_task(
             task.scratch = WorkflowFileSystem(
                 scratch_base_path=tmp_path, recipe_run_id=recipe_run_id
             )
-            param_class = cryonirsp_testing_parameters_factory(param_path=tmp_path)
+            param_class = cryonirsp_testing_parameters_factory(task)
             assign_input_dataset_doc_to_task(task, param_class())
 
             # Create fake solar charcteristic spectra
@@ -99,6 +95,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=[
@@ -115,14 +113,14 @@ def sp_dispersion_axis_correction_task(
             task._purge()
 
 
-def test_sp_dispersion_axis_correction(sp_dispersion_axis_correction_task, mocker):
+def test_sp_dispersion_axis_correction(sp_dispersion_axis_correction_task, mocker, fake_gql_client):
     """
     Given: A SPDispersionAxisCorrection task
     When: Calling the task instance
     Then: There are the expected number of intermediate fit frames with the correct tags applied and the values have been correctly fit
     """
     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, original_header = sp_dispersion_axis_correction_task
@@ -131,23 +129,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_trial_create_quality_report.py

@@ -49,7 +49,7 @@ def create_trial_quality_report_task(
         )
         task.write(
             quality_data_warning_only,
-            tags=CryonirspTag.quality_data(),
+            tags=[CryonirspTag.output(), CryonirspTag.quality_data()],
             encoder=quality_data_encoder,
             relative_path=f"{task.constants.dataset_id}_quality_data.json",
         )

dkist_processing_cryonirsp/tests/test_workflows.py

@@ -1,4 +1,5 @@
 """Test integrity of workflows."""
+
 from dkist_processing_core.build_utils import validate_workflows
 
 from dkist_processing_cryonirsp import workflows

dkist_processing_cryonirsp/tests/test_write_l1.py

@@ -7,9 +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.tests.conftest import FakeGQLClient
+from dkist_processing_common.codecs.json import json_encoder
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.tasks.write_l1 import CIWriteL1Frame
@@ -100,7 +99,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 +126,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,
     )
 
 
@@ -164,14 +163,16 @@ def write_dummy_sp_dispersion_intermediate(task: SPWriteL1Frame, header: fits.He
     "arm_id",
     [pytest.param("CI", id="CI"), pytest.param("SP", id="SP")],
 )
-def test_write_l1_frame(write_l1_task, mocker, arm_id, num_stokes_params, num_map_scans, num_meas):
+def test_write_l1_frame(
+    write_l1_task, mocker, fake_gql_client, arm_id, num_stokes_params, num_map_scans, num_meas
+):
     """
     :Given: a write L1 task
     :When: running the task
     :Then: the correct header keys are written
     """
     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, stokes_params, original_headers = write_l1_task
     task()
@@ -221,6 +222,14 @@ def test_write_l1_frame(write_l1_task, mocker, arm_id, num_stokes_params, num_ma
                 axis_num += 1
                 stokes_axis_tests(axis_num, header)
 
+            # Timing header keys
+            if task.constants.correct_for_polarization:
+                assert header["CADENCE"] == 20 * num_meas
+                assert header["XPOSURE"] == 30
+            else:
+                assert header["CADENCE"] == 10 * num_meas
+                assert header["XPOSURE"] == 15
+
             # Other general tests
             general_header_tests(axis_num, header, task, arm_id)
 
@@ -421,16 +430,5 @@ def general_header_tests(
     ).isot
     assert header["DATE-AVG"] == date_avg
     assert isinstance(header["HLSVERS"], str)
-    assert header["NSPECLNS"] == 1
-    assert header["WAVEBAND"] == "He I (1083.0 nm)"
-    assert header["SPECLN01"] == "He I (1083.0 nm)"
-    with pytest.raises(KeyError):
-        header["SPECLN02"]
-
-    # wavelength range tests
-    if arm_id == "SP":
-        assert round(header["WAVEMIN"], 2) == 1082
-        assert round(header["WAVEMAX"], 2) == 1084
-    if arm_id == "CI":
-        assert header["WAVEMIN"] == 1082.5
-        assert header["WAVEMAX"] == 1083.5
+    assert header["BUNIT"] == ""
+    assert header.comments["BUNIT"] == "Values are relative to disk center. See calibration docs."

dkist_processing_cryonirsp/workflows/__init__.py

@@ -1,2 +1,3 @@
 """Workflow package."""
+
 from dkist_processing_cryonirsp.config import dkist_processing_cryonirsp_configurations

dkist_processing_cryonirsp/workflows/ci_l0_processing.py

@@ -1,4 +1,5 @@
 """Cryo CI raw data processing workflow."""
+
 from dkist_processing_common.tasks import PublishCatalogAndQualityMessages
 from dkist_processing_common.tasks import QualityL1Metrics
 from dkist_processing_common.tasks import SubmitDatasetMetadata
@@ -11,9 +12,7 @@ from dkist_processing_core import Workflow
 from dkist_processing_cryonirsp.tasks import AssembleCryonirspMovie
 from dkist_processing_cryonirsp.tasks import BadPixelMapCalibration
 from dkist_processing_cryonirsp.tasks import CIBeamBoundariesCalibration
-from dkist_processing_cryonirsp.tasks import (
-    CIInstrumentPolarizationCalibration,
-)
+from dkist_processing_cryonirsp.tasks import CIInstrumentPolarizationCalibration
 from dkist_processing_cryonirsp.tasks import CIScienceCalibration
 from dkist_processing_cryonirsp.tasks import CISolarGainCalibration
 from dkist_processing_cryonirsp.tasks import CIWriteL1Frame
@@ -66,8 +65,13 @@ l0_pipeline.add_node(
 )
 
 # Output flow
-l0_pipeline.add_node(task=SubmitDatasetMetadata, upstreams=[CIWriteL1Frame, CIAssembleQualityData])
-l0_pipeline.add_node(task=TransferL1Data, upstreams=[CIWriteL1Frame, AssembleCryonirspMovie])
+l0_pipeline.add_node(
+    task=SubmitDatasetMetadata,
+    upstreams=[CIWriteL1Frame, AssembleCryonirspMovie],
+)
+l0_pipeline.add_node(
+    task=TransferL1Data, upstreams=[CIWriteL1Frame, AssembleCryonirspMovie, CIAssembleQualityData]
+)
 l0_pipeline.add_node(
     task=PublishCatalogAndQualityMessages, upstreams=[SubmitDatasetMetadata, TransferL1Data]
 )

dkist_processing_cryonirsp/workflows/sp_l0_processing.py

@@ -1,4 +1,5 @@
 """Cryo SP raw data processing workflow."""
+
 from dkist_processing_common.tasks import PublishCatalogAndQualityMessages
 from dkist_processing_common.tasks import QualityL1Metrics
 from dkist_processing_common.tasks import SubmitDatasetMetadata
@@ -18,13 +19,11 @@ 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 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 +51,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)
 
@@ -74,8 +73,13 @@ l0_pipeline.add_node(
 )
 
 # Output flow
-l0_pipeline.add_node(task=SubmitDatasetMetadata, upstreams=[SPWriteL1Frame, SPAssembleQualityData])
-l0_pipeline.add_node(task=TransferL1Data, upstreams=[SPWriteL1Frame, AssembleCryonirspMovie])
+l0_pipeline.add_node(
+    task=SubmitDatasetMetadata,
+    upstreams=[SPWriteL1Frame, AssembleCryonirspMovie],
+)
+l0_pipeline.add_node(
+    task=TransferL1Data, upstreams=[SPWriteL1Frame, AssembleCryonirspMovie, SPAssembleQualityData]
+)
 l0_pipeline.add_node(
     task=PublishCatalogAndQualityMessages, upstreams=[SubmitDatasetMetadata, TransferL1Data]
 )

dkist_processing_cryonirsp/workflows/trial_workflows.py

@@ -1,4 +1,5 @@
 """Workflows for trial runs (i.e., not Production)."""
+
 from dkist_processing_common.tasks import CreateTrialAsdf
 from dkist_processing_common.tasks import CreateTrialDatasetInventory
 from dkist_processing_common.tasks import CreateTrialQualityReport
@@ -12,9 +13,7 @@ from dkist_processing_core import Workflow
 from dkist_processing_cryonirsp.tasks import AssembleCryonirspMovie
 from dkist_processing_cryonirsp.tasks import BadPixelMapCalibration
 from dkist_processing_cryonirsp.tasks import CIBeamBoundariesCalibration
-from dkist_processing_cryonirsp.tasks import (
-    CIInstrumentPolarizationCalibration,
-)
+from dkist_processing_cryonirsp.tasks import CIInstrumentPolarizationCalibration
 from dkist_processing_cryonirsp.tasks import CIScienceCalibration
 from dkist_processing_cryonirsp.tasks import CISolarGainCalibration
 from dkist_processing_cryonirsp.tasks import CIWriteL1Frame
@@ -26,13 +25,11 @@ 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 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
@@ -93,7 +90,9 @@ full_trial_ci_pipeline.add_node(
 )
 full_trial_ci_pipeline.add_node(task=CreateTrialAsdf, upstreams=CIWriteL1Frame, pip_extras=["asdf"])
 full_trial_ci_pipeline.add_node(
-    task=CreateTrialQualityReport, upstreams=CIAssembleQualityData, pip_extras=["quality"]
+    task=CreateTrialQualityReport,
+    upstreams=CIAssembleQualityData,
+    pip_extras=["quality", "inventory"],
 )
 
 # Output flow
@@ -139,14 +138,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)
 
@@ -171,7 +170,9 @@ full_trial_sp_pipeline.add_node(
 )
 full_trial_sp_pipeline.add_node(task=CreateTrialAsdf, upstreams=SPWriteL1Frame, pip_extras=["asdf"])
 full_trial_sp_pipeline.add_node(
-    task=CreateTrialQualityReport, upstreams=SPAssembleQualityData, pip_extras=["quality"]
+    task=CreateTrialQualityReport,
+    upstreams=SPAssembleQualityData,
+    pip_extras=["quality", "inventory"],
 )
 
 # Output flow