bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2025-07-10 02:38:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed merge conflict

Browse Source
This commit is contained in:
appel_c
2023-11-16 23:21:42 +01:00
parent bcc3210761
commit d46dafdbe8
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ophyd_devices/epics/devices/psi_detector_base.py
View File

@ -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,