From 7be2f9af796ac632a83bb5e54f89109a0b9bde3a Mon Sep 17 00:00:00 2001 From: Klaus Wakonig Date: Mon, 31 Oct 2022 13:28:27 +0100 Subject: [PATCH] added lsamx/lsamy from config --- ophyd_devices/rt_lamni/rt_lamni_ophyd.py | 14 +++++++++++--- ophyd_devices/sim/sim.py | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ophyd_devices/rt_lamni/rt_lamni_ophyd.py b/ophyd_devices/rt_lamni/rt_lamni_ophyd.py index 53cbf92..0ef2c3b 100644 --- a/ophyd_devices/rt_lamni/rt_lamni_ophyd.py +++ b/ophyd_devices/rt_lamni/rt_lamni_ophyd.py @@ -450,9 +450,17 @@ class RtLamniController(Controller): ) time.sleep(0.03) - # needs to be changed to configurable center psoition - self.get_device_manager().devices.lsamx.obj.move(8.866, wait=True) - self.get_device_manager().devices.lsamy.obj.move(10.18, wait=True) + + lsamx_user_params = self.get_device_manager().devices.lsamx.user_parameter + if lsamx_user_params is None or lsamx_user_params.get("center") is None: + raise RuntimeError("lsamx center is not defined") + lsamy_user_params = self.get_device_manager().devices.lsamy.user_parameter + if lsamy_user_params is None or lsamy_user_params.get("center") is None: + raise RuntimeError("lsamy center is not defined") + lsamx_center = lsamx_user_params.get("center") + lsamy_center = lsamy_user_params.get("center") + self.get_device_manager().devices.lsamx.obj.move(lsamx_center, wait=True) + self.get_device_manager().devices.lsamy.obj.move(lsamy_center, wait=True) self.socket_put("J1") _waitforfeedbackctr = 0 diff --git a/ophyd_devices/sim/sim.py b/ophyd_devices/sim/sim.py index eb1156a..3ea9fb5 100644 --- a/ophyd_devices/sim/sim.py +++ b/ophyd_devices/sim/sim.py @@ -344,7 +344,7 @@ class SynFlyer(Device, PositionerBase): positions = np.asarray(positions) def produce_data(device, metadata): - buffer_time = 0.5 + buffer_time = 0.2 elapsed_time = 0 bundle = BECMessage.BundleMessage() for ii in range(num_pos):