Merge branch 'csaxs_prep' into 'master'

fix: fixed epics import

See merge request bec/ophyd_devices!9

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

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

ophyd_devices/epics/devices/SpmBase.py

@@ -1,6 +1,5 @@
 import numpy as np
-from ophyd import Device, Component, EpicsSignal, EpicsSignalRO
-import matplotlib.pyplot as plt
+from ophyd import Component, Device, EpicsSignal, EpicsSignalRO
 
 
 class SpmBase(Device):
@@ -88,7 +87,7 @@ class SpmSim(SpmBase):
         print(f"Raw signals: R={rnge}\t{s1}\t{s2}\t{s3}\t{s4}")
         # plt.imshow(beam)
         # plt.show(block=False)
-        plt.pause(0.5)
+        # plt.pause(0.5)
 
 
 # Automatically start simulation if directly invoked

ophyd_devices/epics/devices/XbpmBase.py

@@ -1,6 +1,5 @@
 import numpy as np
-from ophyd import Device, Component, EpicsSignal, EpicsSignalRO
-import matplotlib.pyplot as plt
+from ophyd import Component, Device, EpicsSignal, EpicsSignalRO
 
 
 class XbpmCsaxsOp(Device):
@@ -118,7 +117,7 @@ class XbpmSim(XbpmBase):
         print(f"Raw signals: R={rnge}\t{s1}\t{s2}\t{s3}\t{s4}")
         # plt.imshow(beam)
         # plt.show(block=False)
-        plt.pause(0.5)
+        # plt.pause(0.5)
 
 
 # Automatically start simulation if directly invoked