diff --git a/python/scripts/basic.py b/python/scripts/basic.py index c64cdd455..77d844632 100755 --- a/python/scripts/basic.py +++ b/python/scripts/basic.py @@ -4,7 +4,7 @@ import numpy as np sys.path.append(os.path.join(os.getcwd(), 'bin')) from sls_detector import Detector, Mythen3, Eiger, Jungfrau, DetectorDacs, Dac, Ctb -from sls_detector import dacIndex +from sls_detector import dacIndex, readoutMode d = Detector() diff --git a/python/sls_detector/__init__.py b/python/sls_detector/__init__.py index e46467beb..12e86677b 100755 --- a/python/sls_detector/__init__.py +++ b/python/sls_detector/__init__.py @@ -17,6 +17,7 @@ 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 IpAddr = _sls_detector.IpAddr MacAddr = _sls_detector.MacAddr diff --git a/python/sls_detector/detector.py b/python/sls_detector/detector.py index 6c60b72bd..81bee3cf6 100755 --- a/python/sls_detector/detector.py +++ b/python/sls_detector/detector.py @@ -774,6 +774,22 @@ class Detector(CppDetectorApi): CTB stuff """ + @property + def runclk(self): + return element_if_equal(self.getRUNClock()) + + @runclk.setter + def runclk(self, freq): + self.setRUNClock(freq) + + @property + def romode(self): + return element_if_equal(self.getReadoutMode()) + + @romode.setter + def romode(self, mode): + self.setReadoutMode(mode) + @property def asamples(self): return element_if_equal(self.getNumberOfAnalogSamples()) @@ -844,4 +860,16 @@ class Detector(CppDetectorApi): @property def adcphase(self): - return element_if_equal() \ No newline at end of file + return element_if_equal(self.getADCPhase()) + + @adcphase.setter + def adcphase(self, value): + self.setADCPhase(value) + + @property + def adcpipeline(self): + return element_if_equal(self.getADCPipeline()) + + @adcpipeline.setter + def adcpipeline(self, value): + self.setADCPipeline(value) \ No newline at end of file