From d46dafdbe85b9f2a1c080297bd361a3445779d60 Mon Sep 17 00:00:00 2001 From: appel_c Date: Thu, 16 Nov 2023 23:21:42 +0100 Subject: [PATCH] fix: fixed merge conflict --- ophyd_devices/epics/devices/psi_detector_base.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/ophyd_devices/epics/devices/psi_detector_base.py b/ophyd_devices/epics/devices/psi_detector_base.py index a170db9..25779d6 100644 --- a/ophyd_devices/epics/devices/psi_detector_base.py +++ b/ophyd_devices/epics/devices/psi_detector_base.py @@ -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.utils import bec_utils -# Specify here the minimum readout time for the detector -MIN_READOUT = 3e-3 - class DetectorInitError(Exception): """Raised when initiation of the device class fails,