From 747aa36837fa823cd2f05e294e2ee9ee83074f43 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Tue, 12 Dec 2023 15:10:27 +0100 Subject: [PATCH] fix: fixed import after rebase conflict --- ophyd_devices/epics/devices/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ophyd_devices/epics/devices/__init__.py b/ophyd_devices/epics/devices/__init__.py index 55677c8..82f6a51 100644 --- a/ophyd_devices/epics/devices/__init__.py +++ b/ophyd_devices/epics/devices/__init__.py @@ -3,7 +3,7 @@ from ophyd import EpicsMotor, EpicsSignal, EpicsSignalRO from ophyd.quadem import QuadEM from ophyd.sim import SynAxis, SynPeriodicSignal, SynSignal -from .DelayGeneratorDG645 import DelayGeneratorDG645 +from .delay_generator_csaxs import DelayGeneratorcSAXS from .eiger9m_csaxs import Eiger9McSAXS # cSAXS @@ -11,8 +11,9 @@ from .epics_motor_ex import EpicsMotorEx from .falcon_csaxs import FalconcSAXS from .flomni_sample_storage import FlomniSampleStorage from .InsertionDevice import InsertionDevice -from .mcs_csaxs import McsCsaxs +from .mcs_csaxs import MCScSAXS from .pilatus_csaxs import PilatuscSAXS +from .psi_detector_base import CustomDetectorMixin, PSIDetectorBase from .slits import SlitH, SlitV from .specMotors import ( Bpm4i, @@ -29,3 +30,5 @@ from .specMotors import ( ) from .SpmBase import SpmBase from .XbpmBase import XbpmBase, XbpmCsaxsOp + +# from .psi_detector_base import PSIDetectorBase, CustomDetectorMixin