From 217c27bfdb38e7b1141565317b69c4955d5b6df4 Mon Sep 17 00:00:00 2001 From: Christian Appel Date: Fri, 20 Oct 2023 14:57:23 +0200 Subject: [PATCH] refactor: cleanup import for detectors --- ophyd_devices/epics/devices/eiger9m_csaxs.py | 11 ++++++----- ophyd_devices/epics/devices/falcon_csaxs.py | 8 ++++---- ophyd_devices/epics/devices/pilatus_csaxs.py | 7 +++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ophyd_devices/epics/devices/eiger9m_csaxs.py b/ophyd_devices/epics/devices/eiger9m_csaxs.py index 962476b..108ac00 100644 --- a/ophyd_devices/epics/devices/eiger9m_csaxs.py +++ b/ophyd_devices/epics/devices/eiger9m_csaxs.py @@ -1,22 +1,23 @@ import enum import threading import time -from typing import Any, List import numpy as np import os + +from typing import Any, List + from ophyd import EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV from ophyd import DetectorBase, Device from ophyd import ADComponent as ADCpt +from std_daq_client import StdDaqClient + from bec_lib.core import BECMessage, MessageEndpoints, threadlocked from bec_lib.core.file_utils import FileWriterMixin from bec_lib.core import bec_logger -from ophyd_devices.utils import bec_utils as bec_utils - -from std_daq_client import StdDaqClient from ophyd_devices.epics.devices.bec_scaninfo_mixin import BecScaninfoMixin - +from ophyd_devices.utils import bec_utils logger = bec_logger.logger diff --git a/ophyd_devices/epics/devices/falcon_csaxs.py b/ophyd_devices/epics/devices/falcon_csaxs.py index f52f87d..2fe3b7e 100644 --- a/ophyd_devices/epics/devices/falcon_csaxs.py +++ b/ophyd_devices/epics/devices/falcon_csaxs.py @@ -1,17 +1,17 @@ import enum import os import time -from typing import List -from ophyd import EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV, Component as Cpt, Device +from typing import List + +from ophyd import EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV, Component as Cpt, Device from ophyd.mca import EpicsMCARecord -from ophyd.areadetector.plugins import HDF5Plugin_V21, FilePlugin_V22 from bec_lib.core.file_utils import FileWriterMixin from bec_lib.core import MessageEndpoints, BECMessage from bec_lib.core import bec_logger -from ophyd_devices.epics.devices.bec_scaninfo_mixin import BecScaninfoMixin +from ophyd_devices.epics.devices.bec_scaninfo_mixin import BecScaninfoMixin from ophyd_devices.utils import bec_utils logger = bec_logger.logger diff --git a/ophyd_devices/epics/devices/pilatus_csaxs.py b/ophyd_devices/epics/devices/pilatus_csaxs.py index e175eb7..0ec8780 100644 --- a/ophyd_devices/epics/devices/pilatus_csaxs.py +++ b/ophyd_devices/epics/devices/pilatus_csaxs.py @@ -1,22 +1,21 @@ import enum import json import os -import subprocess import time -from typing import List import requests import numpy as np +from typing import List + from ophyd import EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV from ophyd import DetectorBase, Device, Staged from ophyd import ADComponent as ADCpt -from ophyd_devices.utils import bec_utils as bec_utils from bec_lib.core import BECMessage, MessageEndpoints from bec_lib.core.file_utils import FileWriterMixin from bec_lib.core import bec_logger - +from ophyd_devices.utils import bec_utils as bec_utils from ophyd_devices.epics.devices.bec_scaninfo_mixin import BecScaninfoMixin logger = bec_logger.logger