dkist-processing-cryonirsp 2.1.4__tar.gz → 3.0.0__tar.gz

{dkist_processing_cryonirsp-2.1.4 → dkist_processing_cryonirsp-3.0.0}/.pre-commit-config.yaml

@@ -27,7 +27,13 @@ repos:
         args:
             - --convention=numpy
             - --add-ignore=D105
--   repo: https://bitbucket.org/dkistdc/pre-commit-hooks
-    rev: v1.0.2
+-   repo: https://bitbucket.org/dkistdc/pre-commit-hooks.git
+    rev: v1.1.0
     hooks:
     -   id: calibration-workflow-name
+    -   id: dkist-env-table
+        language_version: python3.13
+        require_serial: true
+        additional_dependencies:
+        - dkist-processing-common
+        - dkist-service-configuration

{dkist_processing_cryonirsp-2.1.4 → dkist_processing_cryonirsp-3.0.0}/CHANGELOG.rst

@@ -1,3 +1,37 @@
+v3.0.0 (2026-10-08)
+===================
+
+Features
+--------
+
+- Replace `BeamBoundariesCalibration` task with `SpatialBeamBoundaries`, which only computes the boundaries of the illuminated region along the spatial axis.
+  The spectral axis (or second spatial axis, for CI) boundaries are hard-coded as a pipeline parameter. (`#306 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/306>`__)
+- Save the full set of beam boundaries used to extract illuminated regions from the raw data as a dataset extra (called "BEAM_BOUNDARIES"). (`#306 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/306>`__)
+
+
+Misc
+----
+
+- Replace "y" and "x" language with "axis_0" and "axis_1", respectively, in the `BeamBoundaries` model. (`#306 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/306>`__)
+
+
+Documentation
+-------------
+
+- Update online documentation "Dataset Extras" page to include information about the beam boundaries extra. (`#306 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/306>`__)
+
+
+v2.1.5 (2026-10-08)
+===================
+
+Misc
+----
+
+- Integrated the ``dkist-env-table`` pre-commit hook and updated the README environment-variable table to match the current configuration. (`#303 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/303>`__)
+- Bump `dkist-fits-specifications` to v4.30.0, which adds support for the BEAM BOUNDARIES dataset extra. (`#308 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/308>`__)
+- Bump `dkist-processing-common` to v14.6.0. No major changes. (`#308 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/308>`__)
+
+
 v2.1.4 (2026-10-06)
 ===================
 

{dkist_processing_cryonirsp-2.1.4 → dkist_processing_cryonirsp-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-cryonirsp
-Version: 2.1.4
+Version: 3.0.0
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -15,14 +15,13 @@ Requires-Python: >=3.13
 Description-Content-Type: text/x-rst
 Requires-Dist: Pillow==10.4.0
 Requires-Dist: astropy==7.0.2
-Requires-Dist: dkist-fits-specifications==4.29.0
+Requires-Dist: dkist-fits-specifications==4.30.0
 Requires-Dist: dkist-header-validator==6.0.0
-Requires-Dist: dkist-processing-common==14.5.2
+Requires-Dist: dkist-processing-common==14.6.0
 Requires-Dist: dkist-processing-math==2.2.3
 Requires-Dist: dkist-processing-pac==3.1.2
 Requires-Dist: dkist-spectral-lines==3.0.1
 Requires-Dist: solar-wavelength-calibration==2.0.4
-Requires-Dist: largestinteriorrectangle==0.2.1
 Requires-Dist: dkist-service-configuration==4.3.0
 Requires-Dist: moviepy==2.1.2
 Requires-Dist: numba==0.61.2
@@ -63,7 +62,7 @@ Requires-Dist: pytest; extra == "docs"
 Requires-Dist: dkist-sphinx-theme; extra == "docs"
 Provides-Extra: frozen
 Requires-Dist: Deprecated==3.0.0; extra == "frozen"
-Requires-Dist: ImageIO==2.38.0; extra == "frozen"
+Requires-Dist: ImageIO==2.38.1; extra == "frozen"
 Requires-Dist: Jinja2==3.1.6; extra == "frozen"
 Requires-Dist: Mako==1.4.3; extra == "frozen"
 Requires-Dist: MarkupSafe==3.0.4; extra == "frozen"
@@ -72,7 +71,7 @@ Requires-Dist: PyJWT==2.15.1; extra == "frozen"
 Requires-Dist: PyYAML==6.0.3; extra == "frozen"
 Requires-Dist: PyYAML-ft==8.0.0; extra == "frozen"
 Requires-Dist: Pygments==2.21.0; extra == "frozen"
-Requires-Dist: SQLAlchemy==2.1.3; extra == "frozen"
+Requires-Dist: SQLAlchemy==2.1.4; extra == "frozen"
 Requires-Dist: Send2Trash==2.1.0; extra == "frozen"
 Requires-Dist: a2wsgi==1.10.10; extra == "frozen"
 Requires-Dist: aioftp==0.28.3; extra == "frozen"
@@ -108,14 +107,14 @@ Requires-Dist: astropy==7.0.2; extra == "frozen"
 Requires-Dist: astropy-iers-data==0.2026.10.5.1.0.7; extra == "frozen"
 Requires-Dist: asttokens==3.0.2; extra == "frozen"
 Requires-Dist: async-lru==2.3.0; extra == "frozen"
-Requires-Dist: asyncpg==0.31.0; extra == "frozen"
+Requires-Dist: asyncpg==0.32.0; extra == "frozen"
 Requires-Dist: attrs==26.1.0; extra == "frozen"
 Requires-Dist: babel==2.18.0; extra == "frozen"
 Requires-Dist: beautifulsoup4==4.15.0; extra == "frozen"
 Requires-Dist: billiard==4.3.1; extra == "frozen"
 Requires-Dist: bleach==6.4.0; extra == "frozen"
-Requires-Dist: boto3==1.43.108; extra == "frozen"
-Requires-Dist: botocore==1.43.108; extra == "frozen"
+Requires-Dist: boto3==1.43.110; extra == "frozen"
+Requires-Dist: botocore==1.43.110; extra == "frozen"
 Requires-Dist: cachetools==7.2.1; extra == "frozen"
 Requires-Dist: cadwyn==7.0.0; extra == "frozen"
 Requires-Dist: celery==5.6.3; extra == "frozen"
@@ -139,14 +138,14 @@ Requires-Dist: decorator==5.3.1; extra == "frozen"
 Requires-Dist: defusedxml==0.7.1; extra == "frozen"
 Requires-Dist: dill==0.4.1; extra == "frozen"
 Requires-Dist: dkist-header-validator==6.0.0; extra == "frozen"
-Requires-Dist: dkist-processing-common==14.5.2; extra == "frozen"
+Requires-Dist: dkist-processing-common==14.6.0; extra == "frozen"
 Requires-Dist: dkist-processing-core==7.5.0; extra == "frozen"
-Requires-Dist: dkist-processing-cryonirsp==2.1.4; extra == "frozen"
+Requires-Dist: dkist-processing-cryonirsp==3.0.0; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.3; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.2; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.3.0; extra == "frozen"
 Requires-Dist: dkist-spectral-lines==3.0.1; extra == "frozen"
-Requires-Dist: dkist_fits_specifications==4.29.0; extra == "frozen"
+Requires-Dist: dkist_fits_specifications==4.30.0; extra == "frozen"
 Requires-Dist: dnspython==2.8.0; extra == "frozen"
 Requires-Dist: email-validator==2.3.0; extra == "frozen"
 Requires-Dist: executing==2.2.1; extra == "frozen"
@@ -180,8 +179,8 @@ Requires-Dist: itsdangerous==2.2.0; extra == "frozen"
 Requires-Dist: jedi==0.20.0; extra == "frozen"
 Requires-Dist: jmespath==1.1.0; extra == "frozen"
 Requires-Dist: joblib==1.6.0; extra == "frozen"
-Requires-Dist: json5==0.15.0; extra == "frozen"
-Requires-Dist: jsonpointer==3.1.1; extra == "frozen"
+Requires-Dist: json5==0.16.0; extra == "frozen"
+Requires-Dist: jsonpointer==3.2.0; extra == "frozen"
 Requires-Dist: jsonschema==4.26.0; extra == "frozen"
 Requires-Dist: jsonschema-specifications==2025.9.1; extra == "frozen"
 Requires-Dist: jupyter-events==0.12.1; extra == "frozen"
@@ -196,7 +195,6 @@ Requires-Dist: jupyterlab_pygments==0.3.0; extra == "frozen"
 Requires-Dist: jupyterlab_server==2.28.1; extra == "frozen"
 Requires-Dist: kiwisolver==1.5.1; extra == "frozen"
 Requires-Dist: kombu==5.6.2; extra == "frozen"
-Requires-Dist: largestinteriorrectangle==0.2.1; extra == "frozen"
 Requires-Dist: lark==1.3.1; extra == "frozen"
 Requires-Dist: lazy-loader==0.6; extra == "frozen"
 Requires-Dist: lazy-object-proxy==1.12.0; extra == "frozen"
@@ -221,39 +219,39 @@ Requires-Dist: natsort==8.4.0; extra == "frozen"
 Requires-Dist: nbclient==0.11.0; extra == "frozen"
 Requires-Dist: nbconvert==7.17.1; extra == "frozen"
 Requires-Dist: nbformat==5.11.1; extra == "frozen"
-Requires-Dist: nest-asyncio2==1.7.3; extra == "frozen"
+Requires-Dist: nest-asyncio2==1.7.4; extra == "frozen"
 Requires-Dist: networkx==3.7; extra == "frozen"
 Requires-Dist: notebook==7.6.3; extra == "frozen"
 Requires-Dist: notebook_shim==0.2.4; 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"
-Requires-Dist: opentelemetry-api==1.45.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-http-transport==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp==1.45.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-common==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.45.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.45.0; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.45.0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-aiohttp-client==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-asgi==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-botocore==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-celery==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-dbapi==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-fastapi==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-pika==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-psycopg2==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-pymongo==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-redis==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-requests==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-sqlalchemy==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-system-metrics==0.66b0; extra == "frozen"
+Requires-Dist: opentelemetry-api==1.45.1; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-http-transport==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp==1.45.1; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-common==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.45.1; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.45.1; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.45.1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-aiohttp-client==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-asgi==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-botocore==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-celery==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-dbapi==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-fastapi==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-pika==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-psycopg2==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-pymongo==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-redis==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-requests==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-sqlalchemy==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-system-metrics==0.66b1; extra == "frozen"
 Requires-Dist: opentelemetry-propagator-aws-xray==1.0.2; extra == "frozen"
-Requires-Dist: opentelemetry-proto==1.45.0; extra == "frozen"
-Requires-Dist: opentelemetry-sdk==1.45.0; extra == "frozen"
-Requires-Dist: opentelemetry-semantic-conventions==0.66b0; extra == "frozen"
-Requires-Dist: opentelemetry-util-http==0.66b0; extra == "frozen"
+Requires-Dist: opentelemetry-proto==1.45.1; extra == "frozen"
+Requires-Dist: opentelemetry-sdk==1.45.1; extra == "frozen"
+Requires-Dist: opentelemetry-semantic-conventions==0.66b1; extra == "frozen"
+Requires-Dist: opentelemetry-util-http==0.66b1; extra == "frozen"
 Requires-Dist: outcome==1.3.0.post0; extra == "frozen"
 Requires-Dist: packaging==26.3; extra == "frozen"
 Requires-Dist: pandas==3.0.6; extra == "frozen"
@@ -267,7 +265,7 @@ Requires-Dist: pexpect==4.9.0; extra == "frozen"
 Requires-Dist: pika==1.4.4; extra == "frozen"
 Requires-Dist: pillow==10.4.0; extra == "frozen"
 Requires-Dist: pip==26.2.1; extra == "frozen"
-Requires-Dist: platformdirs==4.12.3; extra == "frozen"
+Requires-Dist: platformdirs==4.12.4; extra == "frozen"
 Requires-Dist: pluggy==1.6.0; extra == "frozen"
 Requires-Dist: pooch==1.9.0; extra == "frozen"
 Requires-Dist: proglog==0.1.12; extra == "frozen"
@@ -281,11 +279,11 @@ Requires-Dist: psycopg-binary==3.3.6; extra == "frozen"
 Requires-Dist: psycopg2-binary==2.9.13; extra == "frozen"
 Requires-Dist: ptyprocess==0.7.0; extra == "frozen"
 Requires-Dist: pure_eval==0.2.4; extra == "frozen"
-Requires-Dist: pycparser==3.0; extra == "frozen"
-Requires-Dist: pydantic==2.13.5; extra == "frozen"
+Requires-Dist: pycparser==3.1; extra == "frozen"
+Requires-Dist: pydantic==2.14.0; extra == "frozen"
 Requires-Dist: pydantic-extra-types==2.11.1; extra == "frozen"
 Requires-Dist: pydantic-settings==2.15.0; extra == "frozen"
-Requires-Dist: pydantic_core==2.46.5; extra == "frozen"
+Requires-Dist: pydantic_core==2.50.0; extra == "frozen"
 Requires-Dist: pyerfa==2.0.1.5; extra == "frozen"
 Requires-Dist: pygtrie==2.6.2; extra == "frozen"
 Requires-Dist: pyparsing==3.3.3; extra == "frozen"
@@ -294,7 +292,7 @@ Requires-Dist: python-dateutil==2.9.0.post0; extra == "frozen"
 Requires-Dist: python-dotenv==1.2.4; extra == "frozen"
 Requires-Dist: python-json-logger==4.2.0; extra == "frozen"
 Requires-Dist: python-multipart==0.0.32; extra == "frozen"
-Requires-Dist: python-slugify==9.1.2; extra == "frozen"
+Requires-Dist: python-slugify==9.1.3; extra == "frozen"
 Requires-Dist: pytz==2026.5; extra == "frozen"
 Requires-Dist: pyzmq==27.2.0; extra == "frozen"
 Requires-Dist: redis==6.4.0; extra == "frozen"
@@ -305,7 +303,7 @@ Requires-Dist: rfc3986-validator==0.1.1; extra == "frozen"
 Requires-Dist: rfc3987-syntax==1.1.0; extra == "frozen"
 Requires-Dist: rich==15.0.0; extra == "frozen"
 Requires-Dist: rich-argparse==1.8.0; extra == "frozen"
-Requires-Dist: rich-toolkit==0.20.5; extra == "frozen"
+Requires-Dist: rich-toolkit==0.20.6; extra == "frozen"
 Requires-Dist: rpds-py==2026.9.1; extra == "frozen"
 Requires-Dist: s3transfer==0.19.2; extra == "frozen"
 Requires-Dist: scikit-image==0.25.2; extra == "frozen"
@@ -337,7 +335,7 @@ Requires-Dist: tinycss2==1.5.1; extra == "frozen"
 Requires-Dist: tornado==6.5.10; extra == "frozen"
 Requires-Dist: tqdm==4.70.1; extra == "frozen"
 Requires-Dist: traitlets==5.16.1; extra == "frozen"
-Requires-Dist: typer==0.27.2; extra == "frozen"
+Requires-Dist: typer==0.27.3; extra == "frozen"
 Requires-Dist: typing-inspection==0.4.4; extra == "frozen"
 Requires-Dist: typing_extensions==4.16.0; extra == "frozen"
 Requires-Dist: tzdata==2026.5; extra == "frozen"
@@ -380,6 +378,8 @@ in their own package facilitates using the build_utils to test the integrity of
 Environment Variables
 ---------------------
 
+.. dkist-env-table: start
+
 .. list-table::
    :widths: 10 90
    :header-rows: 1
@@ -471,6 +471,21 @@ Environment Variables
    * - FTS_ATLAS_DATA_DIR
      - annotation=Union[str, NoneType] required=False default=None description='Common cached directory for a downloaded FTS Atlas.'
 
+.. dkist-env-table: end
+
+Maintaining the generated table
+###############################
+
+The hook's additional dependencies are intentionally unpinned to avoid duplicating
+versions maintained in ``pyproject.toml``. Consequently, the generated table may
+temporarily reflect a newer published parent configuration than the version pinned
+by this project.
+
+When developing against an upstream release candidate that changes configuration
+fields, temporarily pin the relevant hook dependency in
+``.pre-commit-config.yaml`` to that RC. Remove the temporary pin after the final
+upstream release is available.
+
 Development
 -----------
 .. code-block:: bash

{dkist_processing_cryonirsp-2.1.4 → dkist_processing_cryonirsp-3.0.0}/README.rst

@@ -15,6 +15,8 @@ in their own package facilitates using the build_utils to test the integrity of
 Environment Variables
 ---------------------
 
+.. dkist-env-table: start
+
 .. list-table::
    :widths: 10 90
    :header-rows: 1
@@ -106,6 +108,21 @@ Environment Variables
    * - FTS_ATLAS_DATA_DIR
      - annotation=Union[str, NoneType] required=False default=None description='Common cached directory for a downloaded FTS Atlas.'
 
+.. dkist-env-table: end
+
+Maintaining the generated table
+###############################
+
+The hook's additional dependencies are intentionally unpinned to avoid duplicating
+versions maintained in ``pyproject.toml``. Consequently, the generated table may
+temporarily reflect a newer published parent configuration than the version pinned
+by this project.
+
+When developing against an upstream release candidate that changes configuration
+fields, temporarily pin the relevant hook dependency in
+``.pre-commit-config.yaml`` to that RC. Remove the temporary pin after the final
+upstream release is available.
+
 Development
 -----------
 .. code-block:: bash

{dkist_processing_cryonirsp-2.1.4 → dkist_processing_cryonirsp-3.0.0}/SCIENCE_CHANGELOG.rst

@@ -1,3 +1,13 @@
+v3.0.0 (2026-10-08)
+===================
+
+
+
+
+- The task that computes the boundaries of the useful, illuminated regions of the INPUT data has been simplified and made more robust to data with very high
+  dynamic range. This improvement will most affect data taken at 1430nm, but will slightly change the final array shape for all data. (`#306 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/306>`__)
+
+
 v2.0.0 (2026-07-17)
 ===================
 

{dkist_processing_cryonirsp-2.1.4 → dkist_processing_cryonirsp-3.0.0}/dkist_processing_cryonirsp/codecs/fits.py

@@ -6,13 +6,13 @@ import numpy as np
 from dkist_processing_common.codecs.fits import fits_access_decoder as common_fits_access_decoder
 from dkist_processing_common.models.fits_access import FitsAccessBase
 
-from dkist_processing_cryonirsp.models.beam_boundaries import BeamBoundary
+from dkist_processing_cryonirsp.models.beam_boundaries import BeamBoundaries
 
 
 def cryo_fits_access_decoder(
     path: Path,
     fits_access_class: FitsAccessBase = FitsAccessBase,
-    beam_boundary: BeamBoundary | None = None,
+    beam_boundary: BeamBoundaries | None = None,
     **fits_access_kwargs,
 ) -> FitsAccessBase:
     """
@@ -33,7 +33,7 @@ def cryo_fits_access_decoder(
 def cryo_fits_array_decoder(
     path: Path,
     fits_access_class: FitsAccessBase = FitsAccessBase,
-    beam_boundary: BeamBoundary | None = None,
+    beam_boundary: BeamBoundaries | None = None,
     auto_squeeze: bool = True,
     **fits_access_kwargs,
 ) -> np.array:

{dkist_processing_cryonirsp-2.1.4 → dkist_processing_cryonirsp-3.0.0}/dkist_processing_cryonirsp/models/beam_boundaries.py

@@ -6,33 +6,33 @@ import numpy as np
 
 
 @dataclass
-class BeamBoundary:
+class BeamBoundaries:
     """Simple dataclass to hold boundary information for the illuminated portion of the beam array."""
 
-    y_min: int
-    y_max: int
-    x_min: int
-    x_max: int
+    axis_0_min: int
+    axis_0_max: int
+    axis_1_min: int
+    axis_1_max: int
 
     @property
-    def y_slice(self):
-        """Return a slice object representing the illumination along the y-axis (numpy 0 axis)."""
-        return slice(self.y_min, self.y_max)
+    def axis_0_slice(self):
+        """Return a slice object representing the illumination along the 0th axis."""
+        return slice(self.axis_0_min, self.axis_0_max)
 
     @property
-    def x_slice(self):
-        """Return a slice object representing the illumination along the x-axis (numpy 1 axis)."""
-        return slice(self.x_min, self.x_max)
+    def axis_1_slice(self):
+        """Return a slice object representing the illumination along the 1st axis."""
+        return slice(self.axis_1_min, self.axis_1_max)
 
     @property
     def slices(self):
         """Return a tuple of slices in numpy order representing the illuminated portion of the beam array."""
-        return self.y_slice, self.x_slice
+        return self.axis_0_slice, self.axis_1_slice
 
     @property
     def beam_boundaries(self):
         """Return a tuple containing the beam boundaries."""
-        return self.y_min, self.y_max, self.x_min, self.x_max
+        return self.axis_0_min, self.axis_0_max, self.axis_1_min, self.axis_1_max
 
     @property
     def beam_boundaries_array(self):

{dkist_processing_cryonirsp-2.1.4 → dkist_processing_cryonirsp-3.0.0}/dkist_processing_cryonirsp/models/parameters.py

@@ -110,27 +110,39 @@ class CryonirspParameters(ParameterBase, ParameterWavelengthMixin, ParameterArmI
         return self._find_most_recent_past_value("cryonirsp_polcal_pac_fit_mode")
 
     @property
-    def beam_boundaries_smoothing_disk_size(self) -> int:
-        """Return the size of the smoothing disk (in pixels) to be used in the beam boundaries computation."""
-        return self._find_most_recent_past_value("cryonirsp_beam_boundaries_smoothing_disk_size")
-
-    @property
-    def beam_boundaries_upsample_factor(self) -> int:
-        """Return the upsample factor to be used in the beam boundaries cross correlation computation."""
-        return self._find_most_recent_past_value("cryonirsp_beam_boundaries_upsample_factor")
-
-    @property
-    def beam_boundaries_sp_beam_transition_region_size_fraction(self) -> float:
+    def beam_boundaries_spectral_beam_slices(self) -> list[slice]:
         """
-        Fraction of full spectral size to use as the size of the transition region between the two SP beams.
+        Return a list of `slice` objects that extract beams in the spectral dimension.
 
-        A region with size = (this parameter * full spectral size) and centered at the center of the spectral dimension
-        will be ignored when extracting the beams.
+        For CI the "spectral" dimension is just the same axis of the chip that is spectral in SP data.
         """
+        raw_boundaries = self._find_parameter_for_arm(
+            "cryonirsp_beam_boundaries_spectral_beam_slices"
+        )
+        return [slice(b[0], b[1]) for b in raw_boundaries]
+
+    @property
+    def beam_boundaries_normalization_percentile(self) -> float:
+        """Return the percentile (0, 100) used when collapsing the wavelength dimension into a single spatial profile."""
         return self._find_most_recent_past_value(
-            "cryonirsp_beam_boundaries_sp_beam_transition_region_size_fraction"
+            "cryonirsp_beam_boundaries_normalization_percentile"
         )
 
+    @property
+    def beam_boundaries_edge_profile_window_px(self) -> int:
+        """Return the size of the moving window used to compute an edge profile."""
+        return self._find_most_recent_past_value("cryonirsp_beam_boundaries_edge_profile_window_px")
+
+    @property
+    def beam_boundaries_edge_threshold_sigma(self) -> float:
+        """Return the threshold for determining if an illumination edge is strong enough to consider, in units of edge profile sigma."""
+        return self._find_most_recent_past_value("cryonirsp_beam_boundaries_edge_threshold_sigma")
+
+    @property
+    def beam_boundaries_detector_margin_px(self) -> int:
+        """Return the padding amount from the detector edge that sets a hard limit on the illumination regions."""
+        return self._find_most_recent_past_value("cryonirsp_beam_boundaries_detector_margin_px")
+
     @property
     def bad_pixel_map_median_filter_size(self) -> list[int, int]:
         """Return the smoothing disk size to be used in the bad pixel map computation."""