rename shared lib

python/slsdet/__init__.py

@@ -6,18 +6,18 @@ from .detector import Detector
 from .jungfrau import Jungfrau
 from .mythen3 import Mythen3
 # from .jungfrau_ctb import JungfrauCTB
-# from _sls_detector import DetectorApi
+# from _slsdet import DetectorApi
 
-import _sls_detector
+import _slsdet
 
-defs = _sls_detector.slsDetectorDefs
-runStatus = _sls_detector.slsDetectorDefs.runStatus
-speedLevel = _sls_detector.slsDetectorDefs.speedLevel
-timingMode = _sls_detector.slsDetectorDefs.timingMode
-dacIndex = _sls_detector.slsDetectorDefs.dacIndex
-detectorType = _sls_detector.slsDetectorDefs.detectorType
-detectorSettings = _sls_detector.slsDetectorDefs.detectorSettings
-readoutMode = _sls_detector.slsDetectorDefs.readoutMode
+defs = _slsdet.slsDetectorDefs
+runStatus = _slsdet.slsDetectorDefs.runStatus
+speedLevel = _slsdet.slsDetectorDefs.speedLevel
+timingMode = _slsdet.slsDetectorDefs.timingMode
+dacIndex = _slsdet.slsDetectorDefs.dacIndex
+detectorType = _slsdet.slsDetectorDefs.detectorType
+detectorSettings = _slsdet.slsDetectorDefs.detectorSettings
+readoutMode = _slsdet.slsDetectorDefs.readoutMode
 
-IpAddr = _sls_detector.IpAddr
-MacAddr = _sls_detector.MacAddr
+IpAddr = _slsdet.IpAddr
+MacAddr = _slsdet.MacAddr

python/slsdet/ctb.py

@@ -1,8 +1,8 @@
 from .detector import Detector
 from .utils import element_if_equal
 from .dacs import DetectorDacs
-import _sls_detector
-dacIndex = _sls_detector.slsDetectorDefs.dacIndex
+import _slsdet
+dacIndex = _slsdet.slsDetectorDefs.dacIndex
 from .detector_property import DetectorProperty
 
 class CtbDacs(DetectorDacs):

python/slsdet/dacs.py

@@ -1,9 +1,9 @@
 from .detector_property import DetectorProperty
 from functools import partial
 import numpy as np
-import _sls_detector
+import _slsdet
 from .detector import freeze
-dacIndex = _sls_detector.slsDetectorDefs.dacIndex
+dacIndex = _slsdet.slsDetectorDefs.dacIndex
 class Dac(DetectorProperty):
     """
     This class represents a dac on the detector. One instance handles all

python/slsdet/detector.py

@@ -1,5 +1,5 @@
-from _sls_detector import CppDetectorApi
-from _sls_detector import slsDetectorDefs
+from _slsdet import CppDetectorApi
+from _slsdet import slsDetectorDefs
 
 runStatus = slsDetectorDefs.runStatus
 speedLevel = slsDetectorDefs.speedLevel

python/slsdet/eiger.py

@@ -11,8 +11,8 @@ from .detector import Detector
 
 # from .adcs import Adc, DetectorAdcs
 from .dacs import DetectorDacs
-import _sls_detector
-dacIndex = _sls_detector.slsDetectorDefs.dacIndex
+import _slsdet
+dacIndex = _slsdet.slsDetectorDefs.dacIndex
 from .detector_property import DetectorProperty
 # from .utils import element_if_equal
 # from sls_detector.errors import DetectorValueError, DetectorError

python/slsdet/jungfrau.py

@@ -9,8 +9,8 @@ from .detector import Detector, freeze
 
 # from .adcs import Adc, DetectorAdcs
 from .dacs import DetectorDacs
-import _sls_detector
-dacIndex = _sls_detector.slsDetectorDefs.dacIndex
+import _slsdet
+dacIndex = _slsdet.slsDetectorDefs.dacIndex
 from .detector_property import DetectorProperty
 
 # @freeze

python/slsdet/mythen3.py

@@ -9,8 +9,8 @@ from .detector import Detector, freeze
 
 # from .adcs import Adc, DetectorAdcs
 from .dacs import DetectorDacs
-import _sls_detector
-dacIndex = _sls_detector.slsDetectorDefs.dacIndex
+import _slsdet
+dacIndex = _slsdet.slsDetectorDefs.dacIndex
 from .detector_property import DetectorProperty
 
 # vcassh 1200, 

python/slsdet/utils.py

@@ -5,7 +5,7 @@ but not directly used in controlling the detector
 
 
 from collections import namedtuple
-import _sls_detector #C++ lib
+import _slsdet #C++ lib
 import functools
 
 
@@ -29,7 +29,7 @@ def list_to_bitmask(values):
     return mask
 
 def to_geo(value):
-    if isinstance(value, _sls_detector.xy):
+    if isinstance(value, _slsdet.xy):
         return Geometry(x = value.x, y = value.y)
     else:
         raise ValueError("Can only convert sls_detector.xy")