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

merge fix

Browse Source
This commit is contained in:
maliakal_d
2021-08-06 16:11:58 +02:00
parent 9f6b951988 2c53a134cd
commit cc3aede979
17 changed files with 126 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/slsdet/detector.py
View File

@ -7,7 +7,7 @@ timingMode = slsDetectorDefs.timingMode
speedLevel = slsDetectorDefs.speedLevel
dacIndex = slsDetectorDefs.dacIndex
detectorType = slsDetectorDefs.detectorType
ethernetInterface = slsDetectorDefs.ethernetInterface
streamingInterface = slsDetectorDefs.streamingInterface
defs = slsDetectorDefs
@ -2357,7 +2357,7 @@ class Detector(CppDetectorApi):
Note
----
Default: both off
Options: NONE, I3GBE, 10GBE (debugging)
Options: NONE, LOW_LATENCY_LINK, 10GBE (debugging)
Debugging interface also enables second interface in receiver (separate file), which also restarts zmq streaming if enabled.
"""
return self.getVetoStream()
@ -2373,10 +2373,10 @@ class Detector(CppDetectorApi):
"""[Gotthard2] Algorithm used for veto
Example
----------
>>> d.vetoalg = defs.DEFAULT_ALGORITHM, defs.I10GBE
>>> d.vetoalg = defs.DEFAULT_ALGORITHM, defs.ETHERNET_10GB
"""
result = {}
interface = [ethernetInterface.I3GBE, ethernetInterface.I10GBE]
interface = [streamingInterface.LOW_LATENCY_LINK, streamingInterface.ETHERNET_10GB]
for eth in interface:
result[eth] = element_if_equal(self.getVetoAlgorithm(eth))
return result