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

refactor: small adjustments to fly scans

Browse Source
This commit is contained in:
e21206 2023-08-14 16:54:07 +02:00
parent 5d9fb98330
commit 04b4bd509c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ophyd_devices/galil/sgalil_ophyd.py
View File

@ -264,21 +264,24 @@ class GalilController(Controller):
LimitError: Raised if the speed is above 2mm/s or below 0.02mm/s LimitError: Raised if the speed is above 2mm/s or below 0.02mm/s
""" """
# TODO add offset to start and end positions for acceleration #Check limits
# TODO check sign of stage, or not necessary
check_values = [start_y, end_y, start_x, end_x] check_values = [start_y, end_y, start_x, end_x]
for val in check_values: for val in check_values:
self.check_value(val) self.check_value(val)
speed = np.abs(end_y - start_y) / ( speed = np.abs(end_y - start_y) / (
(interval_y - 1) * exp_time + ((interval_y - 1) - 1) * readtime interval_y * exp_time + (interval_y - 1) * readtime
) )
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"
) )
gridmax = int(interval_x - 1) gridmax = int(interval_x - 1)
step_grid = (end_x - start_x) / interval_x step_grid = (end_x - start_x) / interval_x
n_samples = int(interval_y * interval_x) n_samples = int(interval_y * interval_x)
# TODO check sign of stage for proper socket command.
self.socket_put_and_receive(f"a_start={start_y:.04f};a_end={end_y:.04f};speed={speed:.04f}") self.socket_put_and_receive(f"a_start={start_y:.04f};a_end={end_y:.04f};speed={speed:.04f}")
self.socket_put_and_receive( self.socket_put_and_receive(
f"b_start={start_x:.04f};gridmax={gridmax:d};b_step={step_grid:.04f}" f"b_start={start_x:.04f};gridmax={gridmax:d};b_step={step_grid:.04f}"