detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions Packages Releases Activity

removed old error handling

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-04 17:42:55 +02:00
parent 55ba2afc05
commit acf32a5524
3 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
python/sls_detector/eiger.py
View File

@ -169,7 +169,6 @@ class Eiger(Detector):
self._temp.fpgafr = Adc('temp_fpgafr', self) self._temp.fpgafr = Adc('temp_fpgafr', self)
@property @property
@error_handling
def active(self): def active(self):
""" """
Is the detector active? Can be used to enable or disable a detector Is the detector active? Can be used to enable or disable a detector
@ -189,7 +188,6 @@ class Eiger(Detector):
return self._active return self._active
@active.setter @active.setter
@error_handling
def active(self, value): def active(self, value):
self._active[:] = value self._active[:] = value
@ -202,7 +200,6 @@ class Eiger(Detector):
return self._api.getMeasuredSubPeriod() return self._api.getMeasuredSubPeriod()
@property @property
@error_handling
def add_gappixels(self): def add_gappixels(self):
"""Enable or disable the (virual) pixels between ASICs """Enable or disable the (virual) pixels between ASICs
@ -220,7 +217,6 @@ class Eiger(Detector):
return self._api.getGapPixels() return self._api.getGapPixels()
@add_gappixels.setter @add_gappixels.setter
@error_handling
def add_gappixels(self, value): def add_gappixels(self, value):
self._api.setGapPixels(value) self._api.setGapPixels(value)
@ -286,7 +282,6 @@ class Eiger(Detector):
return self._dacs return self._dacs
@property @property
@error_handling
def tx_delay(self): def tx_delay(self):
""" """
Transmission delay of the modules to allow running the detector Transmission delay of the modules to allow running the detector
@ -319,7 +314,6 @@ class Eiger(Detector):
self.dynamic_range = 16 self.dynamic_range = 16
@property @property
@error_handling
def eiger_matrix_reset(self): def eiger_matrix_reset(self):
""" """
Matrix reset bit for Eiger. Matrix reset bit for Eiger.
@ -331,12 +325,10 @@ class Eiger(Detector):
return self._api.getCounterBit() return self._api.getCounterBit()
@eiger_matrix_reset.setter @eiger_matrix_reset.setter
@error_handling
def eiger_matrix_reset(self, value): def eiger_matrix_reset(self, value):
self._api.setCounterBit(value) self._api.setCounterBit(value)
@property @property
@error_handling
def flowcontrol_10g(self): def flowcontrol_10g(self):
""" """
:py:obj:`True` - Flow control enabled :py:obj:`False` flow control disabled. :py:obj:`True` - Flow control enabled :py:obj:`False` flow control disabled.
@ -348,7 +340,6 @@ class Eiger(Detector):
return element_if_equal([bool(int(e)) for e in fc]) return element_if_equal([bool(int(e)) for e in fc])
@flowcontrol_10g.setter @flowcontrol_10g.setter
@error_handling
def flowcontrol_10g(self, value): def flowcontrol_10g(self, value):
if value is True: if value is True:
v = '1' v = '1'
@ -424,7 +415,6 @@ class Eiger(Detector):
return self._vcmp return self._vcmp
@vcmp.setter @vcmp.setter
@error_handling
def vcmp(self, values): def vcmp(self, values):
if len(values) == len(self._vcmp.set): if len(values) == len(self._vcmp.set):
for i, v in enumerate(values): for i, v in enumerate(values):
@ -433,7 +423,6 @@ class Eiger(Detector):
raise ValueError('vcmp only compatible with setting all') raise ValueError('vcmp only compatible with setting all')
@property @property
@error_handling
def rx_udpport(self): def rx_udpport(self):
""" """
UDP port for the receiver. Each module has two ports referred to UDP port for the receiver. Each module has two ports referred to
@ -460,7 +449,6 @@ class Eiger(Detector):
return [int(val) for pair in zip(p0, p1) for val in pair] return [int(val) for pair in zip(p0, p1) for val in pair]
@rx_udpport.setter @rx_udpport.setter
@error_handling
def rx_udpport(self, ports): def rx_udpport(self, ports):
"""Requires iterating over elements two and two for setting ports""" """Requires iterating over elements two and two for setting ports"""
a = iter(ports) a = iter(ports)
@ -469,7 +457,6 @@ class Eiger(Detector):
self._api.setReceiverUDPPort2(p[1], i) self._api.setReceiverUDPPort2(p[1], i)
@property @property
@error_handling
def rx_zmqport(self): def rx_zmqport(self):
""" """
Return the receiver zmq ports. Note that Eiger has two ports per receiver! Return the receiver zmq ports. Note that Eiger has two ports per receiver!
@ -488,7 +475,6 @@ class Eiger(Detector):
return [int(_p) + i for _p in _s for i in range(2)] return [int(_p) + i for _p in _s for i in range(2)]
@rx_zmqport.setter @rx_zmqport.setter
@error_handling
def rx_zmqport(self, port): def rx_zmqport(self, port):
if isinstance(port, Iterable): if isinstance(port, Iterable):
for i, p in enumerate(port): for i, p in enumerate(port):
@ -498,7 +484,6 @@ class Eiger(Detector):
@property @property
@error_handling
def sub_exposure_time(self): def sub_exposure_time(self):
""" """
Sub frame exposure time in *seconds* for Eiger in 32bit autosumming mode Sub frame exposure time in *seconds* for Eiger in 32bit autosumming mode
@ -515,7 +500,6 @@ class Eiger(Detector):
@sub_exposure_time.setter @sub_exposure_time.setter
@error_handling
def sub_exposure_time(self, t): def sub_exposure_time(self, t):
#TODO! checking here or in the detector? #TODO! checking here or in the detector?
ns_time = int(t * 1e9) ns_time = int(t * 1e9)
@ -525,7 +509,6 @@ class Eiger(Detector):
raise DetectorValueError('Sub exposure time must be larger than 0') raise DetectorValueError('Sub exposure time must be larger than 0')
@property @property
@error_handling
def sub_deadtime(self): def sub_deadtime(self):
""" """
Deadtime between subexposures. Used to mimize noise by delaying the start of the next Deadtime between subexposures. Used to mimize noise by delaying the start of the next
@ -535,7 +518,6 @@ class Eiger(Detector):
@sub_deadtime.setter @sub_deadtime.setter
@error_handling
def sub_deadtime(self, t): def sub_deadtime(self, t):
ns_time = int(t * 1e9) ns_time = int(t * 1e9)
if ns_time >= 0: if ns_time >= 0:
@ -574,7 +556,6 @@ class Eiger(Detector):
return self._temp return self._temp
@property @property
@error_handling
def tengiga(self): def tengiga(self):
"""Enable 10Gbit/s data output """Enable 10Gbit/s data output
@ -592,7 +573,6 @@ class Eiger(Detector):
return self._api.getTenGigabitEthernet() return self._api.getTenGigabitEthernet()
@tengiga.setter @tengiga.setter
@error_handling
def tengiga(self, value): def tengiga(self, value):
self._api.setTenGigabitEthernet(value) self._api.setTenGigabitEthernet(value)

8
python/sls_detector/jungfrau.py
View File

@ -69,7 +69,6 @@ class Jungfrau(Detector):
return self._dacs return self._dacs
@property @property
@error_handling
def power_chip(self): def power_chip(self):
"""Power on or off the ASICs, True for on False for off""" """Power on or off the ASICs, True for on False for off"""
return self._api.isChipPowered() return self._api.isChipPowered()
@ -80,7 +79,6 @@ class Jungfrau(Detector):
self._api.powerChip(value) self._api.powerChip(value)
@property @property
@error_handling
def delay(self): def delay(self):
"""Delay after trigger [s]""" """Delay after trigger [s]"""
return self._api.getDelay()/1e9 return self._api.getDelay()/1e9
@ -92,7 +90,6 @@ class Jungfrau(Detector):
self._api.setDelay(ns_time) self._api.setDelay(ns_time)
@property @property
@error_handling
def n_gates(self): def n_gates(self):
return self._api.getNumberOfGates() return self._api.getNumberOfGates()
@ -102,7 +99,6 @@ class Jungfrau(Detector):
self._api.setNumberOfGates(n) self._api.setNumberOfGates(n)
@property @property
@error_handling
def n_probes(self): def n_probes(self):
return self._api.getNumberOfProbes() return self._api.getNumberOfProbes()
@ -112,7 +108,6 @@ class Jungfrau(Detector):
self._api.setNumberOfProbes(n) self._api.setNumberOfProbes(n)
@property @property
@error_handling
def storagecell_start(self): def storagecell_start(self):
""" """
First storage cell First storage cell
@ -126,7 +121,6 @@ class Jungfrau(Detector):
@property @property
@error_handling
def n_storagecells(self): def n_storagecells(self):
""" """
number of storage cells used for the measurements number of storage cells used for the measurements
@ -214,7 +208,6 @@ class Jungfrau(Detector):
self._api.resetTemperatureEvent() self._api.resetTemperatureEvent()
@property @property
@error_handling
def rx_udpport(self): def rx_udpport(self):
""" """
UDP port for the receiver. Each module have one port. UDP port for the receiver. Each module have one port.
@ -261,7 +254,6 @@ class Jungfrau(Detector):
@property @property
@error_handling
def detector_ip(self): def detector_ip(self):
s = self._api.getNetworkParameter('detectorip') s = self._api.getNetworkParameter('detectorip')
return element_if_equal(s) return element_if_equal(s)

1
python/sls_detector/jungfrau_ctb.py
View File

@ -157,7 +157,6 @@ class JungfrauCTB(Detector):
self._api.setJCTBSamples(value) self._api.setJCTBSamples(value)
@property @property
@error_handling
def readout_clock(self): def readout_clock(self):
""" """
Speed of the readout clock relative to the full speed Speed of the readout clock relative to the full speed