From ec3a93f96e3e07e5ac88d40fe1858915f667e64c Mon Sep 17 00:00:00 2001 From: Klaus Wakonig Date: Sun, 27 Nov 2022 08:47:58 +0100 Subject: [PATCH] fix: fixed epics import --- ophyd_devices/__init__.py | 1 + ophyd_devices/epics/__init__.py | 28 ++++++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ophyd_devices/__init__.py b/ophyd_devices/__init__.py index d67e40f..22494ff 100644 --- a/ophyd_devices/__init__.py +++ b/ophyd_devices/__init__.py @@ -1,4 +1,5 @@ from .eiger1p5m_csaxs.eiger1p5m import Eiger1p5MDetector +from .epics import * from .galil.galil_ophyd import GalilMotor from .npoint.npoint import NPointAxis from .rt_lamni import RtLamniMotor diff --git a/ophyd_devices/epics/__init__.py b/ophyd_devices/epics/__init__.py index d57f5ef..b91a7eb 100644 --- a/ophyd_devices/epics/__init__.py +++ b/ophyd_devices/epics/__init__.py @@ -1,10 +1,22 @@ -from .devices.DelayGeneratorDG645 import DelayGeneratorDG645 -from .devices.slits import SlitH, SlitV -from .devices.XbpmBase import XbpmBase, XbpmCsaxsOp -from .devices.SpmBase import SpmBase -from .devices.InsertionDevice import InsertionDevice - # Standard ophyd classes -from ophyd import EpicsSignal, EpicsSignalRO, EpicsMotor -from ophyd.sim import SynAxis, SynSignal, SynPeriodicSignal +from ophyd import EpicsMotor, EpicsSignal, EpicsSignalRO from ophyd.quadem import QuadEM +from ophyd.sim import SynAxis, SynPeriodicSignal, SynSignal + +from .devices.DelayGeneratorDG645 import DelayGeneratorDG645 +from .devices.InsertionDevice import InsertionDevice +from .devices.slits import SlitH, SlitV +from .devices.specMotors import ( + EnergyKev, + GirderMotorPITCH, + GirderMotorROLL, + GirderMotorX1, + GirderMotorY1, + GirderMotorYAW, + MonoTheta1, + MonoTheta2, + PmDetectorRotation, + PmMonoBender, +) +from .devices.SpmBase import SpmBase +from .devices.XbpmBase import XbpmBase, XbpmCsaxsOp