From f426a843bfdf58012d58583f419f10069422fe2a Mon Sep 17 00:00:00 2001 From: David Perl Date: Wed, 9 Sep 2026 15:01:14 +0200 Subject: [PATCH] fix: validate screening instead of running it --- src/aare/devices/aerotech.py | 44 ++++-------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/src/aare/devices/aerotech.py b/src/aare/devices/aerotech.py index 45da1694..d594965e 100644 --- a/src/aare/devices/aerotech.py +++ b/src/aare/devices/aerotech.py @@ -95,42 +95,6 @@ class AerotechController: ) def status(self) -> Status: - if self._simulated: - return Status( - state=Status.State.IDLE, - x=AxisStatus( - pos=self._pos.x, - vel=self._vel, - enabled=False, - homed=False, - moving=False, - fault=False, - ), - y=AxisStatus( - pos=self._pos.y, - vel=self._vel, - enabled=False, - homed=False, - moving=False, - fault=False, - ), - z=AxisStatus( - pos=self._pos.z, - vel=self._vel, - enabled=False, - homed=False, - moving=False, - fault=False, - ), - u=AxisStatus( - pos=self._pos.u, - vel=self._vel, - enabled=False, - homed=False, - moving=False, - fault=False, - ), - ) try: return self._api.status_get() except Exception as e: @@ -226,9 +190,9 @@ class AerotechController: grid_elem_count_y: int, grid_elem_size_y_um: float, time_sec: float, - grid_elem_size_x_um: float | None = None, - grid_elem_count_x: int | None = None, - run_async: bool | None = False, + grid_elem_size_x_um: float, + grid_elem_count_x: int, + run_async: bool = False, ): payload = GridRequest( grid_elem_count_x=grid_elem_count_x, @@ -328,7 +292,7 @@ class AerotechController: logger.info( f"sending screening scan request to aarescan for validation with payload {payload}" ) - return self._api.screening_post(payload) + return self._api.validate_screening_post(payload) except Exception as e: raise AerotechCommunicationError( f"Aerotech screening validation failed: {e}",