diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py index 33a4164f..f41cadad 100644 --- a/src/aare/daq/daq.py +++ b/src/aare/daq/daq.py @@ -1394,7 +1394,7 @@ class AareDAQ: if request.screening: if request.wedge_omega_deg is None: raise ValueError("Must supply a wedge angle for screening requests") - self._devs.aerotech.screening_scan_validation( + self._devs.aerotech.validate_screening_scan( rotation_deg=request.incr_omega_deg, wedge_deg=request.wedge_omega_deg, time_sec=total_time, diff --git a/src/aare/devices/aerotech.py b/src/aare/devices/aerotech.py index 10d1d402..45da1694 100644 --- a/src/aare/devices/aerotech.py +++ b/src/aare/devices/aerotech.py @@ -256,8 +256,8 @@ 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, + grid_elem_size_x_um: float, + grid_elem_count_x: int, run_async: bool | None = False, ): payload = GridRequest( @@ -309,7 +309,7 @@ class AerotechController: operation="POST", ) from e - def screening_scan_validation( + def validate_screening_scan( self, rotation_deg: float, wedge_deg: float,