fix: update time param in aarescan calls for screening and raster
CI / lint (pull_request) Successful in 42s
CI / test (3.12) (pull_request) Successful in 1m2s
CI / test (3.13) (pull_request) Successful in 1m3s
CI / test (3.14) (pull_request) Successful in 1m4s
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m5s
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m12s
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 1m21s
CI / test-with-coverage (pull_request) Successful in 1m31s
CI / coverage-analysis (pull_request) Successful in 4s
CI / lint (push) Successful in 33s
Docs build and publish / docker (push) Successful in 15s
CI / test (3.12) (push) Canceled after 41s
CI / test (3.13) (push) Canceled after 39s
CI / test (3.14) (push) Canceled after 36s
CI / test-with-beamline-plugins (pxi_bec) (push) Canceled after 34s
CI / test-with-beamline-plugins (pxii_bec) (push) Canceled after 31s
CI / test-with-beamline-plugins (pxiii_bec) (push) Canceled after 29s
CI / test-with-coverage (push) Canceled after 26s
CI / coverage-analysis (push) Canceled after 0s
Build and Publish / release (push) Successful in 28s

This commit was merged in pull request #225.
This commit is contained in:
perl_d committed 2026-09-14 12:41:06 +02:00
1 parent d37c5712d5
commit 9b58d77e5b
5 files changed
+23 -23

No files matched your search

+1 -1
View File
@@ -421,7 +421,7 @@ class RasterService:
grid_elem_size_x_um=request.grid_size_mm.x * 1000,
grid_elem_count_x=request.n_x,
grid_elem_count_y=request.n_y,
time_sec=request.exp_time_s,
time_per_element_s=request.exp_time_s,
run_async=True,
)
self.ctx.deps.devs.aerotech.wait_till_done(
+1 -1
View File
@@ -45,7 +45,7 @@ class RotationService:
self.ctx.deps.devs.aerotech.screening_scan(
rotation_deg=request.incr_omega_deg,
wedge_deg=request.wedge_omega_deg,
time_sec=total_time,
time_per_element_s=request.exp_time_s,
steps=request.steps,
run_async=True,
)
+8 -8
View File
@@ -142,7 +142,7 @@ class AerotechController:
):
payload = RotationRequest(
rotation_deg=rotation_deg,
time_sec=time_sec,
total_time_sec=time_sec,
start_pos_deg=start_pos_deg,
run_async=run_async,
)
@@ -162,7 +162,7 @@ class AerotechController:
):
payload = RotationRequest(
rotation_deg=rotation_deg,
time_sec=time_sec,
total_time_sec=time_sec,
start_pos_deg=start_pos_deg,
run_async=run_async,
)
@@ -181,7 +181,7 @@ class AerotechController:
self,
grid_elem_count_y: int,
grid_elem_size_y_um: float,
time_sec: float,
time_per_element_s: float,
grid_elem_size_x_um: float,
grid_elem_count_x: int,
run_async: bool = False,
@@ -191,7 +191,7 @@ class AerotechController:
grid_elem_count_y=grid_elem_count_y,
grid_elem_size_x_um=grid_elem_size_x_um,
grid_elem_size_y_um=grid_elem_size_y_um,
time_sec=time_sec,
time_per_element_sec=time_per_element_s,
run_async=run_async,
)
logger.debug(f"Payload sent to AareScan for grid_scan execution: {payload}")
@@ -221,7 +221,7 @@ class AerotechController:
grid_elem_count_y=grid_elem_count_y,
grid_elem_size_x_um=grid_elem_size_x_um,
grid_elem_size_y_um=grid_elem_size_y_um,
time_sec=time_sec,
time_per_element_sec=time_sec,
run_async=run_async,
)
logger.debug(f"Payload sent to AareScan for grid_scan validation: {payload}")
@@ -241,14 +241,14 @@ class AerotechController:
self,
rotation_deg: float,
wedge_deg: float,
time_sec: float,
time_per_element_s: float,
steps: int,
run_async: bool = False,
):
payload = ScreenRequest(
rotation_deg=rotation_deg,
wedge_deg=wedge_deg,
time_sec=time_sec,
time_per_element_sec=time_per_element_s,
steps=steps,
run_async=run_async,
)
@@ -276,7 +276,7 @@ class AerotechController:
payload = ScreenRequest(
rotation_deg=rotation_deg,
wedge_deg=wedge_deg,
time_sec=time_sec,
time_per_element_sec=time_sec,
steps=steps,
run_async=run_async,
)