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 branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
Erik Frojdh
2020-09-23 15:09:25 +02:00
parent 3432343adb d06e0d1e7f
commit 23720e3c63
3 changed files with 58 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
python/slsdet/detector.py
View File

@ -930,8 +930,7 @@ class Detector(CppDetectorApi):
Also restarts client zmq streaming if enabled. \n
Default connects to receiver zmq streaming out port (30001). \n
Must be different for every detector (and udp port). \n
Multi command will automatically increment for individual modules, use setClientZmqPort. \n
Multi command will automatically increment for individual modules, use setClientZmqPort.
Example
--------
>>> d.zmqport
@ -1512,14 +1511,13 @@ class Detector(CppDetectorApi):
@property
def virtual(self):
"""
Setup with n virtual servers running on localhost
starting with port p
Setup with n virtual servers running on localhost starting with control port p
Note
----
Every virtual server will have a stop port (control port + 1)
Example
---------
>>> d.virtual = n, p
"""
raise NotImplementedError('Virtual is set only')
@ -2182,8 +2180,8 @@ class Detector(CppDetectorApi):
@property
def vetofile(self):
"""
[Gotthard2] Set veto reference for each 128 channels for specific chip.
The file should have 128 rows of gain index and 12 bit value in dec
[Gotthard2] Set veto reference for each 128 channels for specific chip. \n
The file should have 128 rows of gain index and 12 bit value in dec.
Example
---------
@ -2208,6 +2206,17 @@ class Detector(CppDetectorApi):
@property
def vetophoton(self):
"""
[Gotthard2] Set veto reference for 128 channels for chip ichip according to reference file
and #photons and energy in keV.
Note
----
Arguments: (chip_index, n_photons, photon_energy, fname)
:getter: Not Implemented
Example
-------
>>> d.vetophoton = (2, 24, 2560, '/tmp/bla.txt')
"""
raise NotImplementedError('vetofile is set only')
@vetophoton.setter
@ -2220,12 +2229,9 @@ class Detector(CppDetectorApi):
def vetoref(self):
"""
[Gotthard2] Set veto reference for all 128 channels for all chips.
Example
----------
>>> d.vetoref = chip, value
"""
raise NotImplementedError('vetoref is set only')
@ -2786,7 +2792,7 @@ class Detector(CppDetectorApi):
@property
@element
def v_b(self):
"""[Ctb] Voltage supply a in mV."""
"""[Ctb] Voltage supply b in mV."""
return self.getDAC(dacIndex.V_POWER_B, True)
@v_b.setter
@ -2796,7 +2802,7 @@ class Detector(CppDetectorApi):
@property
@element
def v_c(self):
"""[Ctb] Voltage supply a in mV."""
"""[Ctb] Voltage supply c in mV."""
return self.getDAC(dacIndex.V_POWER_C, True)
@v_c.setter
@ -2806,7 +2812,7 @@ class Detector(CppDetectorApi):
@property
@element
def v_d(self):
"""[Ctb] Voltage supply a in mV."""
"""[Ctb] Voltage supply d in mV."""
return self.getDAC(dacIndex.V_POWER_D, True)
@v_d.setter
@ -2816,7 +2822,11 @@ class Detector(CppDetectorApi):
@property
@element
def v_io(self):
"""[Ctb] Voltage supply a in mV."""
"""[Ctb] Voltage supply io in mV. Minimum 1200 mV.
Note
----
Must be the first power regulator to be set after fpga reset (on-board detector server start up).
"""
return self.getDAC(dacIndex.V_POWER_IO, True)
@v_io.setter