mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests 2 Actions Packages Projects Releases 64 Wiki Activity

fix: validate screening instead of running it
CI / lint (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
CI / lint (pull_request) Failing after 38s
Details
CI / test (3.12) (pull_request) Successful in 1m3s
Details
CI / test (3.13) (pull_request) Successful in 1m6s
Details
CI / test (3.14) (pull_request) Successful in 1m8s
Details
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m12s
Details
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m14s
Details
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 1m24s
Details
CI / test-with-coverage (pull_request) Successful in 1m35s
Details
CI / coverage-analysis (pull_request) Canceled after 0s
Details

Browse Source
This commit is contained in:
David Perl
2026-09-09 15:01:14 +02:00
parent 0dbbf03144
commit f426a843bf
1 changed files with 4 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aare/devices/aerotech.py
+4 -40
View File
@@ -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}",