mirror of
https://github.com/bec-project/ophyd_devices.git
synced 2025-07-10 02:38:04 +02:00
fix: fixed merge conflict
This commit is contained in:
@ -14,9 +14,6 @@ from bec_lib.core.bec_service import SERVICE_CONFIG
|
|||||||
from ophyd_devices.epics.devices.bec_scaninfo_mixin import BecScaninfoMixin
|
from ophyd_devices.epics.devices.bec_scaninfo_mixin import BecScaninfoMixin
|
||||||
from ophyd_devices.utils import bec_utils
|
from ophyd_devices.utils import bec_utils
|
||||||
|
|
||||||
# Specify here the minimum readout time for the detector
|
|
||||||
MIN_READOUT = 3e-3
|
|
||||||
|
|
||||||
|
|
||||||
class DetectorInitError(Exception):
|
class DetectorInitError(Exception):
|
||||||
"""Raised when initiation of the device class fails,
|
"""Raised when initiation of the device class fails,
|
||||||
|
Reference in New Issue
Block a user