Two solutions for combined EPICS PVs

ophyd_devices/epics/devices/__init__.py

@@ -4,19 +4,19 @@ from .XbpmBase import XbpmBase, XbpmCsaxsOp
 from .SpmBase import SpmBase
 from .InsertionDevice import InsertionDevice
 from .specMotors import (
-    PmMonoBender,
-    PmDetectorRotation,
+    Bpm4i,
+    EnergyKev,
+    GirderMotorPITCH,
+    GirderMotorROLL,
     GirderMotorX1,
     GirderMotorY1,
-    GirderMotorROLL,
     GirderMotorYAW,
-    GirderMotorPITCH,
     MonoTheta1,
     MonoTheta2,
-    EnergyKev,
+    PmDetectorRotation,
+    PmMonoBender,
 )
 
-
 # Standard ophyd classes
 from ophyd import EpicsSignal, EpicsSignalRO, EpicsMotor
 from ophyd.sim import SynAxis, SynSignal, SynPeriodicSignal