bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2025-07-10 18:51:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: cleanup of scan_status prints in scaninfo_mixin

Browse Source
This commit is contained in:
appel_c
2024-10-01 13:53:04 +02:00
parent 7ff37c0dcd
commit 449dadb593
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ophyd_devices/sim/sim_positioner.py
View File

@ -166,7 +166,7 @@ class SimPositioner(Device, PositionerBase):
ttime.sleep(1 / self.update_frequency) ttime.sleep(1 / self.update_frequency)
self._update_state(ii) self._update_state(ii)
if self._stopped: if self._stopped:
raise DeviceStopError(f"{self.parent.name} was stopped") raise DeviceStopError(f"{self.name} was stopped")
st.set_finished() st.set_finished()
# pylint: disable=broad-except # pylint: disable=broad-except
except Exception as exc: except Exception as exc:
@ -241,7 +241,7 @@ class SimLinearTrajectoryPositioner(SimPositioner):
while not traj.ended: while not traj.ended:
ttime.sleep(1 / self.update_frequency) ttime.sleep(1 / self.update_frequency)
self._update_state(traj.position()) self._update_state(traj.position())
raise DeviceStopError(f"{self.parent.name} was stopped") raise DeviceStopError(f"{self.name} was stopped")
st.set_finished() st.set_finished()
# pylint: disable=broad-except # pylint: disable=broad-except
except Exception as exc: except Exception as exc:

2
ophyd_devices/utils/bec_scaninfo_mixin.py
View File

@ -122,8 +122,8 @@ class BecScaninfoMixin:
This function loads scan metadata from the current scan message This function loads scan metadata from the current scan message
""" """
self.scan_msg = scan_msg = self._get_current_scan_msg() self.scan_msg = scan_msg = self._get_current_scan_msg()
logger.info(f"{self.scan_msg}")
try: try:
logger.info(f"Received scan msg for {self.scan_msg.content['scan_id']}")
self.metadata = { self.metadata = {
"scan_id": scan_msg.content["scan_id"], "scan_id": scan_msg.content["scan_id"],
"RID": scan_msg.content["info"]["RID"], "RID": scan_msg.content["info"]["RID"],