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

Merge branch 'online_changes' into 'master'

Browse Source 
Online changes

See merge request bec/ophyd_devices!5
This commit is contained in:
wakonig_k 2022-11-02 08:57:27 +00:00
commit 2a365493f2
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ophyd_devices/rt_lamni/rt_lamni_ophyd.py
View File

@ -450,9 +450,17 @@ class RtLamniController(Controller):
) )
time.sleep(0.03) time.sleep(0.03)
# needs to be changed to configurable center psoition
self.get_device_manager().devices.lsamx.obj.move(8.866, wait=True) lsamx_user_params = self.get_device_manager().devices.lsamx.user_parameter
self.get_device_manager().devices.lsamy.obj.move(10.18, wait=True) 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") self.socket_put("J1")
_waitforfeedbackctr = 0 _waitforfeedbackctr = 0

2
ophyd_devices/sim/sim.py
View File

@ -369,7 +369,7 @@ class SynFlyer(Device, PositionerBase):
positions = np.asarray(positions) positions = np.asarray(positions)
def produce_data(device, metadata): def produce_data(device, metadata):
buffer_time = 0.5 buffer_time = 0.2
elapsed_time = 0 elapsed_time = 0
bundle = BECMessage.BundleMessage() bundle = BECMessage.BundleMessage()
for ii in range(num_pos): for ii in range(num_pos):