dkist-processing-visp 5.7.22__tar.gz → 5.7.23__tar.gz

dkist_processing_visp-5.7.23/.snyk

@@ -0,0 +1,7 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities
+# https://docs.snyk.io/manage-risk/policies/the-.snyk-file#syntax-of-the-.snyk-file
+ignore:
+  SNYK-PYTHON-APACHEAIRFLOWCORE-17879182:
+    - "*" :
+        reason: 'Patched in Airflow 3.3.0, but we are not ready to upgrade till 3.3.1 or later'
+        expires: '2027-07-07T00:00:00.000Z'

{dkist_processing_visp-5.7.22 → dkist_processing_visp-5.7.23}/CHANGELOG.rst

@@ -1,3 +1,16 @@
+v5.7.23 (2026-07-07)
+====================
+
+Bugfixes
+--------
+
+- Added tolerance to ``ReflectedLightAngleBud`` to handle small arm position differences between frames.
+  Previously, any variation in ``VSPARMPS`` across frames would cause pipeline parsing to fail with a ``ValueError``.
+  Now, ``ReflectedLightAngleBud`` subclasses ``TaskNearFloatBud`` and accepts a configurable tolerance via ``visp_reflected_light_angle_tolerance_deg``.
+  If the spread between the minimum and maximum ``REFLECTED_LIGHT_ANGLE_DEG`` values is within tolerance, the mean value is used.
+  If the spread exceeds the tolerance, a ``ValueError`` is still raised to flag genuine hardware problems. (`#327 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/327>`__)
+
+
 v5.7.22 (2026-06-22)
 ====================
 

{dkist_processing_visp-5.7.22 → dkist_processing_visp-5.7.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-visp
-Version: 5.7.22
+Version: 5.7.23
 Summary: Science processing code for the ViSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -79,28 +79,28 @@ Requires-Dist: SQLAlchemy==2.0.51; extra == "frozen"
 Requires-Dist: Send2Trash==2.1.0; extra == "frozen"
 Requires-Dist: a2wsgi==1.10.10; extra == "frozen"
 Requires-Dist: aioftp==0.27.2; extra == "frozen"
-Requires-Dist: aiohappyeyeballs==2.6.2; extra == "frozen"
+Requires-Dist: aiohappyeyeballs==2.7.1; extra == "frozen"
 Requires-Dist: aiohttp==3.14.1; extra == "frozen"
 Requires-Dist: aiosignal==1.4.0; extra == "frozen"
 Requires-Dist: aiosmtplib==5.1.2; extra == "frozen"
 Requires-Dist: aiosqlite==0.21.0; extra == "frozen"
-Requires-Dist: alembic==1.18.4; extra == "frozen"
+Requires-Dist: alembic==1.18.5; extra == "frozen"
 Requires-Dist: amqp==5.3.1; extra == "frozen"
 Requires-Dist: annotated-doc==0.0.4; extra == "frozen"
 Requires-Dist: annotated-types==0.7.0; extra == "frozen"
-Requires-Dist: anyio==4.14.0; extra == "frozen"
+Requires-Dist: anyio==4.14.1; extra == "frozen"
 Requires-Dist: apache-airflow==3.2.1; extra == "frozen"
 Requires-Dist: apache-airflow-core==3.2.1; extra == "frozen"
-Requires-Dist: apache-airflow-providers-celery==3.20.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-celery==3.21.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-common-compat==1.15.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-io==1.7.3; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-io==1.8.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-common-sql==2.0.1; extra == "frozen"
-Requires-Dist: apache-airflow-providers-postgres==6.7.1; extra == "frozen"
+Requires-Dist: apache-airflow-providers-postgres==6.8.0; extra == "frozen"
 Requires-Dist: apache-airflow-providers-smtp==3.0.1; extra == "frozen"
-Requires-Dist: apache-airflow-providers-standard==1.14.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-standard==1.15.0; extra == "frozen"
 Requires-Dist: apache-airflow-task-sdk==1.2.1; extra == "frozen"
 Requires-Dist: appnope==0.1.4; extra == "frozen"
-Requires-Dist: argcomplete==3.6.3; extra == "frozen"
+Requires-Dist: argcomplete==3.7.0; extra == "frozen"
 Requires-Dist: argon2-cffi==25.1.0; extra == "frozen"
 Requires-Dist: argon2-cffi-bindings==25.1.0; extra == "frozen"
 Requires-Dist: arrow==1.4.0; extra == "frozen"
@@ -109,7 +109,7 @@ Requires-Dist: asdf_standard==1.5.0; extra == "frozen"
 Requires-Dist: asgiref==3.11.1; extra == "frozen"
 Requires-Dist: asteval==1.0.9; extra == "frozen"
 Requires-Dist: astropy==7.0.2; extra == "frozen"
-Requires-Dist: astropy-iers-data==0.2026.6.22.1.23.34; extra == "frozen"
+Requires-Dist: astropy-iers-data==0.2026.7.6.1.1.20; extra == "frozen"
 Requires-Dist: asttokens==3.0.1; extra == "frozen"
 Requires-Dist: async-lru==2.3.0; extra == "frozen"
 Requires-Dist: asyncpg==0.31.0; extra == "frozen"
@@ -118,14 +118,14 @@ Requires-Dist: babel==2.18.0; extra == "frozen"
 Requires-Dist: beautifulsoup4==4.15.0; extra == "frozen"
 Requires-Dist: billiard==4.2.4; extra == "frozen"
 Requires-Dist: bleach==6.4.0; extra == "frozen"
-Requires-Dist: boto3==1.43.34; extra == "frozen"
-Requires-Dist: botocore==1.43.34; extra == "frozen"
+Requires-Dist: boto3==1.43.41; extra == "frozen"
+Requires-Dist: botocore==1.43.41; extra == "frozen"
 Requires-Dist: cadwyn==7.1.0; extra == "frozen"
 Requires-Dist: celery==5.6.3; extra == "frozen"
 Requires-Dist: certifi==2026.6.17; extra == "frozen"
-Requires-Dist: cffi==2.0.0; extra == "frozen"
-Requires-Dist: charset-normalizer==3.4.7; extra == "frozen"
-Requires-Dist: click==8.4.1; extra == "frozen"
+Requires-Dist: cffi==2.1.0; extra == "frozen"
+Requires-Dist: charset-normalizer==3.4.9; extra == "frozen"
+Requires-Dist: click==8.4.2; 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"
@@ -133,7 +133,7 @@ Requires-Dist: colorlog==6.10.1; extra == "frozen"
 Requires-Dist: comm==0.2.3; extra == "frozen"
 Requires-Dist: contourpy==1.3.3; extra == "frozen"
 Requires-Dist: cron_descriptor==2.1.0; extra == "frozen"
-Requires-Dist: croniter==6.2.2; extra == "frozen"
+Requires-Dist: croniter==6.2.3; extra == "frozen"
 Requires-Dist: cryptography==49.0.0; extra == "frozen"
 Requires-Dist: cycler==0.12.1; extra == "frozen"
 Requires-Dist: debugpy==1.8.21; extra == "frozen"
@@ -145,15 +145,15 @@ Requires-Dist: dkist-processing-common==14.3.4; extra == "frozen"
 Requires-Dist: dkist-processing-core==7.3.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-processing-visp==5.7.22; extra == "frozen"
+Requires-Dist: dkist-processing-visp==5.7.23; 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.28.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"
-Requires-Dist: fastapi==0.138.0; extra == "frozen"
-Requires-Dist: fastapi-cli==0.0.27; extra == "frozen"
+Requires-Dist: fastapi==0.139.0; extra == "frozen"
+Requires-Dist: fastapi-cli==0.0.28; extra == "frozen"
 Requires-Dist: fastjsonschema==2.21.2; extra == "frozen"
 Requires-Dist: flower==2.0.1; extra == "frozen"
 Requires-Dist: fonttools==4.63.0; extra == "frozen"
@@ -164,18 +164,18 @@ Requires-Dist: globus-sdk==4.8.1; extra == "frozen"
 Requires-Dist: googleapis-common-protos==1.75.0; extra == "frozen"
 Requires-Dist: gqlclient==2.0.0; extra == "frozen"
 Requires-Dist: greenback==1.3.0; extra == "frozen"
-Requires-Dist: greenlet==3.5.2; extra == "frozen"
-Requires-Dist: grpcio==1.81.1; extra == "frozen"
+Requires-Dist: greenlet==3.5.3; extra == "frozen"
+Requires-Dist: grpcio==1.82.0; extra == "frozen"
 Requires-Dist: h11==0.16.0; extra == "frozen"
 Requires-Dist: httpcore==1.0.9; extra == "frozen"
 Requires-Dist: httptools==0.8.0; extra == "frozen"
 Requires-Dist: httpx==0.28.1; extra == "frozen"
-Requires-Dist: humanize==4.15.0; extra == "frozen"
+Requires-Dist: humanize==4.16.0; extra == "frozen"
 Requires-Dist: idna==3.18; extra == "frozen"
 Requires-Dist: imageio-ffmpeg==0.6.0; extra == "frozen"
 Requires-Dist: importlib_metadata==9.0.0; extra == "frozen"
 Requires-Dist: ipykernel==7.3.0; extra == "frozen"
-Requires-Dist: ipython==9.14.1; extra == "frozen"
+Requires-Dist: ipython==9.15.0; extra == "frozen"
 Requires-Dist: ipython_pygments_lexers==1.1.1; extra == "frozen"
 Requires-Dist: isoduration==20.11.0; extra == "frozen"
 Requires-Dist: itsdangerous==2.2.0; extra == "frozen"
@@ -193,7 +193,7 @@ Requires-Dist: jupyter_client==8.9.1; extra == "frozen"
 Requires-Dist: jupyter_core==5.9.1; extra == "frozen"
 Requires-Dist: jupyter_server==2.20.0; extra == "frozen"
 Requires-Dist: jupyter_server_terminals==0.5.4; extra == "frozen"
-Requires-Dist: jupyterlab==4.6.0; extra == "frozen"
+Requires-Dist: jupyterlab==4.6.1; extra == "frozen"
 Requires-Dist: jupyterlab_pygments==0.3.0; extra == "frozen"
 Requires-Dist: jupyterlab_server==2.28.0; extra == "frozen"
 Requires-Dist: kiwisolver==1.5.0; extra == "frozen"
@@ -211,7 +211,7 @@ Requires-Dist: matplotlib==3.11.0; extra == "frozen"
 Requires-Dist: matplotlib-inline==0.2.2; extra == "frozen"
 Requires-Dist: mdurl==0.1.2; extra == "frozen"
 Requires-Dist: methodtools==0.4.7; extra == "frozen"
-Requires-Dist: mistune==3.3.1; extra == "frozen"
+Requires-Dist: mistune==3.3.2; extra == "frozen"
 Requires-Dist: more-itertools==11.1.0; extra == "frozen"
 Requires-Dist: moviepy==2.1.2; extra == "frozen"
 Requires-Dist: msgspec==0.21.1; extra == "frozen"
@@ -226,30 +226,30 @@ Requires-Dist: notebook==7.6.0; extra == "frozen"
 Requires-Dist: notebook_shim==0.2.4; extra == "frozen"
 Requires-Dist: numpy==2.2.5; extra == "frozen"
 Requires-Dist: object-clerk==1.0.0; extra == "frozen"
-Requires-Dist: opentelemetry-api==1.42.1; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp==1.42.1; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.42.1; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.42.1; extra == "frozen"
-Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.42.1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-aiohttp-client==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-asgi==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-botocore==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-celery==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-dbapi==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-fastapi==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-pika==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-psycopg2==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-pymongo==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-redis==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-requests==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-sqlalchemy==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-instrumentation-system-metrics==0.63b1; extra == "frozen"
+Requires-Dist: opentelemetry-api==1.43.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp==1.43.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.43.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.43.0; extra == "frozen"
+Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.43.0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-aiohttp-client==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-asgi==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-botocore==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-celery==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-dbapi==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-fastapi==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-pika==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-psycopg2==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-pymongo==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-redis==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-requests==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-sqlalchemy==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-instrumentation-system-metrics==0.64b0; extra == "frozen"
 Requires-Dist: opentelemetry-propagator-aws-xray==1.0.2; extra == "frozen"
-Requires-Dist: opentelemetry-proto==1.42.1; extra == "frozen"
-Requires-Dist: opentelemetry-sdk==1.42.1; extra == "frozen"
-Requires-Dist: opentelemetry-semantic-conventions==0.63b1; extra == "frozen"
-Requires-Dist: opentelemetry-util-http==0.63b1; extra == "frozen"
+Requires-Dist: opentelemetry-proto==1.43.0; extra == "frozen"
+Requires-Dist: opentelemetry-sdk==1.43.0; extra == "frozen"
+Requires-Dist: opentelemetry-semantic-conventions==0.64b0; extra == "frozen"
+Requires-Dist: opentelemetry-util-http==0.64b0; extra == "frozen"
 Requires-Dist: outcome==1.3.0.post0; extra == "frozen"
 Requires-Dist: packaging==26.2; extra == "frozen"
 Requires-Dist: pandas==3.0.3; extra == "frozen"
@@ -270,7 +270,7 @@ Requires-Dist: proglog==0.1.12; extra == "frozen"
 Requires-Dist: prometheus_client==0.25.0; extra == "frozen"
 Requires-Dist: prompt_toolkit==3.0.52; extra == "frozen"
 Requires-Dist: propcache==0.5.2; extra == "frozen"
-Requires-Dist: protobuf==6.33.6; extra == "frozen"
+Requires-Dist: protobuf==7.35.1; extra == "frozen"
 Requires-Dist: psutil==7.2.2; extra == "frozen"
 Requires-Dist: psycopg2-binary==2.9.12; extra == "frozen"
 Requires-Dist: ptyprocess==0.7.0; extra == "frozen"
@@ -300,7 +300,7 @@ 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.1; extra == "frozen"
-Requires-Dist: rpds-py==2026.5.1; extra == "frozen"
+Requires-Dist: rpds-py==2026.6.3; extra == "frozen"
 Requires-Dist: s3transfer==0.19.0; extra == "frozen"
 Requires-Dist: scikit-image==0.25.2; extra == "frozen"
 Requires-Dist: scikit-learn==1.6.1; extra == "frozen"
@@ -329,25 +329,25 @@ Requires-Dist: threadpoolctl==3.6.0; extra == "frozen"
 Requires-Dist: tifffile==2026.6.1; extra == "frozen"
 Requires-Dist: tinycss2==1.5.1; extra == "frozen"
 Requires-Dist: tornado==6.5.7; extra == "frozen"
-Requires-Dist: tqdm==4.68.3; extra == "frozen"
+Requires-Dist: tqdm==4.68.4; extra == "frozen"
 Requires-Dist: traitlets==5.15.1; extra == "frozen"
-Requires-Dist: typer==0.26.7; extra == "frozen"
+Requires-Dist: typer==0.26.8; extra == "frozen"
 Requires-Dist: typing-inspection==0.4.2; extra == "frozen"
-Requires-Dist: typing_extensions==4.15.0; extra == "frozen"
+Requires-Dist: typing_extensions==4.16.0; extra == "frozen"
 Requires-Dist: tzdata==2026.2; extra == "frozen"
-Requires-Dist: tzlocal==5.4.3; extra == "frozen"
+Requires-Dist: tzlocal==5.4.4; extra == "frozen"
 Requires-Dist: uc-micro-py==2.0.0; extra == "frozen"
 Requires-Dist: uncertainties==3.2.3; extra == "frozen"
 Requires-Dist: universal_pathlib==0.3.10; extra == "frozen"
 Requires-Dist: uri-template==1.3.0; extra == "frozen"
 Requires-Dist: urllib3==2.7.0; extra == "frozen"
 Requires-Dist: uuid6==2025.0.1; extra == "frozen"
-Requires-Dist: uvicorn==0.49.0; extra == "frozen"
+Requires-Dist: uvicorn==0.50.2; extra == "frozen"
 Requires-Dist: uvloop==0.22.1; extra == "frozen"
 Requires-Dist: vine==5.1.0; extra == "frozen"
 Requires-Dist: voluptuous==0.16.0; extra == "frozen"
 Requires-Dist: watchfiles==1.2.0; extra == "frozen"
-Requires-Dist: wcwidth==0.8.1; extra == "frozen"
+Requires-Dist: wcwidth==0.8.2; extra == "frozen"
 Requires-Dist: webcolors==25.10.0; extra == "frozen"
 Requires-Dist: webencodings==0.5.1; extra == "frozen"
 Requires-Dist: websocket-client==1.9.0; extra == "frozen"

{dkist_processing_visp-5.7.22 → dkist_processing_visp-5.7.23}/dkist_processing_visp/models/parameters.py

@@ -27,6 +27,13 @@ class VispParsingParameters(ParameterBase):
             "visp_max_cs_step_time_sec", start_date=datetime.now()
         )
 
+    @property
+    def reflected_light_angle_tolerance_deg(self) -> float:
+        """Max allowed variation in REFLECTED_LIGHT_ANGLE_DEG across frames before raising an error."""
+        return self._find_most_recent_past_value(
+            "visp_reflected_light_angle_tolerance_deg", start_date=datetime.now()
+        )
+
 
 class VispParameters(ParameterBase, ParameterWavelengthMixin, ParameterArmIdMixin):
     """Put all Visp parameters parsed from the input dataset document in a single property."""

{dkist_processing_visp-5.7.22 → dkist_processing_visp-5.7.23}/dkist_processing_visp/parsers/spectrograph_configuration.py

@@ -1,8 +1,10 @@
 """Buds for parsing the incident and reflected light angles of the ViSP spectrograph."""
 
-from dkist_processing_common.models.flower_pot import SetStem
+from statistics import mean
+
 from dkist_processing_common.models.flower_pot import SpilledDirt
 from dkist_processing_common.models.task_name import TaskName
+from dkist_processing_common.parsers.near_bud import TaskNearFloatBud
 from dkist_processing_common.parsers.task import parse_header_ip_task_with_gains
 from dkist_processing_common.parsers.unique_bud import TaskUniqueBud
 
@@ -56,42 +58,34 @@ class IncidentLightAngleBud(TaskUniqueBud):
         return convert_grating_angle_to_incident_light_angle(grating_angle)
 
 
-class ReflectedLightAngleBud(SetStem):
+class ReflectedLightAngleBud(TaskNearFloatBud):
     """Bud that combines the incident light angle and arm position header values to compute the reflected light angle."""
 
-    def __init__(self):
-        super().__init__(stem_name=VispBudName.reflected_light_angle_deg.value)
-        self.ip_task_types = [
-            task.casefold() for task in [TaskName.observe.value, TaskName.solar_gain.value]
-        ]
+    def __init__(self, tolerance_deg: float):
+        super().__init__(
+            constant_name=VispBudName.reflected_light_angle_deg.value,
+            metadata_key=VispMetadataKey.arm_position_deg,
+            ip_task_types=[TaskName.observe.value, TaskName.solar_gain.value],
+            tolerance=tolerance_deg,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
+        )
 
     def setter(self, fits_obj: VispL0FitsAccess) -> float | type[SpilledDirt]:
         """
         Compute the reflected light angle.
 
-        The reflected light angle is `-1 * fits_objs.grating_angle_deg + fits_obj.arm_position_deg`.
+        The reflected light angle is `-1 * fits_obj.grating_angle_deg + fits_obj.arm_position_deg`.
         """
-        task = parse_header_ip_task_with_gains(fits_obj)
+        task = self.parsing_function(fits_obj)
 
         if task.casefold() in self.ip_task_types:
             incident_light_angle = convert_grating_angle_to_incident_light_angle(
                 fits_obj.grating_angle_deg
             )
             arm_position = fits_obj.arm_position_deg
-            reflected_angle = (
-                convert_incident_light_angle_and_arm_position_to_reflected_light_angle(
-                    incident_light_angle=incident_light_angle,
-                    arm_position=arm_position,
-                )
+            return convert_incident_light_angle_and_arm_position_to_reflected_light_angle(
+                incident_light_angle=incident_light_angle,
+                arm_position=arm_position,
             )
-            return reflected_angle
 
         return SpilledDirt
-
-    def getter(self) -> float:
-        """Get the value for the reflected light angle and raise an error if it is not unique."""
-        if len(self.value_set) > 1:
-            raise ValueError(
-                f"Multiple {self.stem_name} values found for key. Values: {self.value_set}"
-            )
-        return self.value_set.pop()

{dkist_processing_visp-5.7.22 → dkist_processing_visp-5.7.23}/dkist_processing_visp/tasks/parse.py

@@ -96,7 +96,9 @@ class ParseL0VispInputData(ParseL0InputDataBase):
             NonDarkNonPolcalTaskReadoutExpTimesBud(),
             DarkReadoutExpTimePickyBud(),
             IncidentLightAngleBud(),
-            ReflectedLightAngleBud(),
+            ReflectedLightAngleBud(
+                tolerance_deg=self.parameters.reflected_light_angle_tolerance_deg
+            ),
             TaskUniqueBud(
                 constant_name=VispBudName.grating_constant_inverse_mm.value,
                 metadata_key=VispMetadataKey.grating_constant_inverse_mm,

{dkist_processing_visp-5.7.22 → dkist_processing_visp-5.7.23}/dkist_processing_visp/tests/conftest.py

@@ -184,6 +184,7 @@ class WavelengthParameter:
 
 @dataclass
 class VispInputDatasetParameterValues:
+    visp_reflected_light_angle_tolerance_deg: float = 0.03
     visp_max_cs_step_time_sec: float = 180.0
     visp_beam_border: int = 1000
     visp_background_on: bool = True

{dkist_processing_visp-5.7.22 → dkist_processing_visp-5.7.23}/dkist_processing_visp/tests/test_parse.py

@@ -1,3 +1,4 @@
+import re
 from datetime import datetime
 from datetime import timezone
 
@@ -7,6 +8,7 @@ from dkist_data_simulator.dataset import key_function
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common.models.tags import Tag
 
+from dkist_processing_visp.models.constants import VispBudName
 from dkist_processing_visp.models.parameters import VispParsingParameters
 from dkist_processing_visp.models.tags import VispTag
 from dkist_processing_visp.tasks.parse import ParseL0VispInputData
@@ -82,6 +84,11 @@ def num_modstates() -> int:
     return 2
 
 
+@pytest.fixture
+def reflected_light_angle_tolerance_param_value() -> float:
+    return 0.03
+
+
 def write_input_dark_frames_to_task(
     task,
     readout_exp_time: float,
@@ -222,7 +229,10 @@ def write_input_cal_frames_to_task(
 ):
     seq = CalibrationSequence()
 
-    def write_frames_to_task(task):
+    def write_frames_to_task(task, arm_position_offsets=None):
+        if arm_position_offsets is None:
+            arm_position_offsets = [0.0]
+
         for readout_exp_time in required_dark_readout_exp_times:
             write_input_dark_frames_to_task(
                 task=task,
@@ -239,17 +249,18 @@ def write_input_cal_frames_to_task(
             num_modstates=num_modstates,
             arm_id=testing_arm_id,
         )
-        write_input_solar_frames_to_task(
-            task=task,
-            readout_exp_time=solar_readout_exp_time,
-            exp_time=solar_exp_time,
-            num_modstates=num_modstates,
-            arm_id=testing_arm_id,
-            ip_start_time=testing_solar_ip_start_time,
-            grating_constant=testing_grating_constant,
-            grating_angle=testing_grating_angle,
-            arm_position=testing_arm_position,
-        )
+        for offset in arm_position_offsets:
+            write_input_solar_frames_to_task(
+                task=task,
+                readout_exp_time=solar_readout_exp_time,
+                exp_time=solar_exp_time,
+                num_modstates=num_modstates,
+                arm_id=testing_arm_id,
+                ip_start_time=testing_solar_ip_start_time,
+                grating_constant=testing_grating_constant,
+                grating_angle=testing_grating_angle,
+                arm_position=testing_arm_position + offset,
+            )
         # Create a fake set of calibration sequence frames
         write_calibration_sequence_frames_to_task(
             task=task,
@@ -273,7 +284,12 @@ def write_input_cal_frames_to_task(
 
 
 @pytest.fixture
-def parse_task_with_no_data(tmp_path, recipe_run_id, assign_input_dataset_doc_to_task):
+def parse_task_with_no_data(
+    tmp_path,
+    recipe_run_id,
+    assign_input_dataset_doc_to_task,
+    reflected_light_angle_tolerance_param_value,
+):
     """You've got to populate the data in the actual test."""
     with ParseL0VispInputData(
         recipe_run_id=recipe_run_id,
@@ -286,7 +302,11 @@ def parse_task_with_no_data(tmp_path, recipe_run_id, assign_input_dataset_doc_to
             )
             assign_input_dataset_doc_to_task(
                 task,
-                VispInputDatasetParameterValues(),
+                VispInputDatasetParameterValues(
+                    visp_reflected_light_angle_tolerance_deg=(
+                        reflected_light_angle_tolerance_param_value
+                    )
+                ),
                 parameter_class=VispParsingParameters,
                 obs_ip_start_time=None,
             )
@@ -368,6 +388,13 @@ def test_parse_visp_input_data(
             ) == len(observe_exp_times)
 
 
+@pytest.mark.parametrize(
+    "arm_position_offset_multipliers, expected_reflected_offset_multiplier",
+    [
+        pytest.param([0.0], 0.0, id="single_arm_position"),
+        pytest.param([0.0, 0.9], 0.45, id="two_arm_positions_within_tolerance"),
+    ],
+)
 def test_parse_visp_input_data_constants(
     parse_task_with_no_data,
     write_input_cal_frames_to_task,
@@ -389,6 +416,9 @@ def test_parse_visp_input_data_constants(
     testing_grating_constant,
     testing_grating_angle,
     testing_arm_position,
+    reflected_light_angle_tolerance_param_value,
+    arm_position_offset_multipliers,
+    expected_reflected_offset_multiplier,
 ):
     """
     Given: A ParseVispInputData task
@@ -399,24 +429,32 @@ def test_parse_visp_input_data_constants(
         "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     task = parse_task_with_no_data
-    write_input_cal_frames_to_task(task)
+    arm_position_offsets = [
+        multiplier * reflected_light_angle_tolerance_param_value
+        for multiplier in arm_position_offset_multipliers
+    ]
+    expected_reflected_offset = (
+        expected_reflected_offset_multiplier * reflected_light_angle_tolerance_param_value
+    )
+    write_input_cal_frames_to_task(task, arm_position_offsets=arm_position_offsets)
 
     num_maps_per_readout_exp_time = 1
     num_steps = 3
-    for obs_readout_exp_time, obs_exp_time in zip(observe_readout_exp_times, observe_exp_times):
-        write_input_observe_frames_to_task(
-            task,
-            num_maps=num_maps_per_readout_exp_time,
-            num_modstates=num_modstates,
-            num_steps=num_steps,
-            readout_exp_time=obs_readout_exp_time,
-            exp_time=obs_exp_time,
-            arm_id=testing_arm_id,
-            ip_start_time=testing_obs_ip_start_time,
-            grating_constant=testing_grating_constant,
-            grating_angle=testing_grating_angle,
-            arm_position=testing_arm_position,
-        )
+    for offset in arm_position_offsets:
+        for obs_readout_exp_time, obs_exp_time in zip(observe_readout_exp_times, observe_exp_times):
+            write_input_observe_frames_to_task(
+                task,
+                num_maps=num_maps_per_readout_exp_time,
+                num_modstates=num_modstates,
+                num_steps=num_steps,
+                readout_exp_time=obs_readout_exp_time,
+                exp_time=obs_exp_time,
+                arm_id=testing_arm_id,
+                ip_start_time=testing_obs_ip_start_time,
+                grating_constant=testing_grating_constant,
+                grating_angle=testing_grating_angle,
+                arm_position=testing_arm_position + offset,
+            )
 
     # When
     task()
@@ -430,14 +468,14 @@ def test_parse_visp_input_data_constants(
     assert task.constants._db_dict["INCIDENT_LIGHT_ANGLE_DEG"] == -1 * testing_grating_angle
     assert (
         task.constants._db_dict["REFLECTED_LIGHT_ANGLE_DEG"]
-        == -1 * testing_grating_angle + testing_arm_position
+        == -1 * testing_grating_angle + testing_arm_position + expected_reflected_offset
     )
     assert task.constants._db_dict["GRATING_CONSTANT_INVERSE_MM"] == testing_grating_constant
     assert task.constants._db_dict["SOLAR_GAIN_IP_START_TIME"] == testing_solar_ip_start_time
     assert task.constants._db_dict["NUM_MODSTATES"] == num_modstates
     assert task.constants._db_dict["NUM_MAP_SCANS"] == num_maps_per_readout_exp_time * len(
         observe_readout_exp_times
-    )
+    ) * len(arm_position_offsets)
     assert task.constants._db_dict["NUM_RASTER_STEPS"] == num_steps
     assert task.constants._db_dict["WAVELENGTH"] == 656.28
     assert task.constants._db_dict["DARK_EXPOSURE_TIMES"] == [dark_exp_time]
@@ -466,6 +504,60 @@ def test_parse_visp_input_data_constants(
     )
 
 
+def test_reflected_light_angle_exceeds_tolerance_raises_error(
+    parse_task_with_no_data,
+    write_input_cal_frames_to_task,
+    observe_readout_exp_times,
+    observe_exp_times,
+    num_modstates,
+    mocker,
+    fake_gql_client,
+    testing_arm_id,
+    testing_obs_ip_start_time,
+    testing_grating_constant,
+    testing_grating_angle,
+    testing_arm_position,
+    reflected_light_angle_tolerance_param_value,
+):
+    """
+    Given: A ParseVispInputData task with observe frames whose arm positions differ by more than the tolerance
+    When: Calling the task instance
+    Then: A ValueError is raised
+    """
+    mocker.patch(
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
+    )
+    task = parse_task_with_no_data
+    write_input_cal_frames_to_task(task)
+
+    for arm_position in [
+        testing_arm_position,
+        testing_arm_position + reflected_light_angle_tolerance_param_value * 2,
+    ]:
+        for obs_readout_exp_time, obs_exp_time in zip(observe_readout_exp_times, observe_exp_times):
+            write_input_observe_frames_to_task(
+                task,
+                num_maps=1,
+                num_modstates=num_modstates,
+                num_steps=3,
+                readout_exp_time=obs_readout_exp_time,
+                exp_time=obs_exp_time,
+                arm_id=testing_arm_id,
+                ip_start_time=testing_obs_ip_start_time,
+                grating_constant=testing_grating_constant,
+                grating_angle=testing_grating_angle,
+                arm_position=arm_position,
+            )
+
+    with pytest.raises(
+        ValueError,
+        match=re.escape(
+            f"{VispBudName.reflected_light_angle_deg.value} values are not close enough"
+        ),
+    ):
+        task()
+
+
 def test_parse_visp_values(
     parse_task_with_no_data,
     write_input_cal_frames_to_task,