diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index e258e6f4c..a09b12937 100755 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -139,27 +139,23 @@ class Detector(CppDetectorApi): raise ValueError("hostname needs to be string or list of strings") @property - def fw_version(self): + def firmwareversion(self): return element_if_equal(self.getFirmwareVersion()) @property - def server_version(self): + def detectorserverversion(self): # TODO! handle hex print return element_if_equal(self.getDetectorServerVersion()) @property - def client_version(self): - return element_if_equal(self.getClientVersion()) + def clientversion(self): + return self.getClientVersion() @property def rx_version(self): """Receiver version in format [0xYYMMDD].""" return element_if_equal(self.getReceiverVersion()) - @property - def detector_type(self): - return element_if_equal(self.getDetectorType()) - @property def dr(self): """ @@ -1022,6 +1018,22 @@ class Detector(CppDetectorApi): def led(self, value): self.setLEDEnable(value) + + @property + def versions(self): + return {'type': self.type, + 'package': self.packageversion, + 'client': self.clientversion, + 'firmware': self.firmwareversion, + 'detectorserver': self.detectorserverversion, + 'receiver': self.rx_version} + + + @property + def packageversion(self): + return self.getPackageVersion() + + @property def ratecorr(self): """ @@ -1172,6 +1184,19 @@ class Detector(CppDetectorApi): def subdeadtime(self, t): self.setSubDeadTime(t) + + @property + @element + def parallel(self): + """ + [Eiger] Enable or disable the parallel readout mode of Eiger. + """ + return self.getParallelMode() + + @parallel.setter + def parallel(self, value): + self.setParallelMode(value) + @property def partialreset(self): """[Eiger] Sets up detector to do partial or complete reset at start of acquisition. 0 complete reset, 1 partial reset. Default is complete reset. @@ -1392,6 +1417,7 @@ class Detector(CppDetectorApi): def veto(self, value): self.setVeto(value) + """ Mythen3 specific """