fix: update time param in aarescan calls for screening and raster

pyproject.toml

@@ -13,7 +13,7 @@ dependencies = [
     "pyJWT",
     "pyzmq",
     "opencv-python-headless",
-    "PySide6==6.9.0",
+    "PySide6",
     "requests",
     "pyepics~=3.5",
     "redis",
@@ -26,7 +26,7 @@ dependencies = [
     "psi-pshell==2.1.0",
     "bec_lib>=3.130.3",
     "bec-ipython-client>=3.130.3",
-    "aarescan-client>=1.0.0rc14",
+    "aarescan-client>=1.0.0rc15",
     "aarelcinfer-client==0.1.1a8",
     "matplotlib>=3.10.3",
     "httpx>=0.28.1",

src/aare/daq/operations/raster/service.py

@@ -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(

src/aare/daq/operations/rotation/service.py

@@ -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,
             )

src/aare/devices/aerotech.py

@@ -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,
         )