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

refactor: moved bec_scaninfo_mixin to ophyd_devices/utils

Browse Source
This commit is contained in:
appel_c
2024-02-09 21:59:18 +01:00
parent 96a5f1b86a
commit 6fb912bd9c
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ophyd_devices/epics/devices/psi_delay_generator_base.py
View File

@ -11,7 +11,7 @@ from ophyd.pseudopos import (
) )
from ophyd.device import Staged from ophyd.device import Staged
from ophyd_devices.epics.devices.bec_scaninfo_mixin import BecScaninfoMixin from ophyd_devices.utils.bec_scaninfo_mixin import BecScaninfoMixin
from ophyd_devices.utils import bec_utils from ophyd_devices.utils import bec_utils
from bec_lib import bec_logger from bec_lib import bec_logger

2
ophyd_devices/epics/devices/psi_detector_base.py
View File

@ -6,7 +6,7 @@ from bec_lib.device import DeviceStatus
from bec_lib.file_utils import FileWriterMixin from bec_lib.file_utils import FileWriterMixin
from ophyd import Device from ophyd import Device
from ophyd.device import Staged from ophyd.device import Staged
from ophyd_devices.epics.devices.bec_scaninfo_mixin import BecScaninfoMixin from ophyd_devices.utils.bec_scaninfo_mixin import BecScaninfoMixin
from ophyd_devices.utils import bec_utils from ophyd_devices.utils import bec_utils

5
ophyd_devices/epics/devices/bec_scaninfo_mixin.py → ophyd_devices/utils/bec_scaninfo_mixin.py
View File

@ -103,7 +103,10 @@ class BecScaninfoMixin:
def get_username(self) -> str: def get_username(self) -> str:
"""Get username""" """Get username"""
if not self.sim_mode: if not self.sim_mode:
return self.device_manager.producer.get(MessageEndpoints.account()).decode() msg = self.device_manager.producer.get(MessageEndpoints.account())
if not isinstance(msg, str):
return os.getlogin()
return self.device_manager.producer.get(MessageEndpoints.account())
return os.getlogin() return os.getlogin()
def load_scan_metadata(self) -> None: def load_scan_metadata(self) -> None: