From 477567e61a7a8ea6127ea9675a8e2d84b269be05 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Wed, 15 May 2024 18:41:17 +0200 Subject: [PATCH] fix: fixed bec_lib imports --- bin/cbf_converter/cbf_converter.py | 2 +- .../devices/eiger1p5m_csaxs/eiger1p5m.py | 5 +++-- csaxs_bec/devices/epics/devices/mcs_csaxs.py | 21 ++++++++++--------- .../devices/epics/devices/pilatus_csaxs.py | 3 ++- csaxs_bec/devices/rt_lamni/rt_flomni_ophyd.py | 3 ++- csaxs_bec/devices/rt_lamni/rt_lamni_ophyd.py | 3 ++- csaxs_bec/devices/rt_lamni/rt_ophyd.py | 3 ++- csaxs_bec/scans/LamNIFermatScan.py | 3 ++- csaxs_bec/scans/flomni_fermat_scan.py | 3 ++- csaxs_bec/scans/owis_grid.py | 3 ++- csaxs_bec/scans/scan_plugin_template.py | 3 ++- csaxs_bec/scans/sgalil_grid.py | 3 ++- 12 files changed, 33 insertions(+), 22 deletions(-) diff --git a/bin/cbf_converter/cbf_converter.py b/bin/cbf_converter/cbf_converter.py index 4705539..b022858 100644 --- a/bin/cbf_converter/cbf_converter.py +++ b/bin/cbf_converter/cbf_converter.py @@ -28,7 +28,7 @@ class PilatusConverter: message (MessageObject): Message object parent (PilatusConverter): Parent object """ - msg = messages.MessageReader.loads(message.value) + msg = message.value print(msg) if not msg: return diff --git a/csaxs_bec/devices/eiger1p5m_csaxs/eiger1p5m.py b/csaxs_bec/devices/eiger1p5m_csaxs/eiger1p5m.py index a7d3012..96160ae 100644 --- a/csaxs_bec/devices/eiger1p5m_csaxs/eiger1p5m.py +++ b/csaxs_bec/devices/eiger1p5m_csaxs/eiger1p5m.py @@ -1,9 +1,10 @@ import os import time -from bec_lib import MessageEndpoints, bec_logger, messages +from bec_lib import bec_logger, messages +from bec_lib.endpoints import MessageEndpoints from ophyd import Component as Cpt -from ophyd import Device, DeviceStatus, EpicsSignal, EpicsSignalRO, Signal +from ophyd import Device, EpicsSignal, EpicsSignalRO, Signal logger = bec_logger.logger diff --git a/csaxs_bec/devices/epics/devices/mcs_csaxs.py b/csaxs_bec/devices/epics/devices/mcs_csaxs.py index dfe9b36..9008ec6 100644 --- a/csaxs_bec/devices/epics/devices/mcs_csaxs.py +++ b/csaxs_bec/devices/epics/devices/mcs_csaxs.py @@ -3,7 +3,8 @@ import threading from collections import defaultdict import numpy as np -from bec_lib import MessageEndpoints, bec_logger, messages, threadlocked +from bec_lib import bec_logger, messages +from bec_lib.endpoints import MessageEndpoints from ophyd import Component as Cpt from ophyd import Device, EpicsSignal, EpicsSignalRO from ophyd_devices.interfaces.base_classes.psi_detector_base import ( @@ -112,17 +113,17 @@ class MCSSetup(CustomDetectorMixin): done=bool(max_value == value), # == self.counter), ) - @threadlocked def _on_mca_data(self, *args, obj=None, value=None, **kwargs) -> None: """Callback function for scan progress""" - if not isinstance(value, (list, np.ndarray)): - return - self.mca_data[obj.attr_name] = value - if len(self.mca_names) != len(self.mca_data): - return - self.acquisition_done = True - self._send_data_to_bec() - self.mca_data = defaultdict(lambda: []) + with self._lock: + if not isinstance(value, (list, np.ndarray)): + return + self.mca_data[obj.attr_name] = value + if len(self.mca_names) != len(self.mca_data): + return + self.acquisition_done = True + self._send_data_to_bec() + self.mca_data = defaultdict(lambda: []) def _send_data_to_bec(self) -> None: """Sends bundled data to BEC""" diff --git a/csaxs_bec/devices/epics/devices/pilatus_csaxs.py b/csaxs_bec/devices/epics/devices/pilatus_csaxs.py index 54a021e..d8c37f0 100644 --- a/csaxs_bec/devices/epics/devices/pilatus_csaxs.py +++ b/csaxs_bec/devices/epics/devices/pilatus_csaxs.py @@ -5,7 +5,8 @@ import time import numpy as np import requests -from bec_lib import MessageEndpoints, bec_logger, messages +from bec_lib import bec_logger, messages +from bec_lib.endpoints import MessageEndpoints from ophyd import ADComponent as ADCpt from ophyd import Device, EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV, Staged from ophyd_devices.interfaces.base_classes.psi_detector_base import ( diff --git a/csaxs_bec/devices/rt_lamni/rt_flomni_ophyd.py b/csaxs_bec/devices/rt_lamni/rt_flomni_ophyd.py index 02ed69b..0389d77 100644 --- a/csaxs_bec/devices/rt_lamni/rt_flomni_ophyd.py +++ b/csaxs_bec/devices/rt_lamni/rt_flomni_ophyd.py @@ -3,7 +3,8 @@ import time from typing import List import numpy as np -from bec_lib import MessageEndpoints, bec_logger, messages +from bec_lib import bec_logger, messages +from bec_lib.endpoints import MessageEndpoints from ophyd import Component as Cpt from ophyd import Device, PositionerBase, Signal from ophyd.status import wait as status_wait diff --git a/csaxs_bec/devices/rt_lamni/rt_lamni_ophyd.py b/csaxs_bec/devices/rt_lamni/rt_lamni_ophyd.py index e206596..290082e 100644 --- a/csaxs_bec/devices/rt_lamni/rt_lamni_ophyd.py +++ b/csaxs_bec/devices/rt_lamni/rt_lamni_ophyd.py @@ -3,7 +3,8 @@ import threading import time import numpy as np -from bec_lib import MessageEndpoints, bec_logger, messages +from bec_lib import bec_logger, messages +from bec_lib.endpoints import MessageEndpoints from ophyd import Component as Cpt from ophyd import Device, PositionerBase, Signal from ophyd.status import wait as status_wait diff --git a/csaxs_bec/devices/rt_lamni/rt_ophyd.py b/csaxs_bec/devices/rt_lamni/rt_ophyd.py index c3fa81b..76b16ee 100644 --- a/csaxs_bec/devices/rt_lamni/rt_ophyd.py +++ b/csaxs_bec/devices/rt_lamni/rt_ophyd.py @@ -4,7 +4,8 @@ import time from typing import List import numpy as np -from bec_lib import MessageEndpoints, bec_logger, messages +from bec_lib import bec_logger, messages +from bec_lib.endpoints import MessageEndpoints from ophyd import Component as Cpt from ophyd import Device, PositionerBase, Signal from ophyd.status import wait as status_wait diff --git a/csaxs_bec/scans/LamNIFermatScan.py b/csaxs_bec/scans/LamNIFermatScan.py index 8618058..f534dc8 100644 --- a/csaxs_bec/scans/LamNIFermatScan.py +++ b/csaxs_bec/scans/LamNIFermatScan.py @@ -23,7 +23,8 @@ but they are executed in a specific order: import time import numpy as np -from bec_lib import MessageEndpoints, bec_logger +from bec_lib import bec_logger +from bec_lib.endpoints import MessageEndpoints from bec_server.scan_server.errors import ScanAbortion from bec_server.scan_server.scans import RequestBase, ScanArgType, ScanBase diff --git a/csaxs_bec/scans/flomni_fermat_scan.py b/csaxs_bec/scans/flomni_fermat_scan.py index 7735155..c9b8f18 100644 --- a/csaxs_bec/scans/flomni_fermat_scan.py +++ b/csaxs_bec/scans/flomni_fermat_scan.py @@ -23,7 +23,8 @@ but they are executed in a specific order: import time import numpy as np -from bec_lib import MessageEndpoints, bec_logger, messages +from bec_lib import bec_logger, messages +from bec_lib.endpoints import MessageEndpoints from bec_server.scan_server.errors import ScanAbortion from bec_server.scan_server.scans import SyncFlyScanBase diff --git a/csaxs_bec/scans/owis_grid.py b/csaxs_bec/scans/owis_grid.py index 653396c..fb5c4f8 100644 --- a/csaxs_bec/scans/owis_grid.py +++ b/csaxs_bec/scans/owis_grid.py @@ -22,7 +22,8 @@ but they are executed in a specific order: import time -from bec_lib import MessageEndpoints, bec_logger +from bec_lib import bec_logger +from bec_lib.endpoints import MessageEndpoints from bec_server.scan_server.scans import AsyncFlyScanBase, ScanAbortion logger = bec_logger.logger diff --git a/csaxs_bec/scans/scan_plugin_template.py b/csaxs_bec/scans/scan_plugin_template.py index bb8ea06..365970b 100644 --- a/csaxs_bec/scans/scan_plugin_template.py +++ b/csaxs_bec/scans/scan_plugin_template.py @@ -25,7 +25,8 @@ but they are executed in a specific order: # import numpy as np -# from bec_lib import MessageEndpoints, bec_logger, messages +# from bec_lib import bec_logger, messages +# from bec_lib.endpoints import MessageEndpoints # from bec_server.scan_server.errors import ScanAbortion # from bec_server.scan_server.scans import FlyScanBase, RequestBase, ScanArgType, ScanBase diff --git a/csaxs_bec/scans/sgalil_grid.py b/csaxs_bec/scans/sgalil_grid.py index 2162870..5c435c5 100644 --- a/csaxs_bec/scans/sgalil_grid.py +++ b/csaxs_bec/scans/sgalil_grid.py @@ -22,7 +22,8 @@ but they are executed in a specific order: import time -from bec_lib import MessageEndpoints, bec_logger +from bec_lib import bec_logger +from bec_lib.endpoints import MessageEndpoints from bec_server.scan_server.scans import AsyncFlyScanBase logger = bec_logger.logger