dkist-processing-cryonirsp 1.4.15__py3-none-any.whl → 1.4.16__py3-none-any.whl

dkist_processing_cryonirsp/tests/test_sp_science.py

@@ -9,6 +9,7 @@ from astropy.time import Time
 from astropy.time import TimeDelta
 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
 
@@ -69,9 +70,10 @@ def sp_science_calibration_task(
             param_class = cryonirsp_testing_parameters_factory(param_path=tmp_path)
             assign_input_dataset_doc_to_task(task, param_class())
             # Create fake bad pixel map
-            task.intermediate_frame_write_arrays(
-                arrays=np.zeros((30, 60)),
-                task_tag=CryonirspTag.task_bad_pixel_map(),
+            task.write(
+                data=np.zeros((30, 60)),
+                tags=[CryonirspTag.intermediate_frame(), CryonirspTag.task_bad_pixel_map()],
+                encoder=fits_array_encoder,
             )
             # Create fake demodulation matrices
             demod_matrices = np.zeros((1, 1, 4, num_modstates))
@@ -82,10 +84,8 @@ def sp_science_calibration_task(
                 task.write(
                     data=demod_hdul,
                     tags=[
-                        CryonirspTag.intermediate(),
-                        CryonirspTag.frame(),
+                        CryonirspTag.intermediate_frame(beam=beam + 1),
                         CryonirspTag.task_demodulation_matrices(),
-                        CryonirspTag.beam(beam + 1),
                     ],
                     encoder=fits_hdulist_encoder,
                 )
@@ -95,38 +95,56 @@ def sp_science_calibration_task(
             offset = np.array([-10.2, 5.1])
             spec_shift = np.zeros(intermediate_shape[0])
             for beam in range(1, num_beams + 1):
-                task.intermediate_frame_write_arrays(
-                    arrays=angle, beam=beam, task_tag=CryonirspTag.task_geometric_angle()
+                task.write(
+                    data=angle,
+                    tags=[
+                        CryonirspTag.intermediate_frame(beam=beam),
+                        CryonirspTag.task_geometric_angle(),
+                    ],
+                    encoder=fits_array_encoder,
                 )
-                task.intermediate_frame_write_arrays(
-                    arrays=spec_shift,
-                    beam=beam,
-                    task_tag=CryonirspTag.task_geometric_sepectral_shifts(),
+                task.write(
+                    data=spec_shift,
+                    tags=[
+                        CryonirspTag.intermediate_frame(beam=beam),
+                        CryonirspTag.task_geometric_spectral_shifts(),
+                    ],
+                    encoder=fits_array_encoder,
                 )
                 for modstate in range(1, num_modstates + 1):
-                    task.intermediate_frame_write_arrays(
-                        arrays=offset
+                    task.write(
+                        data=offset
                         * (beam - 1),  # Because we need the fiducial array to have (0, 0) offset
-                        beam=beam,
-                        modstate=modstate,
-                        task_tag=CryonirspTag.task_geometric_offset(),
+                        tags=[
+                            CryonirspTag.intermediate_frame(beam=beam),
+                            CryonirspTag.task_geometric_offset(),
+                            CryonirspTag.modstate(modstate),
+                        ],
+                        encoder=fits_array_encoder,
                     )
 
             # Create fake dark intermediate arrays
             for beam in range(1, num_beams + 1):
-                task.intermediate_frame_write_arrays(
+                task.write(
                     all_zeros,
-                    beam=beam,
-                    task_tag=CryonirspTag.task_dark(),
-                    exposure_conditions=exposure_conditions,
+                    tags=[
+                        CryonirspTag.intermediate_frame(
+                            beam=beam, exposure_conditions=exposure_conditions
+                        ),
+                        CryonirspTag.task_dark(),
+                    ],
+                    encoder=fits_array_encoder,
                 )
 
             # And a beam border intermediate array
             for beam in range(1, num_beams + 1):
-                task.intermediate_frame_write_arrays(
-                    arrays=np.array([0, 30, ((beam - 1) * 30), (30 + (beam - 1) * 30)]),
-                    task_tag=CryonirspTag.task_beam_boundaries(),
-                    beam=beam,
+                task.write(
+                    data=np.array([0, 30, ((beam - 1) * 30), (30 + (beam - 1) * 30)]),
+                    tags=[
+                        CryonirspTag.intermediate_frame(beam=beam),
+                        CryonirspTag.task_beam_boundaries(),
+                    ],
+                    encoder=fits_array_encoder,
                 )
 
             # Create fake lamp and solar gain intermediate arrays
@@ -136,10 +154,8 @@ def sp_science_calibration_task(
                     task.write(
                         data=gain_hdul,
                         tags=[
-                            CryonirspTag.intermediate(),
-                            CryonirspTag.frame(),
+                            CryonirspTag.intermediate_frame(beam=beam),
                             CryonirspTag.task_lamp_gain(),
-                            CryonirspTag.beam(beam),
                             CryonirspTag.modstate(modstate),
                         ],
                         encoder=fits_hdulist_encoder,
@@ -148,10 +164,8 @@ def sp_science_calibration_task(
                     task.write(
                         data=gain_hdul,
                         tags=[
-                            CryonirspTag.intermediate(),
-                            CryonirspTag.frame(),
+                            CryonirspTag.intermediate_frame(beam=beam),
                             CryonirspTag.task_solar_gain(),
-                            CryonirspTag.beam(beam),
                             CryonirspTag.modstate(modstate),
                         ],
                         encoder=fits_hdulist_encoder,
@@ -196,9 +210,9 @@ def sp_science_calibration_task(
                                 CryonirspTag.scan_step(scan_step),
                                 CryonirspTag.map_scan(map_scan),
                                 CryonirspTag.modstate(modstate),
-                                CryonirspTag.linearized(),
-                                CryonirspTag.frame(),
-                                CryonirspTag.exposure_conditions(exposure_conditions),
+                                CryonirspTag.linearized_frame(
+                                    exposure_conditions=exposure_conditions
+                                ),
                             ],
                             encoder=fits_hdulist_encoder,
                         )
@@ -372,7 +386,7 @@ def test_sp_science_calibration_task(sp_science_calibration_task, mocker):
             data = json.load(f)
             assert isinstance(data, dict)
             assert data["total_frames"] == task.scratch.count_all(
-                tags=[CryonirspTag.linearized(), CryonirspTag.frame(), CryonirspTag.task_observe()]
+                tags=[CryonirspTag.linearized_frame(), CryonirspTag.task_observe()]
             )
 
 

dkist_processing_cryonirsp/tests/test_sp_solar.py

@@ -3,9 +3,11 @@ import json
 import numpy as np
 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
@@ -54,37 +56,51 @@ def solar_gain_calibration_task_that_completes(
                 task, param_class(cryonirsp_fringe_correction_on=fringe_correction)
             )
             # Create fake bad pixel map
-            task.intermediate_frame_write_arrays(
-                arrays=np.zeros((10, 20)),
-                task_tag=CryonirspTag.task_bad_pixel_map(),
+            task.write(
+                data=np.zeros((10, 20)),
+                tags=[CryonirspTag.intermediate_frame(), CryonirspTag.task_bad_pixel_map()],
+                encoder=fits_array_encoder,
             )
             for beam in range(1, number_of_beams + 1):
                 # Create fake beam border intermediate arrays
-                task.intermediate_frame_write_arrays(
-                    arrays=np.array([0, 10, ((beam - 1) * 10), 10 + ((beam - 1) * 10)]),
-                    task_tag=CryonirspTag.task_beam_boundaries(),
-                    beam=beam,
+                task.write(
+                    data=np.array([0, 10, ((beam - 1) * 10), 10 + ((beam - 1) * 10)]),
+                    tags=[
+                        CryonirspTag.intermediate_frame(beam=beam),
+                        CryonirspTag.task_beam_boundaries(),
+                    ],
+                    encoder=fits_array_encoder,
                 )
 
                 # DarkCal object
                 dark_cal = np.ones(intermediate_shape) * 3.0
-                task.intermediate_frame_write_arrays(
-                    arrays=dark_cal,
-                    beam=beam,
-                    task_tag=CryonirspTag.task_dark(),
-                    exposure_conditions=exposure_conditions,
+                task.write(
+                    data=dark_cal,
+                    tags=[
+                        CryonirspTag.intermediate_frame(
+                            beam=beam, exposure_conditions=exposure_conditions
+                        ),
+                        CryonirspTag.task_dark(),
+                    ],
+                    encoder=fits_array_encoder,
                 )
 
                 # Geo angles and spec_shifts
-                task.intermediate_frame_write_arrays(
-                    arrays=np.zeros(1),
-                    beam=beam,
-                    task_tag=CryonirspTag.task_geometric_angle(),
+                task.write(
+                    data=np.zeros(1),
+                    tags=[
+                        CryonirspTag.intermediate_frame(beam=beam),
+                        CryonirspTag.task_geometric_angle(),
+                    ],
+                    encoder=fits_array_encoder,
                 )
-                task.intermediate_frame_write_arrays(
-                    arrays=np.zeros(intermediate_shape[0]),
-                    beam=beam,
-                    task_tag=CryonirspTag.task_geometric_sepectral_shifts(),
+                task.write(
+                    data=np.zeros(intermediate_shape[0]),
+                    tags=[
+                        CryonirspTag.intermediate_frame(beam=beam),
+                        CryonirspTag.task_geometric_spectral_shifts(),
+                    ],
+                    encoder=fits_array_encoder,
                 )
 
                 for modstate in range(1, number_of_modstates + 1):
@@ -93,19 +109,25 @@ def solar_gain_calibration_task_that_completes(
                     lamp_cal_ramp = np.flip(lamp_cal_ramp)
                     lamp_cal = np.ones(intermediate_shape) * lamp_cal_ramp[None, :]
                     lamp_cal /= np.nanmean(lamp_cal)
-                    task.intermediate_frame_write_arrays(
-                        arrays=lamp_cal,
-                        beam=beam,
-                        modstate=modstate,
-                        task_tag=CryonirspTag.task_lamp_gain(),
+                    task.write(
+                        data=lamp_cal,
+                        tags=[
+                            CryonirspTag.intermediate_frame(beam=beam),
+                            CryonirspTag.modstate(modstate),
+                            CryonirspTag.task_lamp_gain(),
+                        ],
+                        encoder=fits_array_encoder,
                     )
 
                     # Geo offsets
-                    task.intermediate_frame_write_arrays(
-                        arrays=np.zeros(2),
-                        beam=beam,
-                        modstate=modstate,
-                        task_tag=CryonirspTag.task_geometric_offset(),
+                    task.write(
+                        data=np.zeros(2),
+                        tags=[
+                            CryonirspTag.intermediate_frame(beam=beam),
+                            CryonirspTag.modstate(modstate),
+                            CryonirspTag.task_geometric_offset(),
+                        ],
+                        encoder=fits_array_encoder,
                     )
 
                 # Raw gain input images contain both beams, so are not beam specific!!!
@@ -129,11 +151,9 @@ def solar_gain_calibration_task_that_completes(
                 task.write(
                     data=solar_hdul,
                     tags=[
-                        CryonirspTag.linearized(),
+                        CryonirspTag.linearized_frame(exposure_conditions=exposure_conditions),
                         CryonirspTag.task_solar_gain(),
                         CryonirspTag.modstate(modstate),
-                        CryonirspTag.frame(),
-                        CryonirspTag.exposure_conditions(exposure_conditions),
                     ],
                     encoder=fits_hdulist_encoder,
                 )
@@ -172,7 +192,15 @@ def test_solar_gain_task(solar_gain_calibration_task_that_completes, mocker, fri
     task()
     for beam in range(1, task.constants.num_beams + 1):
         for modstate in range(1, task.constants.num_modstates + 1):
-            solar_gain = task.intermediate_frame_load_solar_gain_array(beam=beam)
+            solar_gain = next(
+                task.read(
+                    tags=[
+                        CryonirspTag.intermediate_frame(beam=beam),
+                        CryonirspTag.task_solar_gain(),
+                    ],
+                    decoder=cryo_fits_array_decoder,
+                )
+            )
             # If fringe correction is on, then just be happy we got a file...
             if task.parameters.fringe_correction_on:
                 continue
@@ -180,8 +208,13 @@ def test_solar_gain_task(solar_gain_calibration_task_that_completes, mocker, fri
             expected = np.flip(true_solar_single_beam, axis=1)
             np.testing.assert_allclose(expected, solar_gain)
             # Test for the existence of the spectral corrected solar array
-            spectral_corrected_array = task.intermediate_frame_load_intermediate_arrays(
-                tags=[CryonirspTag.beam(beam), CryonirspTag.task("SPECTRAL_CORRECTED_SOLAR_ARRAY")]
+            spectral_corrected_array = next(
+                task.read(
+                    tags=[
+                        CryonirspTag.intermediate_frame(beam=beam),
+                        CryonirspTag.task("SPECTRAL_CORRECTED_SOLAR_ARRAY"),
+                    ]
+                )
             )
 
     quality_files = task.read(tags=[CryonirspTag.quality("TASK_TYPES")])
@@ -191,8 +224,7 @@ def test_solar_gain_task(solar_gain_calibration_task_that_completes, mocker, fri
             assert isinstance(data, dict)
             assert data["total_frames"] == task.scratch.count_all(
                 tags=[
-                    CryonirspTag.linearized(),
-                    CryonirspTag.frame(),
+                    CryonirspTag.linearized_frame(),
                     CryonirspTag.task_solar_gain(),
                 ]
             )

{dkist_processing_cryonirsp-1.4.15.dist-info → dkist_processing_cryonirsp-1.4.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dkist-processing-cryonirsp
-Version: 1.4.15
+Version: 1.4.16
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -17,7 +17,7 @@ Requires-Dist: Pillow==10.3.0
 Requires-Dist: astropy==6.1.0
 Requires-Dist: dkist-fits-specifications==4.10.0
 Requires-Dist: dkist-header-validator==5.1.1
-Requires-Dist: dkist-processing-common==10.5.9
+Requires-Dist: dkist-processing-common==10.5.10
 Requires-Dist: dkist-processing-math==2.1.2
 Requires-Dist: dkist-processing-pac==3.1.1
 Requires-Dist: dkist-spectral-lines==3.0.0

{dkist_processing_cryonirsp-1.4.15.dist-info → dkist_processing_cryonirsp-1.4.16.dist-info}/RECORD

@@ -1,15 +1,18 @@
 changelog/.gitempty,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkist_processing_cryonirsp/__init__.py,sha256=Z6-kB7fXXUI-F7Vz1HnEaja2h8qgH9IZExRl1lUxvZg,350
 dkist_processing_cryonirsp/config.py,sha256=xNkUNJ1BeBxJX881mTCIEbirZlD5_5txpV1QqkbfRM0,507
+dkist_processing_cryonirsp/codecs/__init__.py,sha256=du1iitvsudSSOMENSywXmXSLOlvIocJsPbvfEcyqFNc,159
+dkist_processing_cryonirsp/codecs/fits.py,sha256=EAdPcqWXMEWtWnRDLH_LX20giPoLVfmKBawb9J2z0wM,1718
 dkist_processing_cryonirsp/models/__init__.py,sha256=m6UekKftTahNJ3W5K3mZSz4Y4ZZpHRxF_ZAxuaKYL7o,12
+dkist_processing_cryonirsp/models/beam_boundaries.py,sha256=FyiLd2iCWA6TUojeGaqQ_ULxvakDY13VxqUJVlmYvV0,1159
 dkist_processing_cryonirsp/models/constants.py,sha256=p0HTXr994UHUrDRf3o-S5lb2ic7K2TRrHWl-hTWJUlA,10650
 dkist_processing_cryonirsp/models/exposure_conditions.py,sha256=slFq5-Qz4fRpJKDBabbm4evPWLQVYmT-Uf9rk7nI734,813
-dkist_processing_cryonirsp/models/parameters.py,sha256=oAB_68AY2HdxK8IkvzisPKDI-c2agZeKiE5VIkHkkRI,13422
-dkist_processing_cryonirsp/models/tags.py,sha256=1Q2ag0ud9gx3su-XUqa--gwSnf5di7CGnlkyiEFreRs,4388
+dkist_processing_cryonirsp/models/parameters.py,sha256=Oa3H7nc3wb8AkKLCsEnxibBJTwwK5U9ZMxzpS7pGFp4,13342
+dkist_processing_cryonirsp/models/tags.py,sha256=ac0MnYlsn8-w7IioOvWeo7mBaDKE9o9TlRpxCH1OsRc,5743
 dkist_processing_cryonirsp/models/task_name.py,sha256=xK4AKwgOx2uANbjhr0Q5Q3R9iPxLfkVKxWYY8wWjKhE,439
 dkist_processing_cryonirsp/parsers/__init__.py,sha256=m6UekKftTahNJ3W5K3mZSz4Y4ZZpHRxF_ZAxuaKYL7o,12
 dkist_processing_cryonirsp/parsers/check_for_gains.py,sha256=v-eD1LG0dlFoZXz5Y-2ZyPvRL2TZ8gWfr5cN6YNYqvo,2341
-dkist_processing_cryonirsp/parsers/cryonirsp_l0_fits_access.py,sha256=iu5GJWVQ1PZfv5TR0u_IS2j2KZBU0yewa1ugxjDfVzk,4568
+dkist_processing_cryonirsp/parsers/cryonirsp_l0_fits_access.py,sha256=HtkmVdhEZxasKQyxWQyrirmiDrzAVfr3QCC2ldzBdSk,5617
 dkist_processing_cryonirsp/parsers/cryonirsp_l1_fits_access.py,sha256=sc8MzxYMc8E1eFrL5KguAGHViCMJhaDfiBtZPml4ELg,886
 dkist_processing_cryonirsp/parsers/exposure_conditions.py,sha256=Mcud-0PQK0oJSxbqtQUtVk0t8b6YBEFSyGsGbG5UqGg,8445
 dkist_processing_cryonirsp/parsers/map_repeats.py,sha256=PjZ986bqkCdii-EOzU045cWqadxQC_nyyqwWYIpYdls,1566
@@ -21,66 +24,63 @@ dkist_processing_cryonirsp/parsers/scan_step.py,sha256=7XNUq48qbdpV8GeaBeG9XFRDk
 dkist_processing_cryonirsp/parsers/time.py,sha256=dpajm3tfrih-8pjlOWOvZVJVP2FihR87HFQSjR_KPYI,2543
 dkist_processing_cryonirsp/parsers/wavelength.py,sha256=Ay5hZiDNV25-N_QXZINTCgn1ToiP2jvwumkbirBiJGk,883
 dkist_processing_cryonirsp/tasks/__init__.py,sha256=JyM9oA1A6t5sPsbaNmnK9_e6t00kUYzDZzqmSg0nVjE,1061
-dkist_processing_cryonirsp/tasks/assemble_movie.py,sha256=Brj3zdTKQiwgclIKoW2TSxuEHlkST8WjxvtBZONyGKM,7337
-dkist_processing_cryonirsp/tasks/bad_pixel_map.py,sha256=QZzCngleitLDjq_2zRBuUorMMkmzMEo11Xwvu6dEudc,3713
-dkist_processing_cryonirsp/tasks/beam_boundaries_base.py,sha256=N3zk08sRcczoNGIqRd8vzGtYLQUUiH52-WOc7fIw7t4,9960
-dkist_processing_cryonirsp/tasks/ci_beam_boundaries.py,sha256=N-LDXCzI0JJLvhTM69W0zW6moAPaVzl96h41RTn0wNE,1893
-dkist_processing_cryonirsp/tasks/ci_science.py,sha256=Qa-qSx_TxtXzGGjgN73TDbO1kqxBNlkt2zaBBB43erM,6693
-dkist_processing_cryonirsp/tasks/cryonirsp_base.py,sha256=rVy7vV4il0_B5KXenmCYEcYLNaIQ8_MDiKKn8X6v8yw,2168
-dkist_processing_cryonirsp/tasks/dark.py,sha256=RAIejLZFYwJcXjrpGlLRnW42xsD5EGjxyHdXvsBUztw,4127
-dkist_processing_cryonirsp/tasks/gain.py,sha256=adrYXgCg0gmDsiczFhyU8kBQsVXj15IEfGrRE2TqVdw,8537
-dkist_processing_cryonirsp/tasks/instrument_polarization.py,sha256=uaQWIcQkw61azIA8J1GaRHegFrpZmjWT4wER3iaRmWE,19526
-dkist_processing_cryonirsp/tasks/l1_output_data.py,sha256=FdL_Dv-YTLgT-xH_uOOUjk4GUYMjbaSDPIg1rIQu_iY,1621
-dkist_processing_cryonirsp/tasks/linearity_correction.py,sha256=-R0iBJDNF9o57GUd5C8YlOL6wyVUzKf5rSDFgu0kpgA,24310
-dkist_processing_cryonirsp/tasks/make_movie_frames.py,sha256=Ql_bg1r1W1m-tTOParAdkllFJEJFdNoE16GgHyhDgdw,13900
+dkist_processing_cryonirsp/tasks/assemble_movie.py,sha256=UrxfKSsT3mBkV2LYvnePzKr9nXlvjpoa5amY5C3ftFI,7350
+dkist_processing_cryonirsp/tasks/bad_pixel_map.py,sha256=z-ACCwHqiRANsR7gkkCIycPpgOdR04Mo85WLAPiAJno,3961
+dkist_processing_cryonirsp/tasks/beam_boundaries_base.py,sha256=mOP_AlyZyO6aL6UW7OXV63852tK6Dljkbno_4jlFWNg,9618
+dkist_processing_cryonirsp/tasks/ci_beam_boundaries.py,sha256=pgpi6m0T1E1dkJ8btu45DMK--e7aCJ0wdEnZyD3g7MU,1889
+dkist_processing_cryonirsp/tasks/ci_science.py,sha256=VCt5E2gqL2j5fseSfsqCyCKK5hCGpXiR0XCBC74BiKQ,7366
+dkist_processing_cryonirsp/tasks/cryonirsp_base.py,sha256=7cMXOI7yQ8xTAtJg4ZkhBDej4AknHKBIvw8e9mCiRBw,1814
+dkist_processing_cryonirsp/tasks/dark.py,sha256=h_n1SU2bFiK7lp4vAKxv2ETKHYRODUp2KkH0YXjgFq8,4936
+dkist_processing_cryonirsp/tasks/gain.py,sha256=1aMeSOupmw-WQNb9O2Qx4uxGae0ilZDszo9xbf38Y_g,10438
+dkist_processing_cryonirsp/tasks/instrument_polarization.py,sha256=CpewhRYIz7R6THkvvpsxuZTlz6O_k2w9seQDwaqcklY,23301
+dkist_processing_cryonirsp/tasks/l1_output_data.py,sha256=3RFt493MEJxdpF81gcp8FDlQ8vGZ0GXEDYQFWIufumI,1554
+dkist_processing_cryonirsp/tasks/linearity_correction.py,sha256=n9vK9cT7NWkpAM9J6wOYDj95Kh0va_ot-hdncd7ye0Y,24199
+dkist_processing_cryonirsp/tasks/make_movie_frames.py,sha256=I7s3Tml6AevHci0kTPF71mNjXNl3wlG57Jh7ghnndeg,13928
 dkist_processing_cryonirsp/tasks/parse.py,sha256=tDOC2_r8xw0RYBxe3b3Te18Y5dBnRrPtikJmuhmwT88,13117
-dkist_processing_cryonirsp/tasks/quality_metrics.py,sha256=r4mS1Qp88tHlbNKsqed-MOsFT_6Zbhr5H8-4hrx9OGw,11424
-dkist_processing_cryonirsp/tasks/science_base.py,sha256=-BjPNPI5jjiBR7K8p_9fa4vYCEUEdOFx7c2AC5EmFoE,17619
-dkist_processing_cryonirsp/tasks/sp_beam_boundaries.py,sha256=3bdj6W2H_UiOhmj2xHvADwOzojteLsTL9RkTwvzB6_M,10300
-dkist_processing_cryonirsp/tasks/sp_dispersion_axis_correction.py,sha256=Fx3UUPF3iTRLm2qn2acxvbMO4POyq6L6yeSLDpOaCKA,19036
-dkist_processing_cryonirsp/tasks/sp_geometric.py,sha256=Ym5M1DJR_ZYGqjD1Cy5IQiult3GN5dp0hnJ9sLfMDQM,21860
-dkist_processing_cryonirsp/tasks/sp_science.py,sha256=FubmQSg_ZrVy08TcT6dRK2nuA2cmGMrMYMmjT6_bYQM,12091
-dkist_processing_cryonirsp/tasks/sp_solar_gain.py,sha256=WJKenRlqFlsP3zb3IPqRFdxCGcmJZMVlM9Me-myyvn0,18541
+dkist_processing_cryonirsp/tasks/quality_metrics.py,sha256=jyx2YZzLb5sVxbJ_H6PaKQqZbyZy9QuuLqu18jsnncQ,11447
+dkist_processing_cryonirsp/tasks/science_base.py,sha256=YYUQUfLeuzDb6E5TecOH22orTN4-hWocoYaGOq6Zoro,18637
+dkist_processing_cryonirsp/tasks/sp_beam_boundaries.py,sha256=XI3iepNe04xaU4ilqxrlOgYDkv5I5rUc0RXEE1Rwt0o,10296
+dkist_processing_cryonirsp/tasks/sp_dispersion_axis_correction.py,sha256=ZfUpsija9T7ZCm111u-iCxbcx7WxHWd_OklVCfYbjXg,19465
+dkist_processing_cryonirsp/tasks/sp_geometric.py,sha256=_M_e_blz4mKDIUWSasonnOzbZ6EUbHp9pAZXQx4zY7U,24387
+dkist_processing_cryonirsp/tasks/sp_science.py,sha256=QWyAEkXYamAcWxi62-tVD6ptuQ6vt8yIzuCKzCIYW20,13643
+dkist_processing_cryonirsp/tasks/sp_solar_gain.py,sha256=d4UABsMxyzCMduVxptHY_TCGqS-l-W5iuhW7HJwVPkA,21024
 dkist_processing_cryonirsp/tasks/write_l1.py,sha256=hIjTun-zs35sXqVrcFhWqWA2gX2HpoGZxotvfHj_KpA,41457
 dkist_processing_cryonirsp/tasks/mixin/__init__.py,sha256=m6UekKftTahNJ3W5K3mZSz4Y4ZZpHRxF_ZAxuaKYL7o,12
-dkist_processing_cryonirsp/tasks/mixin/beam_access.py,sha256=DiPRbsAyfhX-juHL0slypcXi5C8PJT-DNMX6ck1IH1w,1627
 dkist_processing_cryonirsp/tasks/mixin/corrections.py,sha256=rcKmckBJkoExcX0XW1i3OZzuMu1i7tX5Hgwy15chU50,6566
-dkist_processing_cryonirsp/tasks/mixin/intermediate_frame.py,sha256=fFeIvuA4AtkQTt9hOFHUYolrSYPtjUGZU4g5f7JKj5Y,7911
-dkist_processing_cryonirsp/tasks/mixin/linearized_frame.py,sha256=oyiMA_rzBUYtlmh1ilfE5DkuIe4FFiyptaYjcU8-joA,10176
 dkist_processing_cryonirsp/tasks/mixin/shift_measurements.py,sha256=7ToSy9uOJ_JrFfd-X225wqW_laq4xoRJkBiAPanfb_g,11225
 dkist_processing_cryonirsp/tests/__init__.py,sha256=m6UekKftTahNJ3W5K3mZSz4Y4ZZpHRxF_ZAxuaKYL7o,12
 dkist_processing_cryonirsp/tests/conftest.py,sha256=_yAXaaaiyw4iQOGETN2sgelJsf1_AwjicXv1e1oqdqw,17485
 dkist_processing_cryonirsp/tests/header_models.py,sha256=Ny4h5lS54bGRPDo4nOzvJgNWMzFY9DDs1IQorr_r3s8,20591
 dkist_processing_cryonirsp/tests/test_assemble_movie.py,sha256=YNZINIFXR9kZBlE1AIvjlVmwwhZJeVYOOPk7Q8IVkcI,6222
 dkist_processing_cryonirsp/tests/test_assemble_qualilty.py,sha256=upk-oUqVBHGK3F0eemshLpAPrnfh9mbeuZXow4E1Rmc,16859
-dkist_processing_cryonirsp/tests/test_bad_pixel_maps.py,sha256=O3_GiGmc2le4TwiXZXEv4cjx-vE_oV9QrNsAc4L-Ufs,4906
-dkist_processing_cryonirsp/tests/test_ci_beam_boundaries.py,sha256=4Im8TB9iIqHep7H3P0VCfEmPAzdDOZH3MfIJdMyiHvE,4493
-dkist_processing_cryonirsp/tests/test_ci_science.py,sha256=GdzUR5csW2uoJBc_y5gYEpUxB8Qqlc8d0qhrZRjhYds,14401
+dkist_processing_cryonirsp/tests/test_bad_pixel_maps.py,sha256=4Lrcvbzzzczkz1mEXVDb_qc1cGPIWTrSZQFv4KiDhn4,4870
+dkist_processing_cryonirsp/tests/test_ci_beam_boundaries.py,sha256=lkFuFVZHDDbNkOZKeJC1inOkR0VByZVaATbdHDmr3Ew,4573
+dkist_processing_cryonirsp/tests/test_ci_science.py,sha256=dFFn49nxhv2iocZ5uGeXegJU8c-csDYaKjumvcOMxZI,14418
 dkist_processing_cryonirsp/tests/test_corrections.py,sha256=5nY8MccZcNDyQYV8IEokqtY_YrP08TZ-H7WQNioK-A0,4650
-dkist_processing_cryonirsp/tests/test_cryo_base.py,sha256=lF27S1aBmMc5wRWNPKjkXZTyGDPvLo59IubYAb1McsU,7172
+dkist_processing_cryonirsp/tests/test_cryo_base.py,sha256=6uOUgJPehr6XwZUE0InVDKJllJsTvfuG-VM5PdKlf0Q,6662
 dkist_processing_cryonirsp/tests/test_cryo_constants.py,sha256=VbjM1vZYRa_057yK_aP2ta6JyT7Ob1ou4SbGEVIIKH0,2715
-dkist_processing_cryonirsp/tests/test_dark.py,sha256=wUeRG0Gw_oQ6HxKa7nozLJA_nwKZQB0nDKnpobf5Ksw,11977
-dkist_processing_cryonirsp/tests/test_gain.py,sha256=YUgcGFh325TZBT9BbkzlkbapVJL4skTE1FVhsFNhUc8,10854
-dkist_processing_cryonirsp/tests/test_instrument_polarization.py,sha256=GgZmPJVtsEploGFEZsddwXAh9QtnoOUdywEPdkT_l-s,19276
-dkist_processing_cryonirsp/tests/test_linearity_correction.py,sha256=y9gDWlHsOaTMP7K5-lIIVmboa6nd0ozaqEtl6Fvt5T0,9406
+dkist_processing_cryonirsp/tests/test_dark.py,sha256=ZGbjFP2IOL1gyC3rjde43xMS-vWStHDL9md1bhXt8Lg,11699
+dkist_processing_cryonirsp/tests/test_gain.py,sha256=BSeum2N0vUIP12AiPB2Qhw-zgvd3EkGkK8UX9FEchuA,11290
+dkist_processing_cryonirsp/tests/test_instrument_polarization.py,sha256=AB97NvR4VIivSu7X-GBKDrOJNx_LNbCQ_7mk0T3Eezo,19505
+dkist_processing_cryonirsp/tests/test_linearity_correction.py,sha256=HRIi8fKfZvyaOOgEkO3JGz1j2ceoecrw70mmiszcGio,9365
 dkist_processing_cryonirsp/tests/test_make_movie_frames.py,sha256=WznHp9dV2-jbJYzRniCAIbSHCGNc0SpSzyVDSrZkYd4,4904
 dkist_processing_cryonirsp/tests/test_parameters.py,sha256=CbaEnxx3HGZmqZJbNzQ2IJpIg6AKlK26BT3TXUMGYAE,11438
 dkist_processing_cryonirsp/tests/test_parse.py,sha256=UXbAZb4EJ-jlrkSfQXGTp7SA9B-OG5UBgV2SkCQZHxg,55804
-dkist_processing_cryonirsp/tests/test_quality.py,sha256=DWuL7q8x2RtPz3LN9-KEw541sv6Law9WyVQKaamkOmE,8169
-dkist_processing_cryonirsp/tests/test_sp_beam_boundaries.py,sha256=4hONuVLQAqkQjNtpNzvmqEWLg3LI1XJLWaekkeS3SJo,4815
-dkist_processing_cryonirsp/tests/test_sp_dispersion_axis_correction.py,sha256=lhwT_I0HQuH66I0TRvARfuNnWWjxeAvQ4fEEVmbhp_E,6098
-dkist_processing_cryonirsp/tests/test_sp_geometric.py,sha256=xlfmE6xfHDIJqKdXjJ_fj1ADaufg2MnkTtH11_vIxWQ,13927
+dkist_processing_cryonirsp/tests/test_quality.py,sha256=qrJBYjnZOhmQ4vjDcDV3FVSUAdktFgs-pRaHX4cf2G0,8129
+dkist_processing_cryonirsp/tests/test_sp_beam_boundaries.py,sha256=b_o5k94zQEgG7fdMkuDHs1iyq6NFxv_NLYS7FvtlZQI,4895
+dkist_processing_cryonirsp/tests/test_sp_dispersion_axis_correction.py,sha256=Fha0q4yJGftQ0l815FO78K1SmXtA-qbhQ3-Jk5iiBDE,6156
+dkist_processing_cryonirsp/tests/test_sp_geometric.py,sha256=TQTR26SG6OQE00adx5lTdmb943HmXI3C6tLT-weZCM8,15721
 dkist_processing_cryonirsp/tests/test_sp_make_movie_frames.py,sha256=Kn8U_HzaaHW2bHmBxsotdjmpBhd_Ft6pLWhVsMWIJE8,5322
-dkist_processing_cryonirsp/tests/test_sp_science.py,sha256=bjUtZNlRiCaDK0ql0iMdZ6YF8f1dGAhz5HmOxWX1XBE,19416
-dkist_processing_cryonirsp/tests/test_sp_solar.py,sha256=NHHE-PPa2bU0JK0fuezZakFvAi1f_2z7AHM9vxInF-U,8913
+dkist_processing_cryonirsp/tests/test_sp_science.py,sha256=fffX8Fi-k7dYOax_5nvocbq8CXMYklmtSLfZRSe7Dsw,19850
+dkist_processing_cryonirsp/tests/test_sp_solar.py,sha256=xSIKs8yylB18dZA75jTb-yOvCE2CMbESXCFwyHK3J_c,10023
 dkist_processing_cryonirsp/tests/test_trial_create_quality_report.py,sha256=x8dRAMyawQVYZQGsuO36DMZxK4L13hZBUn86qbhJiNk,2805
 dkist_processing_cryonirsp/tests/test_workflows.py,sha256=2a-TUMbVEyNjHYNyzo2UQMLg5PSaEx6iV9hOsGp-Mck,291
 dkist_processing_cryonirsp/tests/test_write_l1.py,sha256=TIizk5mViC6Km8Ee-CfHwRFTqJmSa3Ey_GfM09iGBRc,17597
 dkist_processing_cryonirsp/tests/local_trial_workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dkist_processing_cryonirsp/tests/local_trial_workflows/l0_cals_only.py,sha256=jJ9g2muTBfSHP-RgUInnMzsfqmMY9O0Qu_N9SVH0nq4,20420
-dkist_processing_cryonirsp/tests/local_trial_workflows/l0_to_l1.py,sha256=f00YZl9ew1IX5p-a6hisXjOcA8WvM6cJ_h_jKXCFZb8,24061
+dkist_processing_cryonirsp/tests/local_trial_workflows/l0_cals_only.py,sha256=nWs3Qg3f4DHqN_6JBKDaR5q9TncgR_PeRWw3_bUBZWA,20110
+dkist_processing_cryonirsp/tests/local_trial_workflows/l0_to_l1.py,sha256=KaxxMeo_sOMWgekNVkPsTJt6XWU2Ov7rnMkBtG_sKcc,23938
 dkist_processing_cryonirsp/tests/local_trial_workflows/linearize_only.py,sha256=kl9yrE1EbgxNn__x4q0WYoZIvS8zefcOPbQQdxB4_ZE,3280
-dkist_processing_cryonirsp/tests/local_trial_workflows/local_trial_helpers.py,sha256=14XonDUbMWh6n1AwtPaDLCeSvoHCzn-MNHCkHLB4VUc,19330
+dkist_processing_cryonirsp/tests/local_trial_workflows/local_trial_helpers.py,sha256=LCvmP2KAiq0BVqMj-ThFWxAwo4oNs9hZRibQevRj4nU,19329
 dkist_processing_cryonirsp/workflows/__init__.py,sha256=iEbV3oiKmkfmdZjeNJxqw08IIZnYSroq-2b-ARpkLFQ,112
 dkist_processing_cryonirsp/workflows/ci_l0_processing.py,sha256=T-BOvDDWHzs5BDH5ctSBjzGgD6Xez52AnDXsH5_7Bms,3788
 dkist_processing_cryonirsp/workflows/sp_l0_processing.py,sha256=A74av8E8mL9WzI4vWI2GbhVrRFQ7JCMlGAioEjXkkCU,4219
@@ -105,7 +105,7 @@ docs/requirements_table.rst,sha256=FaqSag9kPi77gWPhzeo_tFEhRFjb3qUuNqqQe1K76NM,2
 docs/scientific_changelog.rst,sha256=01AWBSHg8zElnodCgAq-hMxhk9CkX5rtEENx4iz0sjI,300
 docs/sp_science_calibration.rst,sha256=fHBOZ2cqySxLjNi737KfynlmHZy9W4EwvuzxnyjDNvk,2597
 licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
-dkist_processing_cryonirsp-1.4.15.dist-info/METADATA,sha256=nzYxsQYcgSPkitS0xUODUPTMDhXnJhGgo3mUvL9VyZE,8410
-dkist_processing_cryonirsp-1.4.15.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-dkist_processing_cryonirsp-1.4.15.dist-info/top_level.txt,sha256=Sm9b1ddKnsF9Bh3mqDOct1Sm7k8I9aN7vGHgpmu-MlQ,51
-dkist_processing_cryonirsp-1.4.15.dist-info/RECORD,,
+dkist_processing_cryonirsp-1.4.16.dist-info/METADATA,sha256=EVZu26UXMgkXySvDTykCg-f2mGFYwltcMxJPSbKNhWw,8411
+dkist_processing_cryonirsp-1.4.16.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+dkist_processing_cryonirsp-1.4.16.dist-info/top_level.txt,sha256=Sm9b1ddKnsF9Bh3mqDOct1Sm7k8I9aN7vGHgpmu-MlQ,51
+dkist_processing_cryonirsp-1.4.16.dist-info/RECORD,,

dkist_processing_cryonirsp/tasks/mixin/beam_access.py

@@ -1,52 +0,0 @@
-"""Mixin to support extracting the desired beam from an input image on-the-fly."""
-from functools import cached_property
-
-import numpy as np
-
-
-class BeamAccessMixin:
-    """Mixin that supports extracting the desired beam from an input image on-the-fly."""
-
-    def beam_access_get_beam(self, array: np.ndarray, beam: int) -> np.ndarray:
-        """
-        Extract a single beam array from a dual-beam array.
-
-        Parameters
-        ----------
-        array
-            The input dual-beam array
-        beam
-            The desired beam to extract
-
-        Returns
-        -------
-        An ndarray containing the extracted beam
-        """
-        boundaries = self.beam_boundaries[beam]
-        spatial_min, spatial_max, spectral_min, spectral_max = boundaries
-
-        if (
-            spatial_min < 0
-            or spatial_max > array.shape[0]
-            or spectral_min < 0
-            or spectral_max > array.shape[1]
-        ):
-            raise IndexError(
-                f"beam_access_get_boundaries exceed array bounds: {boundaries = }, {array.shape = }."
-            )
-
-        return np.copy(array[spatial_min:spatial_max, spectral_min:spectral_max])
-
-    @cached_property
-    def beam_boundaries(self) -> dict[int, np.ndarray]:
-        """
-        Load the beam boundaries from their respective files and return as a boundary dict.
-
-        Returns
-        -------
-        beam_boundary dict
-        """
-        boundaries = dict()
-        for beam in range(1, self.constants.num_beams + 1):
-            boundaries[beam] = self.intermediate_frame_load_beam_boundaries(beam=beam)
-        return boundaries