dkist-processing-dlnirsp 0.32.3__py3-none-any.whl → 0.32.5__py3-none-any.whl

dkist_processing_dlnirsp/models/fits_access.py

@@ -2,8 +2,6 @@
 
 from enum import StrEnum
 
-from dkist_processing_common.models.fits_access import MetadataKey
-
 
 class DlnirspMetadataKey(StrEnum):
     """Controlled list of names for FITS metadata header keys."""

dkist_processing_dlnirsp/tasks/linearity_correction.py

@@ -28,14 +28,32 @@ class LinearityCorrection(DlnirspTaskBase):
 
     record_provenance = True
 
-    camera_sequence_regex: re.Pattern = re.compile(r"(\d*)line,(\d*)read")
+    valid_camera_sequence_regex: re.Pattern = re.compile(
+        r"^(\d*subframe)?(?(1)|(?:\d*line,\d*read,?)+)(?:,\d*line)?$"
+    )
     """
-    regex pattern used to parse line-read-line values for a single coadd.
+    regex pattern that defines all valid camera-sample sequences.
+
+    It must start with either "Xline,Yread", which can repeat any number of times, or "Xsubframe" which must be by itself.
+    Either of these sequences may be padded with ",Zline" reset frames.
+    """
+
+    uptheramp_coadd_regex: re.Pattern = re.compile(r"(\d*)line,(\d*)read")
+    """
+    regex pattern used to parse line-read-line values for a single UpTheRamp coadd.
 
     This is where we decide that camera sequences are one or more coadd sequences, where each coadd sequence is
     "Xline,Yread". The total sequence may be padded with ",Zline" reset frames, which are not captured by this regex.
     """
 
+    subframe_sequence_regex: re.Pattern = re.compile(r"(\d*)subframe")
+    """
+    regex pattern used to parse coadds in SubFrame mode
+
+    Simply looks for "Xsubframe" and captures the "X". The sequence may be padded with ",Zline" reset frames, which are
+    not captured by this regex.
+    """
+
     def run(self):
         """
         Linearize IR camera frames or tag VIS camera frames as LINEARIZED.
@@ -110,17 +128,16 @@ class LinearityCorrection(DlnirspTaskBase):
         )
         num_coadds = len(coadd_sequence_nums_list)
 
-        line_read_line_indices = coadd_sequence_nums_list[0]
-        num_bias, num_read = line_read_line_indices[:2]
-
-        ndr_per_coadd = num_bias + num_read
-
         # In `is_ramp_valid` we already confirmed that all NDRs have the same values and that they are one of the
         # expected values
         camera_readout_mode = ramp_obj_list[0].camera_readout_mode
         modulator_spin_mode = ramp_obj_list[0].modulator_spin_mode
         match camera_readout_mode:
             case "UpTheRamp":
+                line_read_line_indices = coadd_sequence_nums_list[0]
+                num_bias, num_read = line_read_line_indices[:2]
+                ndr_per_coadd = num_bias + num_read
+
                 match modulator_spin_mode:
                     case "Continuous":
                         linearization_func = partial(
@@ -136,6 +153,11 @@ class LinearityCorrection(DlnirspTaskBase):
                         )
 
             case "SubFrame":
+                # `self.valid_camera_sequence_regex`, along with `parse_camera_sample_sequence`, provides assurance that
+                # by the time we get here these assumptions are valid
+                num_bias = 0
+                num_read = 1
+                ndr_per_coadd = 1
                 linearization_func = self.linearize_subframe_coadd
 
         coadd_stack = np.zeros((num_coadds, *ramp_obj_list[0].data.shape))
@@ -160,13 +182,15 @@ class LinearityCorrection(DlnirspTaskBase):
         r"""
         Linearize a single coadd taken in "SubFrame" camera readout mode. This method applies to all modulator spin modes.
 
+        In "SubFrame" mode a single coadd contains a single read of the detector with no bias frames.
+
         The final, linearized coadd, :math:`\mathrm{ADU}_{lin}` is
 
         .. math::
-            \mathrm{ADU}_{lin} = f(\mathrm{ADU}_{raw,last\_read})
+            \mathrm{ADU}_{lin} = f(\mathrm{ADU}_{raw})
 
         where :math:`f(x)` is the `correction polynomial <apply_correction_polynomial>` and
-        :math:`\mathrm{ADU}_{raw,last\_read}` is the last read frame in the coadd.
+        :math:`\mathrm{ADU}_{raw}` is the single read frame in the coadd.
         """
         # Need to cast as float because raw are uint16 and will thus explode for values below 0
         last_read = coadd_obj_list[-1].data.astype(float)
@@ -291,16 +315,25 @@ class LinearityCorrection(DlnirspTaskBase):
         "3line,45read,3line,45read,2line"
             `[[3, 45], [3, 45]]`
 
+        "4subframe,89line"
+            `[[1], [1], [1], [1]]`
+
         Returns
         -------
-        A list of lists. Top-level list contains an item for each coadd. These items are themselves lists of
-        length 2. The numbers in these inner lists correspond to the number of bias and read frames in that coadd,
-        respectively.
+        A list of lists. Top-level list contains an item for each coadd. In UpTheRamp mode these items are themselves
+        lists of length 2. The numbers in these inner lists correspond to the number of bias and read frames in that coadd,
+        respectively. In SubFrame mode the inner lists will always be length 1 and should be equal to `[1]`.
         """
-        coadd_matches = self.camera_sequence_regex.findall(camera_sample_sequence)
-        coadd_sequence_numbers = [
-            [int(num) for num in coadd_match] for coadd_match in coadd_matches
-        ]
+        if "subframe" in camera_sample_sequence:
+            coadd_matches = self.subframe_sequence_regex.findall(camera_sample_sequence)
+            # `is_ramp_valid` ensures we only have a single match here
+            num_coadd = int(coadd_matches[0])
+            coadd_sequence_numbers = [[1]] * num_coadd
+        else:
+            coadd_matches = self.uptheramp_coadd_regex.findall(camera_sample_sequence)
+            coadd_sequence_numbers = [
+                [int(num) for num in coadd_match] for coadd_match in coadd_matches
+            ]
 
         return coadd_sequence_numbers
 
@@ -310,15 +343,15 @@ class LinearityCorrection(DlnirspTaskBase):
 
         Current validity checks are:
 
-          1. All frames in the ramp have the same value for NUM_FRAMES_IN_RAMP
-          2. All frames in the ramp have the same value for CAMERA_READOUT_MODE
-          3. All frames in the ramp have the same value for MODULATOR_SPIN_MODE
-          4. The CAMERA_READOUT and MODULATOR_SPIN modes have expected values
-          5. The value of NUM_FRAMES_IN_RAMP equals the length of actual frames found
-          6. All frames in the ramp have the same value for CAMERA_SAMPLE_SEQUENCE
-          7. The camera sample sequence has the expected form ('(,?\d*line,\d*read)*(,\d*line)?')
-          8. All coadds in the ramp have the same camera sample sequence
-          9. The ramp length is equal to the expected length from the camera sample sequence
+        #. All frames in the ramp have the same value for NUM_FRAMES_IN_RAMP
+        #. All frames in the ramp have the same value for CAMERA_READOUT_MODE
+        #. All frames in the ramp have the same value for MODULATOR_SPIN_MODE
+        #. The CAMERA_READOUT and MODULATOR_SPIN modes have expected values
+        #. The value of NUM_FRAMES_IN_RAMP equals the length of actual frames found
+        #. All frames in the ramp have the same value for CAMERA_SAMPLE_SEQUENCE
+        #. The camera sample sequence has the expected form (`valid_camera_sequence_regex`)
+        #. All coadds in the ramp have the same camera sample sequence
+        #. The ramp length is equal to the expected length from the camera sample sequence
 
         If a ramp is not valid then the reason is logged and `False` is returned.
         """
@@ -382,7 +415,7 @@ class LinearityCorrection(DlnirspTaskBase):
             return False
 
         camera_sample_sequence = camera_sample_sequence_set.pop()
-        if re.search(r"\d*line,\d*line", camera_sample_sequence):
+        if not self.valid_camera_sequence_regex.search(camera_sample_sequence):
             logger.info(
                 f"Malformed camera sample sequence: '{camera_sample_sequence}'. "
                 f"{common_status_str}"

dkist_processing_dlnirsp/tasks/wavelength_calibration.py

@@ -4,12 +4,10 @@ import astropy.units as u
 import numpy as np
 from astropy.convolution import convolve_fft
 from astropy.convolution import interpolate_replace_nans
-from astropy.coordinates import EarthLocation
 from astropy.time import Time
 from astropy.units import Quantity
 from astropy.wcs import WCS
 from dkist_processing_common.codecs.asdf import asdf_decoder
-from dkist_processing_common.codecs.asdf import asdf_encoder
 from dkist_processing_common.codecs.fits import fits_array_decoder
 from dkist_processing_common.codecs.json import json_decoder
 from dkist_processing_common.codecs.json import json_encoder
@@ -178,7 +176,6 @@ class WavelengthCalibration(DlnirspTaskBase, CorrectionsMixin, QualityMixin):
 
         with self.telemetry_span("Run wavelength solution fit"):
             fit_result = fitter(
-                input_wavelength_vector=input_wavelength_vector,
                 input_spectrum=input_spectrum,
                 method="leastsq",
             )

dkist_processing_dlnirsp/tests/conftest.py

@@ -436,7 +436,19 @@ class RawRampHeaders(DlnirspHeaders):
                 raise ValueError(f"{array_shape = } is weird")
             array_shape = array_shape[1:]
 
-        self.num_frames_per_coadd = num_line + num_read
+        match camera_readout_mode:
+            case "UpTheRamp":
+                self.num_frames_per_coadd = num_line + num_read
+                coadd_read_sequence = f"{num_line}line,{num_read}read"
+                cam_read_sequence = ",".join([coadd_read_sequence] * num_coadd)
+            case "SubFrame":
+                self.num_frames_per_coadd = 1
+                cam_read_sequence = f"{num_coadd}subframe"
+                num_line = 0
+                num_read = 1
+            case _:
+                raise ValueError(f"Don't know how to make data for {camera_readout_mode = }")
+
         num_NDR_per_ramp = self.num_frames_per_coadd * num_coadd + num_reset
         num_frames = num_ramps * num_NDR_per_ramp
         dataset_shape = (num_frames, *array_shape)
@@ -446,12 +458,8 @@ class RawRampHeaders(DlnirspHeaders):
         self.ramp_length_sec = TimeDelta(ramp_length_sec, format="sec")
         self.num_coadd = num_coadd
         self.num_line = num_line
-        self.num_read = num_read
         self.num_reset = num_reset
 
-        coadd_read_sequence = f"{num_line}line,{num_read}read"
-        cam_read_sequence = ",".join([coadd_read_sequence] * num_coadd)
-
         if num_reset > 0:
             cam_read_sequence += f",{num_reset}line"
 

dkist_processing_dlnirsp/tests/test_linearity_correction.py

@@ -84,21 +84,31 @@ def write_ramps_to_task(
     poly_coeffs = task.parameters.linearization_poly_coeffs
     correction_poly = np.poly1d(poly_coeffs)
 
-    match modulator_spin_mode:
-        case "Continuous":
-            ramp_data_func = partial(
-                make_continuous_ramp_data, bias=bias_value, correction_poly=correction_poly
-            )
-        case "Discrete":
-            ramp_data_func = partial(
-                make_discrete_ramp_data,
-                slopes=slopes,
-                intercepts=intercepts,
-                bias=bias_value,
-                correction_poly=correction_poly,
-            )
+    match camera_readout_mode:
+        case "UpTheRamp":
+            match modulator_spin_mode:
+                case "Continuous":
+                    ramp_data_func = partial(
+                        make_continuous_ramp_data, bias=bias_value, correction_poly=correction_poly
+                    )
+                case "Discrete":
+                    ramp_data_func = partial(
+                        make_discrete_ramp_data,
+                        slopes=slopes,
+                        intercepts=intercepts,
+                        bias=bias_value,
+                        correction_poly=correction_poly,
+                    )
+                case _:
+                    raise ValueError(
+                        f"Don't know how to make data for {camera_readout_mode = } and {modulator_spin_mode = }"
+                    )
+        case "SubFrame":
+            ramp_data_func = partial(make_subframe_data, correction_poly=correction_poly)
+            num_line = 0
+            num_read = 1
         case _:
-            raise ValueError(f"Don't know how to make data for {modulator_spin_mode = }")
+            raise ValueError(f"Don't know how to make data for {camera_readout_mode = }")
 
     dataset = RawRampHeaders(
         array_shape=array_shape,
@@ -239,6 +249,27 @@ def make_discrete_ramp_data(
     return array
 
 
+def make_subframe_data(
+    frame: RawRampHeaders, correction_poly: np.poly1d = np.poly1d([1])
+) -> np.ndarray:
+    shape = frame.array_shape
+    if frame.frame_in_ramp("") <= frame.num_coadd:
+        # One of the subframes. These are the values we use
+        true_value = (frame.current_coadd_in_ramp + 1) * 1000
+
+    else:
+        # A reset frame. Who cares
+        true_value = np.nan
+
+    # We want the polynomial corrected frame value to equal `true_value`, but the value of the polynomial will change
+    # depending on the "raw" value (`value`). So here we solve for the raw value numerically.
+    # Basically, solve for x such that `x / poly(x) == true_value`
+    fit_func = lambda x: x / correction_poly(x) - true_value
+    value = fsolve(fit_func, true_value)
+
+    return np.ones(shape) * value
+
+
 def write_vis_inputs_to_task(task, num_frames):
     dataset = SimpleModulatedHeaders(
         num_modstates=num_frames,
@@ -283,10 +314,9 @@ def up_the_ramp_continuous_expected_value(
 def subframe_expected_value(
     *, ramp_num: int, num_line: int, num_read: int, expected_avg_coadd_value: float, **unused_args
 ) -> float:
-    # See `make_discrete_ramp_data` for where this comes from
-    # Unlike the continuous data methods, the discrete data already includes the bias, so we don't need
-    # to subtract it here
-    return ramp_num * 100 + (num_line + num_read) * 10 + expected_avg_coadd_value
+    # See `make_subframe_ramp_data` for where this comes from; each coadd has the value of it's coadd number (1-indexed)
+    # times 1000
+    return expected_avg_coadd_value * 1000
 
 
 def discrete_expected_value(
@@ -472,6 +502,8 @@ def test_VIS_linearity_correction(
             [[3, 2], [3, 2], [3, 2]],
             id="3line,2read,3line,2read,3line,2read,1line",
         ),
+        pytest.param("3subframe", [[1], [1], [1]], id="3subframe"),
+        pytest.param("5subframe,37line", [[1], [1], [1], [1], [1]], id="5subframe,37line"),
     ],
 )
 def test_parse_camera_sample_sequence(linearity_correction_task, camera_sequence, expected_results):
@@ -573,6 +605,19 @@ def test_linearity_correction_with_invalid_ramps(
             "Missing some ramp frames. Expected 10 from sample sequence",
             id="wrong_number_from_seq",
         ),
+        pytest.param(
+            [
+                DummyRampFitsAccess(
+                    num_frames_in_ramp=2, camera_sample_sequence="5subframe,23line"
+                ),
+                DummyRampFitsAccess(
+                    num_frames_in_ramp=2, camera_sample_sequence="5subframe,23line"
+                ),
+            ],
+            False,
+            "Missing some ramp frames. Expected 28 from sample sequence",
+            id="wrong_number_from_seq_subframe",
+        ),
         pytest.param(
             [
                 DummyRampFitsAccess(
@@ -584,6 +629,39 @@ def test_linearity_correction_with_invalid_ramps(
             "Malformed camera sample sequence",
             id="bad_cam_seq",
         ),
+        pytest.param(
+            [
+                DummyRampFitsAccess(
+                    num_frames_in_ramp=1,
+                    camera_sample_sequence="3subframe,2read",
+                ),
+            ],
+            False,
+            "Malformed camera sample sequence",
+            id="bad_cam_seq_subframe_mix",
+        ),
+        pytest.param(
+            [
+                DummyRampFitsAccess(
+                    num_frames_in_ramp=1,
+                    camera_sample_sequence="10line,3subframe",
+                ),
+            ],
+            False,
+            "Malformed camera sample sequence",
+            id="bad_cam_seq_line_subframe",
+        ),
+        pytest.param(
+            [
+                DummyRampFitsAccess(
+                    num_frames_in_ramp=1,
+                    camera_sample_sequence="3subframe,3subframe",
+                ),
+            ],
+            False,
+            "Malformed camera sample sequence",
+            id="bad_cam_seq_multiple_subframe",
+        ),
         pytest.param(
             [
                 DummyRampFitsAccess(camera_readout_mode="UpTheRamp"),
@@ -623,6 +701,26 @@ def test_linearity_correction_with_invalid_ramps(
             "",
             id="valid",
         ),
+        pytest.param(
+            [
+                DummyRampFitsAccess(num_frames_in_ramp=2, camera_sample_sequence="2subframe"),
+                DummyRampFitsAccess(num_frames_in_ramp=2, camera_sample_sequence="2subframe"),
+            ],
+            True,
+            "",
+            id="valid_subframe",
+        ),
+        pytest.param(
+            [
+                DummyRampFitsAccess(num_frames_in_ramp=4, camera_sample_sequence="3subframe,1line"),
+                DummyRampFitsAccess(num_frames_in_ramp=4, camera_sample_sequence="3subframe,1line"),
+                DummyRampFitsAccess(num_frames_in_ramp=4, camera_sample_sequence="3subframe,1line"),
+                DummyRampFitsAccess(num_frames_in_ramp=4, camera_sample_sequence="3subframe,1line"),
+            ],
+            True,
+            "",
+            id="valid_subframe_reset",
+        ),
     ],
 )
 def test_is_ramp_valid(linearity_correction_task, ramp_list, valid, message, caplog):
@@ -634,7 +732,7 @@ def test_is_ramp_valid(linearity_correction_task, ramp_list, valid, message, cap
     logger.add(caplog.handler)
     assert linearity_correction_task.is_ramp_valid(ramp_list) is valid
     if not valid:
-        assert re.search(message, caplog.text)
+        assert re.search(message, caplog.text), f"Did not find {message} in {caplog.text}"
 
 
 def test_correction_polynomial(linearity_correction_task, assign_input_dataset_doc_to_task):

dkist_processing_dlnirsp/tests/test_parse.py

@@ -46,7 +46,7 @@ def raw_ramp_parse_task(tmp_path, recipe_run_id, arm_id):
     ramp_length_sec = 1.0
     array_shape = (3, 3)
     modulator_spin_mode = "Really fast"
-    camera_readout_mode = "Super cool"
+    camera_readout_mode = "UpTheRamp"
     with ParseL0DlnirspRampData(
         recipe_run_id=recipe_run_id,
         workflow_name="workflow_name",

{dkist_processing_dlnirsp-0.32.3.dist-info → dkist_processing_dlnirsp-0.32.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-dlnirsp
-Version: 0.32.3
+Version: 0.32.5
 Summary: Science processing code for the DLNIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
-Requires-Dist: dkist-processing-common==11.8.0
+Requires-Dist: dkist-processing-common==11.8.1
 Requires-Dist: dkist-processing-math==2.2.1
 Requires-Dist: dkist-processing-pac==3.1.1
 Requires-Dist: dkist-header-validator==5.2.1
@@ -28,7 +28,7 @@ Requires-Dist: peakutils==1.3.5
 Requires-Dist: sunpy==6.1.1
 Requires-Dist: moviepy==2.1.2
 Requires-Dist: asdf==3.5.0
-Requires-Dist: solar-wavelength-calibration==1.0.1
+Requires-Dist: solar-wavelength-calibration==2.0.0
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
@@ -94,44 +94,44 @@ Requires-Dist: aiohappyeyeballs==2.6.1; extra == "frozen"
 Requires-Dist: aiohttp==3.13.2; extra == "frozen"
 Requires-Dist: aiosignal==1.4.0; extra == "frozen"
 Requires-Dist: aiosmtplib==5.0.0; extra == "frozen"
-Requires-Dist: alembic==1.17.1; extra == "frozen"
+Requires-Dist: alembic==1.17.2; extra == "frozen"
 Requires-Dist: amqp==5.3.1; extra == "frozen"
 Requires-Dist: annotated-types==0.7.0; extra == "frozen"
-Requires-Dist: anyio==4.11.0; extra == "frozen"
+Requires-Dist: anyio==4.12.0; extra == "frozen"
 Requires-Dist: apache-airflow==2.11.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-celery==3.10.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-compat==1.8.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-io==1.6.4; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-sql==1.28.2; extra == "frozen"
+Requires-Dist: apache-airflow-providers-celery==3.13.1; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-compat==1.10.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-io==1.7.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-sql==1.29.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-fab==1.5.3; extra == "frozen"
-Requires-Dist: apache-airflow-providers-ftp==3.13.2; extra == "frozen"
-Requires-Dist: apache-airflow-providers-http==5.4.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-imap==3.9.3; extra == "frozen"
-Requires-Dist: apache-airflow-providers-postgres==6.4.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-smtp==2.3.1; extra == "frozen"
-Requires-Dist: apache-airflow-providers-sqlite==4.1.2; extra == "frozen"
-Requires-Dist: apispec==6.8.4; extra == "frozen"
+Requires-Dist: apache-airflow-providers-ftp==3.14.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-http==5.6.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-imap==3.10.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-postgres==6.5.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-smtp==2.4.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-sqlite==4.2.0; extra == "frozen"
+Requires-Dist: apispec==6.9.0; extra == "frozen"
 Requires-Dist: argcomplete==3.6.3; extra == "frozen"
 Requires-Dist: asdf==3.5.0; extra == "frozen"
 Requires-Dist: asdf_standard==1.4.0; extra == "frozen"
 Requires-Dist: asdf_transform_schemas==0.6.0; extra == "frozen"
-Requires-Dist: asgiref==3.10.0; extra == "frozen"
-Requires-Dist: asteval==1.0.6; extra == "frozen"
+Requires-Dist: asgiref==3.11.0; extra == "frozen"
+Requires-Dist: asteval==1.0.7; extra == "frozen"
 Requires-Dist: astropy==7.0.2; extra == "frozen"
-Requires-Dist: astropy-iers-data==0.2025.11.3.0.38.37; extra == "frozen"
-Requires-Dist: asyncpg==0.30.0; extra == "frozen"
+Requires-Dist: astropy-iers-data==0.2025.12.1.0.45.12; extra == "frozen"
+Requires-Dist: asyncpg==0.31.0; extra == "frozen"
 Requires-Dist: attrs==25.4.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
-Requires-Dist: billiard==4.2.2; extra == "frozen"
+Requires-Dist: billiard==4.2.4; extra == "frozen"
 Requires-Dist: blinker==1.9.0; extra == "frozen"
-Requires-Dist: boto3==1.40.65; extra == "frozen"
-Requires-Dist: botocore==1.40.65; extra == "frozen"
+Requires-Dist: boto3==1.42.1; extra == "frozen"
+Requires-Dist: botocore==1.42.1; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
-Requires-Dist: celery==5.3.1; extra == "frozen"
-Requires-Dist: certifi==2025.10.5; extra == "frozen"
+Requires-Dist: celery==5.6.0; extra == "frozen"
+Requires-Dist: certifi==2025.11.12; extra == "frozen"
 Requires-Dist: cffi==2.0.0; extra == "frozen"
 Requires-Dist: charset-normalizer==3.4.4; extra == "frozen"
-Requires-Dist: click==8.3.0; extra == "frozen"
+Requires-Dist: click==8.3.1; extra == "frozen"
 Requires-Dist: click-didyoumean==0.3.1; extra == "frozen"
 Requires-Dist: click-plugins==1.1.1.2; extra == "frozen"
 Requires-Dist: click-repl==0.3.0; extra == "frozen"
@@ -148,9 +148,9 @@ Requires-Dist: dacite==1.9.2; extra == "frozen"
 Requires-Dist: decorator==5.2.1; extra == "frozen"
 Requires-Dist: dill==0.4.0; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.2.1; extra == "frozen"
-Requires-Dist: dkist-processing-common==11.8.0; extra == "frozen"
+Requires-Dist: dkist-processing-common==11.8.1; extra == "frozen"
 Requires-Dist: dkist-processing-core==6.0.0; extra == "frozen"
-Requires-Dist: dkist-processing-dlnirsp==0.32.3; extra == "frozen"
+Requires-Dist: dkist-processing-dlnirsp==0.32.5; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.1; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.1.7; extra == "frozen"
@@ -158,14 +158,15 @@ Requires-Dist: dkist-spectral-lines==3.0.0; extra == "frozen"
 Requires-Dist: dkist_fits_specifications==4.17.0; extra == "frozen"
 Requires-Dist: dnspython==2.8.0; extra == "frozen"
 Requires-Dist: email-validator==2.3.0; extra == "frozen"
+Requires-Dist: exceptiongroup==1.3.1; extra == "frozen"
 Requires-Dist: fastjsonschema==2.21.2; extra == "frozen"
 Requires-Dist: flower==2.0.1; extra == "frozen"
-Requires-Dist: fonttools==4.60.1; extra == "frozen"
+Requires-Dist: fonttools==4.61.0; extra == "frozen"
 Requires-Dist: frozenlist==1.8.0; extra == "frozen"
 Requires-Dist: fsspec==2025.10.0; extra == "frozen"
 Requires-Dist: globus-sdk==3.65.0; extra == "frozen"
-Requires-Dist: google-re2==1.1.20250805; extra == "frozen"
-Requires-Dist: googleapis-common-protos==1.71.0; extra == "frozen"
+Requires-Dist: google-re2==1.1.20251105; extra == "frozen"
+Requires-Dist: googleapis-common-protos==1.72.0; extra == "frozen"
 Requires-Dist: gqlclient==1.2.3; extra == "frozen"
 Requires-Dist: greenlet==3.2.4; extra == "frozen"
 Requires-Dist: grpcio==1.76.0; extra == "frozen"
@@ -184,7 +185,7 @@ Requires-Dist: jsonschema==4.25.1; extra == "frozen"
 Requires-Dist: jsonschema-specifications==2025.9.1; extra == "frozen"
 Requires-Dist: jupyter_core==5.9.1; extra == "frozen"
 Requires-Dist: kiwisolver==1.4.9; extra == "frozen"
-Requires-Dist: kombu==5.6.0; extra == "frozen"
+Requires-Dist: kombu==5.6.1; extra == "frozen"
 Requires-Dist: lazy-object-proxy==1.12.0; extra == "frozen"
 Requires-Dist: lazy_loader==0.4; extra == "frozen"
 Requires-Dist: limits==5.6.0; extra == "frozen"
@@ -205,7 +206,7 @@ Requires-Dist: more-itertools==10.8.0; extra == "frozen"
 Requires-Dist: moviepy==2.1.2; extra == "frozen"
 Requires-Dist: multidict==6.7.0; extra == "frozen"
 Requires-Dist: nbformat==5.10.4; extra == "frozen"
-Requires-Dist: networkx==3.5; extra == "frozen"
+Requires-Dist: networkx==3.6; extra == "frozen"
 Requires-Dist: numba==0.61.2; extra == "frozen"
 Requires-Dist: numpy==2.2.5; extra == "frozen"
 Requires-Dist: object-clerk==1.0.0; extra == "frozen"
@@ -251,13 +252,13 @@ Requires-Dist: proglog==0.1.12; extra == "frozen"
 Requires-Dist: prometheus_client==0.23.1; extra == "frozen"
 Requires-Dist: prompt_toolkit==3.0.52; extra == "frozen"
 Requires-Dist: propcache==0.4.1; extra == "frozen"
-Requires-Dist: protobuf==6.33.0; extra == "frozen"
+Requires-Dist: protobuf==6.33.1; extra == "frozen"
 Requires-Dist: psutil==7.1.3; extra == "frozen"
 Requires-Dist: psycopg2-binary==2.9.11; extra == "frozen"
 Requires-Dist: pycparser==2.23; extra == "frozen"
-Requires-Dist: pydantic==2.12.3; extra == "frozen"
-Requires-Dist: pydantic-settings==2.11.0; extra == "frozen"
-Requires-Dist: pydantic_core==2.41.4; extra == "frozen"
+Requires-Dist: pydantic==2.12.5; extra == "frozen"
+Requires-Dist: pydantic-settings==2.12.0; extra == "frozen"
+Requires-Dist: pydantic_core==2.41.5; extra == "frozen"
 Requires-Dist: pyerfa==2.0.1.5; extra == "frozen"
 Requires-Dist: pyparsing==3.2.5; extra == "frozen"
 Requires-Dist: python-daemon==3.1.2; extra == "frozen"
@@ -273,17 +274,16 @@ Requires-Dist: requests-toolbelt==1.0.0; extra == "frozen"
 Requires-Dist: rfc3339-validator==0.1.4; extra == "frozen"
 Requires-Dist: rich==13.9.4; extra == "frozen"
 Requires-Dist: rich-argparse==1.7.2; extra == "frozen"
-Requires-Dist: rpds-py==0.28.0; extra == "frozen"
-Requires-Dist: s3transfer==0.14.0; extra == "frozen"
+Requires-Dist: rpds-py==0.30.0; extra == "frozen"
+Requires-Dist: s3transfer==0.16.0; extra == "frozen"
 Requires-Dist: scikit-image==0.25.2; extra == "frozen"
 Requires-Dist: scipy==1.15.3; extra == "frozen"
 Requires-Dist: semantic-version==2.10.0; extra == "frozen"
 Requires-Dist: setproctitle==1.3.7; extra == "frozen"
 Requires-Dist: six==1.17.0; extra == "frozen"
-Requires-Dist: sniffio==1.3.1; extra == "frozen"
-Requires-Dist: solar-wavelength-calibration==1.0.1; extra == "frozen"
+Requires-Dist: solar-wavelength-calibration==2.0.0; extra == "frozen"
 Requires-Dist: sqids==0.5.1; extra == "frozen"
-Requires-Dist: sqlparse==0.5.3; extra == "frozen"
+Requires-Dist: sqlparse==0.5.4; extra == "frozen"
 Requires-Dist: sunpy==6.1.1; extra == "frozen"
 Requires-Dist: tabulate==0.9.0; extra == "frozen"
 Requires-Dist: talus==1.3.4; extra == "frozen"
@@ -297,16 +297,17 @@ Requires-Dist: traitlets==5.14.3; extra == "frozen"
 Requires-Dist: typing-inspection==0.4.2; extra == "frozen"
 Requires-Dist: typing_extensions==4.15.0; extra == "frozen"
 Requires-Dist: tzdata==2025.2; extra == "frozen"
+Requires-Dist: tzlocal==5.3.1; extra == "frozen"
 Requires-Dist: uc-micro-py==1.0.3; extra == "frozen"
 Requires-Dist: uncertainties==3.2.3; extra == "frozen"
-Requires-Dist: universal_pathlib==0.3.4; extra == "frozen"
+Requires-Dist: universal_pathlib==0.3.6; extra == "frozen"
 Requires-Dist: urllib3==2.5.0; extra == "frozen"
 Requires-Dist: vine==5.1.0; extra == "frozen"
 Requires-Dist: voluptuous==0.15.2; extra == "frozen"
 Requires-Dist: wcwidth==0.2.14; extra == "frozen"
 Requires-Dist: wirerope==1.0.0; extra == "frozen"
 Requires-Dist: wrapt==1.17.3; extra == "frozen"
-Requires-Dist: yamale==6.0.0; extra == "frozen"
+Requires-Dist: yamale==6.1.0; extra == "frozen"
 Requires-Dist: yarl==1.22.0; extra == "frozen"
 Requires-Dist: zipp==3.23.0; extra == "frozen"
 

{dkist_processing_dlnirsp-0.32.3.dist-info → dkist_processing_dlnirsp-0.32.5.dist-info}/RECORD

@@ -5,7 +5,7 @@ dkist_processing_dlnirsp/dev_scripts/__init__.py,sha256=tITkbcFg1a-24sdFaWK8OyLr
 dkist_processing_dlnirsp/dev_scripts/test_slitbeam_group_assignment.py,sha256=ac-8G-P2L_xW6m3tOooFlHs1N5_C6F_7k2VAU2a9_1A,4171
 dkist_processing_dlnirsp/models/__init__.py,sha256=ItaZgbjndT5uwEv2YDQZCVAHGbiB_sjzkX8MMbIgcSo,45
 dkist_processing_dlnirsp/models/constants.py,sha256=0TV_K6WbvUlDQdNRxx_qblQ_dwN7RGU7ng2iDOBQedo,6386
-dkist_processing_dlnirsp/models/fits_access.py,sha256=iXaAxey-apXzj68b33-YLk7O7o0GtKAiJ_0JLoc6VOc,963
+dkist_processing_dlnirsp/models/fits_access.py,sha256=5HH8NM2tAh63Aauy6oCXKJGJ2AbQPBP5L1DitVfFEs0,895
 dkist_processing_dlnirsp/models/parameters.py,sha256=PsaZSNE4Uyov1xGMqRqh6kb5F8NnDDm3QRHkoiDAsYY,15812
 dkist_processing_dlnirsp/models/tags.py,sha256=xD_XaCjMXmd70P0FoHy92XSdlabIk07RGVEyFpXpGfM,5791
 dkist_processing_dlnirsp/models/task_name.py,sha256=LmEoI_h4UecvIMGcO5U8mGTqfToPjABuFbsYkC_rZyw,506
@@ -27,19 +27,19 @@ dkist_processing_dlnirsp/tasks/ifu_drift.py,sha256=JeFgl6uk6lYU4jJ-gBYtRESyUa9mb
 dkist_processing_dlnirsp/tasks/instrument_polarization.py,sha256=G79qXg1080zsd8ZwwYSSupUGWPRNBevyag49H32gh60,28201
 dkist_processing_dlnirsp/tasks/l1_output_data.py,sha256=Psta0476jih-cfmpdnzmquys030sW4f4VX6ksAb-g1o,465
 dkist_processing_dlnirsp/tasks/lamp.py,sha256=twoMHMnE2jm2OYxkeHFcjqcyQYVtEjSU2_z2mmn3Ybs,5390
-dkist_processing_dlnirsp/tasks/linearity_correction.py,sha256=fz16nK5q7isKz9l7_AFeDkMTaX08omlusKoIDS8wj5k,21107
+dkist_processing_dlnirsp/tasks/linearity_correction.py,sha256=z3MpWHp0lZYB2zrfHfH7HlcKoro6TPxwEN8rpqVv08c,22716
 dkist_processing_dlnirsp/tasks/make_movie_frames.py,sha256=zxyAWNnPFbG7jpUEe3ekRyJGjk706T9a-yiA3eoWi5M,6290
 dkist_processing_dlnirsp/tasks/parse.py,sha256=ZtqM6dyxxnnbVTAun040EuxfQZEQcnkXzZffXSBTYkk,10919
 dkist_processing_dlnirsp/tasks/quality_metrics.py,sha256=1ScLAinv3WG-0M7u_26gnogbJ_D84K9CP7eRvEuwb9E,7346
 dkist_processing_dlnirsp/tasks/science.py,sha256=sNI4AYO10qe3JL62KWXR87MnfX9m85Jo4_PkQ0qd5TQ,35737
 dkist_processing_dlnirsp/tasks/solar.py,sha256=NyLYkRophfXaVtvnGuNEvkcE8JNcmCJVuobNYAZ7KjQ,11135
-dkist_processing_dlnirsp/tasks/wavelength_calibration.py,sha256=6jidRwMbGoZcuVbnFv3IizEFFkGxHMTI249Q8pyVIUA,17023
+dkist_processing_dlnirsp/tasks/wavelength_calibration.py,sha256=QhFlbX8h9UqkK2vx779nK6LBksp2P2yPqhAxrwcuJ4o,16851
 dkist_processing_dlnirsp/tasks/write_l1.py,sha256=Smd9Fzp3Kx4F3nHYJJRAXqNy9n71TsYovuvFjLcUYs4,9732
 dkist_processing_dlnirsp/tasks/mixin/__init__.py,sha256=5PMbkD6K0zTfhCxv8vg2lvJCNP81qItJ_R_7Yy3Mpwc,26
 dkist_processing_dlnirsp/tasks/mixin/corrections.py,sha256=MRZXCEc0KBE-9cQUpRP-K3ioDYRH8_ORFlJcH2SsmWA,6803
 dkist_processing_dlnirsp/tasks/mixin/group_id.py,sha256=u28XLVtvZ_lmzzaSX2SuA2MOiY69GC8AJsic2Vi2OSQ,11137
 dkist_processing_dlnirsp/tests/__init__.py,sha256=UHIAs0SglAXeB7UeDgVwo1EE9QPRq3rG3BZkiCpBq7M,42
-dkist_processing_dlnirsp/tests/conftest.py,sha256=o_a-tRAfgLKgD7YOLOSJ-B3nM3dagT-UV7v30XWOI8w,68406
+dkist_processing_dlnirsp/tests/conftest.py,sha256=Xp02ZyHi6X3FzyY_IQOjLsH3gOA9zK7KGo9gpeeO6jw,68768
 dkist_processing_dlnirsp/tests/test_assemble_movie.py,sha256=hKAIHCRQu8fZwCuWsX_4WHFrDpC0bDQ9CCI9A5bRkqg,5665
 dkist_processing_dlnirsp/tests/test_assemble_quality.py,sha256=djZsVSuRGl3akH3LmYjWvYuNSUFFQfS5y0S3Op7lQIE,1327
 dkist_processing_dlnirsp/tests/test_bad_pixel_map.py,sha256=g5jWhVGSHMOtkcdiZ27G51ciud4ySjoDAjvMGLlgTIM,6093
@@ -53,10 +53,10 @@ dkist_processing_dlnirsp/tests/test_group_id.py,sha256=TpNllN6OZuYF8almsayk7pRTc
 dkist_processing_dlnirsp/tests/test_ifu_drift.py,sha256=K6ushbVQVE6AATjiP3hEgF6oyZp41SbGkI_Sa_kyrNs,9066
 dkist_processing_dlnirsp/tests/test_instrument_polarization_calibration.py,sha256=pPXjfzi3EcaawNqvXsz3OcCF1XITEJeCzQ8-iOjlm7U,23430
 dkist_processing_dlnirsp/tests/test_lamp.py,sha256=umy4ydYR5M3dqXTQP14qbamOleutyD1jSj3325aitl0,3940
-dkist_processing_dlnirsp/tests/test_linearity_correction.py,sha256=-XiA6uBxoESEFyyS538gFlAShD_NMkhshFVfpDg2xbY,28002
+dkist_processing_dlnirsp/tests/test_linearity_correction.py,sha256=JkPNtsRad2JQQ2QiJjQar9tJuCi9-ksOdEYHW_-kl58,31793
 dkist_processing_dlnirsp/tests/test_make_movie_frames.py,sha256=fR1xJEFJMK0xUu8-EyOS_6mIX_ZO2J_nM0k3ud8xtYM,3648
 dkist_processing_dlnirsp/tests/test_parameters.py,sha256=KpBeisM4BIF5Kl6ZxZqk3yCozndmLMlzNgo0ij0hmYw,10328
-dkist_processing_dlnirsp/tests/test_parse.py,sha256=Zp-LWUaiIfCJi2S3GX9DrrKg7hrRU1wnNgiFlJ-CJC8,38006
+dkist_processing_dlnirsp/tests/test_parse.py,sha256=UIII4R6JruUEFIlYDRwTwiBqyf4ldYxAhCWHM-jcd6E,38005
 dkist_processing_dlnirsp/tests/test_quality.py,sha256=OBWva_E6T5RfDuo73LiTdTr7uh2FO04VpBAsSOLfjVQ,6122
 dkist_processing_dlnirsp/tests/test_science.py,sha256=1DKqKNAEZEsVCffYz_TiEc2REG7cBIfGeig1kJK4ZtE,20902
 dkist_processing_dlnirsp/tests/test_solar.py,sha256=jTNnxs5fE8R_hLvmdAU9x4RXJaSpJWGQajL7kzXTxPQ,12111
@@ -86,16 +86,16 @@ docs/index.rst,sha256=c2KAA_icOw7Ao3rWVv7lRBTEZ-9JWidL615Xrt6fSq4,378
 docs/l0_to_l1_dlnirsp.rst,sha256=94gxaVBIIR9ljJBDAhZyViwbNUuHTaIwTuxBgSnsh60,630
 docs/l0_to_l1_dlnirsp_full-trial.rst,sha256=ZUs2RCqlklRKq6B64H-RymiY_JH9xjHp4msl-9bIOpM,561
 docs/landing_page.rst,sha256=py2OrDVuT_gZtTOzrt-8HI-PG6hO3jhM4BRxMLoMHQo,1058
-docs/linearization.rst,sha256=fYxaLr4756HZ4L_PpB4oKV4uBKDF6N9qTgNDcgIFjUU,4073
+docs/linearization.rst,sha256=NFdOoeoUtmWjvcX6IL_NsJ-bbbGNkCKLew8nag-pC_I,4131
 docs/make.bat,sha256=mBAhtURwhQ7yc95pqwJzlhqBSvRknr1aqZ5s8NKvdKs,4513
 docs/polarization_calibration.rst,sha256=vJuRGfJlTEzFxUwabyuWXchXswKoqgg23_ch31Y-eb4,5174
 docs/requirements_table.rst,sha256=6HeQU9qSmYf_gL04YVGlcP7M6P8RGPw481n9eYWB32s,295
 docs/science_calibration.rst,sha256=JUMeS7KyIsL9cUuy-IdV2tQ-wQ2lBx6j8u_51ThJzVg,3661
 docs/scientific_changelog.rst,sha256=01AWBSHg8zElnodCgAq-hMxhk9CkX5rtEENx4iz0sjI,300
-docs/wavelength_calibration.rst,sha256=VP45e0g4r-dReQmypQVqduvezQiKwq47STlAJn0w8iQ,4095
+docs/wavelength_calibration.rst,sha256=QGUd5Xmv5f7WQ1EKvw2CcgiMJQULjzdCW1hSQ8h8jj0,4123
 licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
-dkist_processing_dlnirsp-0.32.3.dist-info/METADATA,sha256=zWE2u7yocvTgqksWAwv_PMO1IfDwc3kca3TKQ79Vavo,29311
-dkist_processing_dlnirsp-0.32.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dkist_processing_dlnirsp-0.32.3.dist-info/entry_points.txt,sha256=p4-7cpIfxmQGFUDIP5n5noE5KADHN2-JvV03e0gOx9s,140
-dkist_processing_dlnirsp-0.32.3.dist-info/top_level.txt,sha256=4WmLV9LQM78KTFnkHmtaOJvVHAPpz0m9ruzDS-B_cUo,49
-dkist_processing_dlnirsp-0.32.3.dist-info/RECORD,,
+dkist_processing_dlnirsp-0.32.5.dist-info/METADATA,sha256=R76N0MRQdWzBQkqlxfJyJu7xaXB-gbvPKi-bUri5uuM,29368
+dkist_processing_dlnirsp-0.32.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dkist_processing_dlnirsp-0.32.5.dist-info/entry_points.txt,sha256=p4-7cpIfxmQGFUDIP5n5noE5KADHN2-JvV03e0gOx9s,140
+dkist_processing_dlnirsp-0.32.5.dist-info/top_level.txt,sha256=4WmLV9LQM78KTFnkHmtaOJvVHAPpz0m9ruzDS-B_cUo,49
+dkist_processing_dlnirsp-0.32.5.dist-info/RECORD,,

docs/linearization.rst

@@ -59,5 +59,6 @@ SubFrame
 
 See `~dkist_processing_dlnirsp.tasks.linearity_correction.LinearityCorrection.linearize_subframe_coadd` for a more detailed description.
 
-In this mode no bias subtraction is performed. The linearized value is simply the value of the last read NDR.
+In this mode each coadd is a single read of the detector and there are no bias frames.
+Thus, the linearized value of each coadd is simply the value of the single read.
 If a ramp contains multiple coadds then they are averaged together to produce the linearized frame.

docs/wavelength_calibration.rst

@@ -13,9 +13,9 @@ are:
 
 #. Compute a representative spectrum by taking a spatial average near the center of the FOV of an average of all solar gain images.
 
-#. Use the L0 headers to construct a decent first-guess for the wavelength solution.
+#. Use information in the L0 headers to describe the spectrograph setup used during data acquisition.
 
-#. Feed both the representative spectrum and initial guess into the `solar-wavelength-calibration <https://docs.dkist.nso.edu/projects/solar-wavelength-calibration/en/latest/>`_ library.
+#. Feed both the representative spectrum and spectrograph information into the `solar-wavelength-calibration <https://docs.dkist.nso.edu/projects/solar-wavelength-calibration/en/latest/>`_ library.
 
 #. Save the fit result as a set of header values that parameterize the solution (see below).