diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index dfada8571..0d7306875 100755 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -25,10 +25,9 @@ set( PYTHON_FILES dacs.py decorators.py detector_property.py - # detector.py + detector.py eiger.py errors.py - experimental.py ctb.py # jungfrau.py registers.py diff --git a/python/sls_detector/__init__.py b/python/sls_detector/__init__.py index ce1395931..8dc9b0a23 100755 --- a/python/sls_detector/__init__.py +++ b/python/sls_detector/__init__.py @@ -2,7 +2,7 @@ from .eiger import Eiger from .ctb import Ctb from .dacs import DetectorDacs, Dac -from .experimental import Detector +from .detector import Detector # from .jungfrau import Jungfrau # from .jungfrau_ctb import JungfrauCTB diff --git a/python/sls_detector/ctb.py b/python/sls_detector/ctb.py index 3c57d3220..125b4109c 100644 --- a/python/sls_detector/ctb.py +++ b/python/sls_detector/ctb.py @@ -1,4 +1,4 @@ -from .experimental import Detector +from .detector import Detector from .utils import element_if_equal from .dacs import DetectorDacs import _sls_detector diff --git a/python/sls_detector/experimental.py b/python/sls_detector/detector.py similarity index 100% rename from python/sls_detector/experimental.py rename to python/sls_detector/detector.py diff --git a/python/sls_detector/eiger.py b/python/sls_detector/eiger.py index 0cdb15a27..5beb8899e 100755 --- a/python/sls_detector/eiger.py +++ b/python/sls_detector/eiger.py @@ -7,7 +7,7 @@ Created on Wed Dec 6 11:51:18 2017 """ -from .experimental import Detector +from .detector import Detector # import socket # from collections.abc import Iterable # from collections import namedtuple @@ -136,7 +136,7 @@ class EigerDacs(DetectorDacs): # r_str.append('{:2d}:{:8s}{:>8d}{:>8d}{:>8d}'.format(i, hn[i], self.left[i], self.right[i], self.frame[i])) # return '\n'.join(r_str) -from .experimental import freeze +from .detector import freeze @freeze class Eiger(Detector):