This commit is contained in:
2020-08-21 16:00:33 +02:00
parent 396685e6a9
commit e85326d415
3 changed files with 46 additions and 11 deletions

View File

@ -125,6 +125,7 @@ class Detector(CppDetectorApi):
@property @property
def hostname(self): def hostname(self):
"""Frees shared memory and sets hostname (or IP address) of all modules concatenated by + """
return self.getHostname() return self.getHostname()
@hostname.setter @hostname.setter
@ -665,6 +666,14 @@ class Detector(CppDetectorApi):
@property @property
def highvoltage(self): def highvoltage(self):
"""High voltage to the sensor in Voltage.
Note
-----
[Gotthard] 0, 90, 110, 120, 150, 180, 200
[Eiger][Mythen3][Gotthard2] 0 - 200
[Jungfrau][Ctb][Moench] 0, 60 - 200
"""
return element_if_equal(self.getHighVoltage()) return element_if_equal(self.getHighVoltage())
@highvoltage.setter @highvoltage.setter
@ -1415,24 +1424,54 @@ class Detector(CppDetectorApi):
@property @property
@element @element
def im_a(self): def im_a(self):
"""[Ctb] Measured current of power supply a in mA.
Notes
-----
:setter: Not implemented
"""
return self.getMeasuredCurrent(dacIndex.I_POWER_A) return self.getMeasuredCurrent(dacIndex.I_POWER_A)
@property @property
@element @element
def im_b(self): def im_b(self):
"""[Ctb] Measured current of power supply b in mA.
Notes
-----
:setter: Not implemented
"""
return self.getMeasuredCurrent(dacIndex.I_POWER_B) return self.getMeasuredCurrent(dacIndex.I_POWER_B)
@property @property
@element @element
def im_c(self): def im_c(self):
"""[Ctb] Measured current of power supply c in mA.
Notes
-----
:setter: Not implemented
"""
return self.getMeasuredCurrent(dacIndex.I_POWER_C) return self.getMeasuredCurrent(dacIndex.I_POWER_C)
@property @property
@element @element
def im_d(self): def im_d(self):
"""[Ctb] Measured current of power supply d in mA.
Notes
-----
:setter: Not implemented
"""
return self.getMeasuredCurrent(dacIndex.I_POWER_D) return self.getMeasuredCurrent(dacIndex.I_POWER_D)
@property @property
@element @element
def im_io(self): def im_io(self):
"""[Ctb] Measured current of power supply io in mA.
Notes
-----
:setter: Not implemented
"""
return self.getMeasuredCurrent(dacIndex.I_POWER_IO) return self.getMeasuredCurrent(dacIndex.I_POWER_IO)

View File

@ -55,8 +55,7 @@ class Detector {
Result<std::string> getHostname(Positions pos = {}) const; Result<std::string> getHostname(Positions pos = {}) const;
/* Frees shared memory, adds detectors to the list /* Frees shared memory, adds detectors to the list */
* and updates local detector cache */
void setHostname(const std::vector<std::string> &hostname); void setHostname(const std::vector<std::string> &hostname);
/** connects to n servers at local host starting at specific control port */ /** connects to n servers at local host starting at specific control port */

View File

@ -1846,19 +1846,16 @@ std::string CmdProxy::GateDelay(int action) {
"auto and trigger mode (internal gating)." "auto and trigger mode (internal gating)."
<< '\n'; << '\n';
} else if (cmd == "gatedelay1") { } else if (cmd == "gatedelay1") {
os << "[n_value]\n\t[Mythen3] Gate Delay of gate signal 1 in " os << "[n_value]\n\t[Mythen3] Gate Delay of gate signal 1 in auto "
"auto and " "and trigger mode (internal gating)."
"trigger mode (internal gating)."
<< '\n'; << '\n';
} else if (cmd == "gatedelay2") { } else if (cmd == "gatedelay2") {
os << "[n_value]\n\t[Mythen3] Gate Delay of gate signal 2 in " os << "[n_value]\n\t[Mythen3] Gate Delay of gate signal 2 in auto "
"auto and " "and trigger mode (internal gating)."
"trigger mode (internal gating)."
<< '\n'; << '\n';
} else { } else {
os << "[n_value]\n\t[Mythen3] Gate Delay of gate signal 3 in " os << "[n_value]\n\t[Mythen3] Gate Delay of gate signal 3 in auto "
"auto and " "and trigger mode (internal gating)."
"trigger mode (internal gating)."
<< '\n'; << '\n';
} }
} else if (action == defs::GET_ACTION) { } else if (action == defs::GET_ACTION) {