removed pycache

This commit is contained in:
Erik Frojdh
2019-03-15 17:59:36 +01:00
parent 3356c2d3f6
commit c0d5303b70
38 changed files with 153 additions and 86 deletions

View File

@ -1,5 +1,6 @@
from .detector import Detector, DetectorError, free_shared_memory
from .eiger import Eiger
from .experimental import ExperimentalDetector
from .jungfrau import Jungfrau
from .jungfrau_ctb import JungfrauCTB
from _sls_detector import DetectorApi

View File

@ -1069,7 +1069,7 @@ class Detector:
@property
@error_handling
def rx_tcpport(self):
return [self._api.getRxTcpport(i) for i in range(self.n_modules)]
return self._api.getReceiverPort()
@rx_tcpport.setter
@error_handling
@ -1079,7 +1079,7 @@ class Detector:
'detectors: {}'.format(len(ports), len(self)))
else:
for i, p in enumerate(ports):
self._api.setRxTcpport(i, p)
self._api.setReceiverPort(i, p)
@property
@error_handling

View File

@ -455,8 +455,8 @@ class Eiger(Detector):
d.rx_udpport = [50010, 50011, 50012, 50013]
"""
p0 = self._api.getNetworkParameter('rx_udpport')
p1 = self._api.getNetworkParameter('rx_udpport2')
p0 = self._api.getReceiverUDPPort()
p1 = self._api.getReceiverUDPPort2()
return [int(val) for pair in zip(p0, p1) for val in pair]
@rx_udpport.setter
@ -465,8 +465,8 @@ class Eiger(Detector):
"""Requires iterating over elements two and two for setting ports"""
a = iter(ports)
for i, p in enumerate(zip(a, a)):
self._api.setNetworkParameter('rx_udpport', str(p[0]), i)
self._api.setNetworkParameter('rx_udpport2', str(p[1]), i)
self._api.setReceiverUDPPort(p[0], i)
self._api.setReceiverUDPPort2(p[1], i)
@property
@error_handling
@ -481,7 +481,7 @@ class Eiger(Detector):
"""
_s = self._api.getNetworkParameter('rx_zmqport')
_s = self._api.getReceiverStreamingPort()
if _s == '':
return []
else:
@ -492,9 +492,9 @@ class Eiger(Detector):
def rx_zmqport(self, port):
if isinstance(port, Iterable):
for i, p in enumerate(port):
self._api.setNetworkParameter('rx_zmqport', str(p), i)
self._api.setReceiverStreamingPort(p, i)
else:
self._api.setNetworkParameter('rx_zmqport', str(port), -1)
self._api.setReceiverStreamingPort(port, -1)
@property