bec/ophyd_devices
1
0
Fork 0
Code Issues 9 Pull Requests 10 Actions Packages Projects Releases 126 Wiki Activity

fix: changes for sgalil grid scan from BEC

Browse Source
This commit is contained in:
appel_c 2023-09-06 07:59:12 +02:00
parent 58caf2ddd3
commit 3e594b5e04
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ophyd_devices/galil/sgalil_ophyd.py
View File

@ -249,7 +249,7 @@ class GalilController(Controller):
end_x: float, end_x: float,
interval_x: int, interval_x: int,
exp_time: float, exp_time: float,
readtime: float, readout_time: float,
**kwargs, **kwargs,
) -> tuple: ) -> tuple:
"""_summary_ """_summary_
@ -262,7 +262,7 @@ class GalilController(Controller):
end_x (float): end position of x axis (slow axis) end_x (float): end position of x axis (slow axis)
interval_x (int): number of points in x axis interval_x (int): number of points in x axis
exp_time (float): exposure time in seconds exp_time (float): exposure time in seconds
readtime (float): readout time in seconds, minimum of .5e-3s (0.5ms) readout_time (float): readout time in seconds, minimum of .5e-3s (0.5ms)
Raises: Raises:
@ -285,7 +285,9 @@ class GalilController(Controller):
start_y *= sign_y start_y *= sign_y
end_y *= sign_y end_y *= sign_y
speed = np.abs(end_y - start_y) / ((interval_y) * exp_time + (interval_y - 1) * readtime) speed = np.abs(end_y - start_y) / (
(interval_y) * exp_time + (interval_y - 1) * readout_time
)
if speed > 2.00 or speed < 0.02: if speed > 2.00 or speed < 0.02:
raise LimitError( raise LimitError(
f"Speed of {speed:.03f}mm/s is outside of acceptable range of 0.02 to 2 mm/s" f"Speed of {speed:.03f}mm/s is outside of acceptable range of 0.02 to 2 mm/s"
@ -677,6 +679,22 @@ class SGalilMotor(Device, PositionerBase):
self.controller.stop_all_axes() self.controller.stop_all_axes()
return super().stop(success=success) return super().stop(success=success)
def kickoff(
self,
metadata: dict,
**kwargs,
) -> None:
self.controller.fly_grid_scan(
kwargs.get("start_y"),
kwargs.get("end_y"),
kwargs.get("interval_y"),
kwargs.get("start_x"),
kwargs.get("end_x"),
kwargs.get("interval_x"),
kwargs.get("exp_time"),
kwargs.get("readout_time"),
)
if __name__ == "__main__": if __name__ == "__main__":
mock = False mock = False