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

Merge branch 'master' into sls_info

Browse Source
This commit is contained in:
wakonig_k 2022-11-11 20:17:08 +01:00
commit f5096a90e5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ophyd_devices/rt_lamni/rt_lamni_ophyd.py
View File

@ -9,9 +9,9 @@ from ophyd import Component as Cpt
from ophyd import Device, PositionerBase, Signal from ophyd import Device, PositionerBase, Signal
from ophyd.status import wait as status_wait from ophyd.status import wait as status_wait
from ophyd.utils import LimitError, ReadOnlyError from ophyd.utils import LimitError, ReadOnlyError
from ophyd_devices.utils.controller import Controller, threadlocked from ophyd_devices.utils.controller import Controller, threadlocked
from ophyd_devices.utils.socket import SocketIO, SocketSignal, raise_if_disconnected from ophyd_devices.utils.socket import SocketIO, SocketSignal, raise_if_disconnected
from prettytable import PrettyTable
logger = bec_logger.logger logger = bec_logger.logger
@ -416,7 +416,7 @@ class RtLamniController(Controller):
def feedback_enable_with_reset(self): def feedback_enable_with_reset(self):
if not self.feedback_status_angle_lamni(): if not self.feedback_status_angle_lamni():
self.rt_feedback_disable_and_even_reset_lamni_angle_interferometer() self.feedback_disable_and_even_reset_lamni_angle_interferometer()
logger.info(f"LamNI resetting interferometer inclusive angular interferomter.") logger.info(f"LamNI resetting interferometer inclusive angular interferomter.")
else: else:
self.feedback_disable() self.feedback_disable()
@ -459,7 +459,6 @@ class RtLamniController(Controller):
raise RuntimeError("lsamy center is not defined") raise RuntimeError("lsamy center is not defined")
lsamx_center = lsamx_user_params.get("center") lsamx_center = lsamx_user_params.get("center")
lsamy_center = lsamy_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.lsamx.obj.move(lsamx_center, wait=True)
self.get_device_manager().devices.lsamy.obj.move(lsamy_center, wait=True) self.get_device_manager().devices.lsamy.obj.move(lsamy_center, wait=True)
self.socket_put("J1") self.socket_put("J1")

2
ophyd_devices/sim/sim.py
View File

@ -368,7 +368,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):