detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-20 02:40:03 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
maliakal_d 2020-09-23 14:58:33 +02:00
commit 4aa33b5d7f
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
python/slsdet/detector.py
View File

@ -216,7 +216,6 @@ class Detector(CppDetectorApi):
return ut.lhex(self.getDetectorServerVersion()) return ut.lhex(self.getDetectorServerVersion())
@property @property
@element
def clientversion(self): def clientversion(self):
"""Client software version in format [YYMMDD] """Client software version in format [YYMMDD]
Example Example
@ -224,7 +223,7 @@ class Detector(CppDetectorApi):
>>> d.clientversion >>> d.clientversion
'0x200810' '0x200810'
""" """
return ut.lhex(self.getClientVersion()) return hex(self.getClientVersion())
@property @property
@element @element
@ -494,7 +493,7 @@ class Detector(CppDetectorApi):
@delay.setter @delay.setter
def delay(self, t): def delay(self, t):
self.setDelayAfterTrigger(t) ut.set_time_using_dict(self.setDelayAfterTrigger, t)
@property @property
@element @element
@ -534,20 +533,20 @@ class Detector(CppDetectorApi):
# Time # Time
@property @property
@element
def rx_framescaught(self): def rx_framescaught(self):
"""Number of frames caught by receiver.""" """Number of frames caught by receiver."""
return element_if_equal(self.getFramesCaught()) return self.getFramesCaught()
@property @property
@element
def startingfnum(self): def startingfnum(self):
"""[Eiger][Jungfrau] Starting frame number for next acquisition. Stopping acquisition might result in different frame numbers for different modules. """ """[Eiger][Jungfrau] Starting frame number for next acquisition. Stopping acquisition might result in different frame numbers for different modules. """
return element_if_equal(self.getStartingFrameNumber()) return self.getStartingFrameNumber()
@startingfnum.setter @startingfnum.setter
def startingfnum(self, value): def startingfnum(self, value):
self.setStartingFrameNumber(value) ut.set_using_dict(self.setStartingFrameNumber, value)
# TODO! add txdelay
@property @property
@element @element
@ -596,10 +595,12 @@ class Detector(CppDetectorApi):
ut.set_using_dict(self.setTransmissionDelayRight, args) ut.set_using_dict(self.setTransmissionDelayRight, args)
@property @property
@element
def use_receiver(self): def use_receiver(self):
return element_if_equal(self.getUseReceiverFlag()) return self.getUseReceiverFlag()
@property @property
@element
def rx_hostname(self): def rx_hostname(self):
""" Sets receiver hostname or IP address. Used for TCP control communication between client and receiver to configure receiver. Also updates receiver with detector parameters. """ Sets receiver hostname or IP address. Used for TCP control communication between client and receiver to configure receiver. Also updates receiver with detector parameters.
Note Note
@ -619,13 +620,14 @@ class Detector(CppDetectorApi):
>>> d.rx_tcpport >>> d.rx_tcpport
[2000, 2002] [2000, 2002]
""" """
return element_if_equal(self.getRxHostname()) return self.getRxHostname()
@rx_hostname.setter @rx_hostname.setter
def rx_hostname(self, hostname): def rx_hostname(self, hostname):
self.setRxHostname(hostname) self.setRxHostname(hostname)
@property @property
@element
def rx_tcpport(self): def rx_tcpport(self):
""" """
TCP port for client-receiver communication. TCP port for client-receiver communication.
@ -642,11 +644,11 @@ class Detector(CppDetectorApi):
>>> d.rx_tcpport >>> d.rx_tcpport
[2000, 2002] [2000, 2002]
""" """
return element_if_equal(self.getRxPort()) return self.getRxPort()
@rx_tcpport.setter @rx_tcpport.setter
def rx_tcpport(self, port): def rx_tcpport(self, port):
self.setRxPort(port) ut.set_using_dict(self.setRxPort, port)
@property @property
def rx_fifodepth(self): def rx_fifodepth(self):

5
python/slsdet/utils.py
View File

@ -113,7 +113,10 @@ def make_string_path(path):
def set_using_dict(func, args): def set_using_dict(func, args):
if isinstance(args, dict) and all(isinstance(k, int) for k in args.keys()): if isinstance(args, dict) and all(isinstance(k, int) for k in args.keys()):
for key, value in args.items(): for key, value in args.items():
func(value, [key]) try:
func(value, [key])
except TypeError:
func(value, key)
else: else:
func(args) func(args)