bec/ophyd_devices
1
0
Fork 0
Code Issues 9 Pull Requests 10 Actions Packages Projects Releases 126 Wiki Activity

fix: fixed import after rebase conflict

Browse Source
This commit is contained in:
wakonig_k 2023-12-12 15:10:27 +01:00
parent 4760456e63
commit 747aa36837
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ophyd_devices/epics/devices/__init__.py
View File

@ -3,7 +3,7 @@ from ophyd import EpicsMotor, EpicsSignal, EpicsSignalRO
from ophyd.quadem import QuadEM from ophyd.quadem import QuadEM
from ophyd.sim import SynAxis, SynPeriodicSignal, SynSignal from ophyd.sim import SynAxis, SynPeriodicSignal, SynSignal
from .DelayGeneratorDG645 import DelayGeneratorDG645 from .delay_generator_csaxs import DelayGeneratorcSAXS
from .eiger9m_csaxs import Eiger9McSAXS from .eiger9m_csaxs import Eiger9McSAXS
# cSAXS # cSAXS
@ -11,8 +11,9 @@ from .epics_motor_ex import EpicsMotorEx
from .falcon_csaxs import FalconcSAXS from .falcon_csaxs import FalconcSAXS
from .flomni_sample_storage import FlomniSampleStorage from .flomni_sample_storage import FlomniSampleStorage
from .InsertionDevice import InsertionDevice from .InsertionDevice import InsertionDevice
from .mcs_csaxs import McsCsaxs from .mcs_csaxs import MCScSAXS
from .pilatus_csaxs import PilatuscSAXS from .pilatus_csaxs import PilatuscSAXS
from .psi_detector_base import CustomDetectorMixin, PSIDetectorBase
from .slits import SlitH, SlitV from .slits import SlitH, SlitV
from .specMotors import ( from .specMotors import (
Bpm4i, Bpm4i,
@ -29,3 +30,5 @@ from .specMotors import (
) )
from .SpmBase import SpmBase from .SpmBase import SpmBase
from .XbpmBase import XbpmBase, XbpmCsaxsOp from .XbpmBase import XbpmBase, XbpmCsaxsOp
# from .psi_detector_base import PSIDetectorBase, CustomDetectorMixin