dkist-processing-cryonirsp 1.11.1__py3-none-any.whl → 1.12.0__py3-none-any.whl

dkist_processing_cryonirsp/parsers/measurements.py

@@ -1,38 +1,47 @@
 """Copies of UniqueBud and SingleValueSingleKeyFlower from common that only activate if the frames are "observe" task."""
+from typing import Hashable
 from typing import Type
 
 from dkist_processing_common.models.flower_pot import SpilledDirt
 from dkist_processing_common.parsers.single_value_single_key_flower import (
     SingleValueSingleKeyFlower,
 )
-from dkist_processing_common.parsers.unique_bud import UniqueBud
 
 from dkist_processing_cryonirsp.models.constants import CryonirspBudName
 from dkist_processing_cryonirsp.models.tags import CryonirspStemName
 from dkist_processing_cryonirsp.parsers.cryonirsp_l0_fits_access import CryonirspL0FitsAccess
+from dkist_processing_cryonirsp.parsers.scan_step import NumberOfScanStepsBase
 
 
-class NumberOfMeasurementsBud(UniqueBud):
+class NumberOfMeasurementsBud(NumberOfScanStepsBase):
     """Bud for finding the total number of measurements per scan step."""
 
     def __init__(self):
         self.metadata_key = "num_meas"
-        super().__init__(
-            constant_name=CryonirspBudName.num_meas.value, metadata_key=self.metadata_key
-        )
+        super().__init__(stem_name=CryonirspBudName.num_meas.value)
 
-    def setter(self, fits_obj: CryonirspL0FitsAccess) -> Type[SpilledDirt] | int:
+    def getter(self, key: Hashable) -> Hashable:
         """
-        Setter for the bud.
+        Search all scan steps to find the maximum number of measurements in a step.
 
-        Parameters
-        ----------
-        fits_obj:
-            A single FitsAccess object
+        This maximum number should be the same for all measurements, with the possible exception of the last one in
+        an abort.
+
+        Abort possibilities:
+        * if a measurement is missing in the last scan step of a multi-scan, multi-map observation, it will be handled
+        as an incomplete scan step and truncated by the scan step abort handler.
+        * if a measurement is missing in a single-map, single-scan observation then the number of measurements will be
+        given by the last measurement value that had as many frames as the maximum number of frames of any
+        measurement.
+        This is a formality for intensity mode observations but is an important check for polarimetric data as the
+        abort may have happened in the middle of the modulator state sequence.
         """
-        if fits_obj.ip_task_type != "observe":
-            return SpilledDirt
-        return getattr(fits_obj, self.metadata_key)
+        measurements_in_scan_steps = []
+        for meas_dict in self.scan_step_dict.values():
+            measurements_in_scan_steps.append(len(meas_dict))
+        return max(
+            measurements_in_scan_steps
+        )  # if there are incomplete measurements, they should be at the end and will be truncated by an incomplete scan step
 
 
 class MeasurementNumberFlower(SingleValueSingleKeyFlower):

dkist_processing_cryonirsp/parsers/scan_step.py

@@ -312,11 +312,11 @@ class MapScanStepStemBase(Stem, ABC):
         return step_list.index(scan_step_obj) + 1  # Here we decide that map scan indices start at 1
 
 
-class NumberOfScanStepsBud(MapScanStepStemBase):
-    """Bud for finding the total number of scan steps."""
+class NumberOfScanStepsBase(MapScanStepStemBase, ABC):
+    """Base class for managing scan steps."""
 
-    def __init__(self):
-        super().__init__(stem_name=CryonirspBudName.num_scan_steps.value)
+    def __init__(self, stem_name: CryonirspBudName):
+        super().__init__(stem_name=stem_name)
 
     @cached_property
     def map_scan_to_obj_dict(self) -> dict[int, list[SingleScanStep]]:
@@ -361,6 +361,13 @@ class NumberOfScanStepsBud(MapScanStepStemBase):
 
         return len(completed_steps)
 
+
+class NumberOfScanStepsBud(NumberOfScanStepsBase):
+    """Bud for finding the total number of scan steps."""
+
+    def __init__(self):
+        super().__init__(stem_name=CryonirspBudName.num_scan_steps.value)
+
     def getter(self, key):
         """
         Compute the number of complete scan steps.

dkist_processing_cryonirsp/tests/test_parse.py

@@ -980,6 +980,7 @@ def test_parse_cryonirsp_linearized_incomplete_raster_scan(
 
     assert task.constants._db_dict[CryonirspBudName.num_scan_steps.value] == num_scan_steps - 1
     assert task.constants._db_dict[CryonirspBudName.num_map_scans.value] == num_map_scans
+    assert task.constants._db_dict[CryonirspBudName.num_meas.value] == 2
 
 
 @pytest.mark.parametrize("arm_id", ["CI", "SP"])

{dkist_processing_cryonirsp-1.11.1.dist-info → dkist_processing_cryonirsp-1.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-cryonirsp
-Version: 1.11.1
+Version: 1.12.0
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -89,7 +89,7 @@ Requires-Dist: WTForms==3.2.1; extra == "frozen"
 Requires-Dist: Werkzeug==2.2.3; extra == "frozen"
 Requires-Dist: aioftp==0.26.2; extra == "frozen"
 Requires-Dist: aiohappyeyeballs==2.6.1; extra == "frozen"
-Requires-Dist: aiohttp==3.12.14; extra == "frozen"
+Requires-Dist: aiohttp==3.12.15; extra == "frozen"
 Requires-Dist: aiosignal==1.4.0; extra == "frozen"
 Requires-Dist: alembic==1.16.4; extra == "frozen"
 Requires-Dist: amqp==5.3.1; extra == "frozen"
@@ -121,8 +121,8 @@ Requires-Dist: attrs==25.3.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
 Requires-Dist: billiard==4.2.1; extra == "frozen"
 Requires-Dist: blinker==1.9.0; extra == "frozen"
-Requires-Dist: boto3==1.39.14; extra == "frozen"
-Requires-Dist: botocore==1.39.14; extra == "frozen"
+Requires-Dist: boto3==1.39.16; extra == "frozen"
+Requires-Dist: botocore==1.39.16; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
 Requires-Dist: celery==5.5.3; extra == "frozen"
 Requires-Dist: certifi==2025.7.14; extra == "frozen"
@@ -147,7 +147,7 @@ Requires-Dist: dill==0.4.0; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.2.1; extra == "frozen"
 Requires-Dist: dkist-processing-common==11.2.0; extra == "frozen"
 Requires-Dist: dkist-processing-core==5.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-cryonirsp==1.11.1; extra == "frozen"
+Requires-Dist: dkist-processing-cryonirsp==1.12.0; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.0; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
 Requires-Dist: dkist-service-configuration==2.2; extra == "frozen"
@@ -209,14 +209,14 @@ Requires-Dist: networkx==3.5; extra == "frozen"
 Requires-Dist: numba==0.61.2; extra == "frozen"
 Requires-Dist: numpy==2.2.5; extra == "frozen"
 Requires-Dist: object-clerk==0.1.2; extra == "frozen"
-Requires-Dist: opentelemetry-api==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-proto==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-sdk==1.35.0; extra == "frozen"
-Requires-Dist: opentelemetry-semantic-conventions==0.56b0; extra == "frozen"
+Requires-Dist: opentelemetry-api==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-proto==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-sdk==1.36.0; extra == "frozen"
+Requires-Dist: opentelemetry-semantic-conventions==0.57b0; extra == "frozen"
 Requires-Dist: ordered-set==4.1.0; extra == "frozen"
 Requires-Dist: packaging==25.0; extra == "frozen"
 Requires-Dist: pandas==2.3.1; extra == "frozen"

{dkist_processing_cryonirsp-1.11.1.dist-info → dkist_processing_cryonirsp-1.12.0.dist-info}/RECORD

@@ -16,11 +16,11 @@ dkist_processing_cryonirsp/parsers/cryonirsp_l0_fits_access.py,sha256=rMB4mrUGQn
 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
-dkist_processing_cryonirsp/parsers/measurements.py,sha256=6IqqrVbXVnUxYUXnQF-WlJSEP-eSffr2Gx6Kj0bjxhc,1872
+dkist_processing_cryonirsp/parsers/measurements.py,sha256=nhll_yc-25ougA7N7VGP4kGWTqgQ8tDkhJVLsA0nStE,2813
 dkist_processing_cryonirsp/parsers/modstates.py,sha256=00a4kCiwgioTpMkYY9ouFuiEsoQHcD-sJOM95qI9Fhc,1093
 dkist_processing_cryonirsp/parsers/optical_density_filters.py,sha256=NURdMnNVu_nV7IfabyYynAoLe4xZ5iLbs6VU_lHmBA4,1531
 dkist_processing_cryonirsp/parsers/polarimetric_check.py,sha256=HBzg9Zi9-M1M2jh4J7LoNd3OSn8MmU9TcujyhD788Lo,4746
-dkist_processing_cryonirsp/parsers/scan_step.py,sha256=7XNUq48qbdpV8GeaBeG9XFRDkYlgw8Fjd6ByFZ24OAc,18972
+dkist_processing_cryonirsp/parsers/scan_step.py,sha256=3HuclK9kHWgx29V6YQLr0nnGhaJJSSTexWAZ5STwQXA,19177
 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=iSODAESNU6zBZo_t44LeTmS1oj_l6EVF7k8xSNtppnk,1057
@@ -65,7 +65,7 @@ dkist_processing_cryonirsp/tests/test_instrument_polarization.py,sha256=lYd4Dg3u
 dkist_processing_cryonirsp/tests/test_linearity_correction.py,sha256=00dQy-GiT8HFGIBQRiYJGG7yakdsyUghBXg25RSEuRU,9308
 dkist_processing_cryonirsp/tests/test_make_movie_frames.py,sha256=oQnUmb9IxkRG7NrY00oS1g42L_LP941vdYdbEbI47gE,4858
 dkist_processing_cryonirsp/tests/test_parameters.py,sha256=hy0ssu2OJmkHFKlGd0_d6EW10YjWsqGb68rOFlPqGuo,11105
-dkist_processing_cryonirsp/tests/test_parse.py,sha256=FlrLdn_XDPpPw1YMthnF-XoxSI1R8pNsmYJdu-83UTI,57063
+dkist_processing_cryonirsp/tests/test_parse.py,sha256=VKd9qa2MkC9u14XchYk2QHyIvuPiHUTdyleJgCycXj4,57136
 dkist_processing_cryonirsp/tests/test_quality.py,sha256=DrlHre7thON2x4QzWdupuqKT_WoPtW43Jnjb7lLnp3I,8083
 dkist_processing_cryonirsp/tests/test_sp_beam_boundaries.py,sha256=fPsXnNvkb76mfp7bxu42eTLQpe_TmCc9Ue8hJ_LymbA,4904
 dkist_processing_cryonirsp/tests/test_sp_geometric.py,sha256=zeELL7dvAntN9k19WWTKwpFX95Fj-GxRV0tx-84sVdE,15645
@@ -106,7 +106,7 @@ docs/scientific_changelog.rst,sha256=01AWBSHg8zElnodCgAq-hMxhk9CkX5rtEENx4iz0sjI
 docs/sp_science_calibration.rst,sha256=XL-H_hyzqwPHYNW3j-muItX_hGqMi-gjFRQbHp60LlU,2997
 docs/wavelength_calibration.rst,sha256=s7ds_QKlVJ68fdONSY3DOBvHHaQC0JR_D4goG_VVKWw,3457
 licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
-dkist_processing_cryonirsp-1.11.1.dist-info/METADATA,sha256=QPGrsmiz7d1WXyPUFPQeHgNI5LoqJ7q2WtG5NwbEUcg,22111
-dkist_processing_cryonirsp-1.11.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dkist_processing_cryonirsp-1.11.1.dist-info/top_level.txt,sha256=Sm9b1ddKnsF9Bh3mqDOct1Sm7k8I9aN7vGHgpmu-MlQ,51
-dkist_processing_cryonirsp-1.11.1.dist-info/RECORD,,
+dkist_processing_cryonirsp-1.12.0.dist-info/METADATA,sha256=RaRaB_m8T_SR9utFVwhce6Rq3PuAN94kIMllctKLVCw,22111
+dkist_processing_cryonirsp-1.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dkist_processing_cryonirsp-1.12.0.dist-info/top_level.txt,sha256=Sm9b1ddKnsF9Bh3mqDOct1Sm7k8I9aN7vGHgpmu-MlQ,51
+dkist_processing_cryonirsp-1.12.0.dist-info/RECORD,,