From 6fb912bd9c4453d4474dd0dc5a94676988f356bc Mon Sep 17 00:00:00 2001 From: appel_c Date: Fri, 9 Feb 2024 21:59:18 +0100 Subject: [PATCH] refactor: moved bec_scaninfo_mixin to ophyd_devices/utils --- ophyd_devices/epics/devices/psi_delay_generator_base.py | 2 +- ophyd_devices/epics/devices/psi_detector_base.py | 2 +- ophyd_devices/{epics/devices => utils}/bec_scaninfo_mixin.py | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) rename ophyd_devices/{epics/devices => utils}/bec_scaninfo_mixin.py (96%) diff --git a/ophyd_devices/epics/devices/psi_delay_generator_base.py b/ophyd_devices/epics/devices/psi_delay_generator_base.py index 193a591..76641c6 100644 --- a/ophyd_devices/epics/devices/psi_delay_generator_base.py +++ b/ophyd_devices/epics/devices/psi_delay_generator_base.py @@ -11,7 +11,7 @@ from ophyd.pseudopos import ( ) 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 bec_lib import bec_logger diff --git a/ophyd_devices/epics/devices/psi_detector_base.py b/ophyd_devices/epics/devices/psi_detector_base.py index 65f6518..176f82c 100644 --- a/ophyd_devices/epics/devices/psi_detector_base.py +++ b/ophyd_devices/epics/devices/psi_detector_base.py @@ -6,7 +6,7 @@ from bec_lib.device import DeviceStatus from bec_lib.file_utils import FileWriterMixin from ophyd import Device 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 diff --git a/ophyd_devices/epics/devices/bec_scaninfo_mixin.py b/ophyd_devices/utils/bec_scaninfo_mixin.py similarity index 96% rename from ophyd_devices/epics/devices/bec_scaninfo_mixin.py rename to ophyd_devices/utils/bec_scaninfo_mixin.py index 1bd3985..3c20646 100644 --- a/ophyd_devices/epics/devices/bec_scaninfo_mixin.py +++ b/ophyd_devices/utils/bec_scaninfo_mixin.py @@ -103,7 +103,10 @@ class BecScaninfoMixin: def get_username(self) -> str: """Get username""" 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() def load_scan_metadata(self) -> None: