This commit is contained in:
maliakal_d 2020-09-09 16:39:48 +02:00
parent a9d1a78662
commit 02d4769f6a
2 changed files with 38 additions and 8 deletions

View File

@ -1487,6 +1487,13 @@ class Detector(CppDetectorApi):
@property @property
@element @element
def temp_threshold(self): def temp_threshold(self):
"""
[Jungfrau] Threshold temperature in degrees.
Note
-----
If temperature crosses threshold temperature and temperature control is enabled, power to chip will be switched off and temperature event occurs. \n
To power on chip again, temperature has to be less than threshold temperature and temperature event has to be cleared/reset.
"""
return self.getThresholdTemperature() return self.getThresholdTemperature()
@temp_threshold.setter @temp_threshold.setter
@ -1496,6 +1503,14 @@ class Detector(CppDetectorApi):
@property @property
@element @element
def temp_event(self): def temp_event(self):
"""
[Jungfrau] 1, if a temperature event occured. \n
Note
----
If temperature crosses threshold temperature and temperature control is enabled, power to chip will be switched off and temperature event occurs. \n
To power on chip again, temperature has to be less than threshold temperature and temperature event has to be cleared/reset.
:setter: To clear the event, set it to 0.
"""
return self.getTemperatureEvent() return self.getTemperatureEvent()
@temp_event.setter @temp_event.setter
@ -1507,6 +1522,14 @@ class Detector(CppDetectorApi):
@property @property
@element @element
def temp_control(self): def temp_control(self):
"""
[Jungfrau] Temperature control enable.
Note
-----
Default is 0 (disabled). \n
If temperature crosses threshold temperature and temperature control is enabled, power to chip will be switched off and temperature event occurs. \n
To power on chip again, temperature has to be less than threshold temperature and temperature event has to be cleared/reset.
"""
return self.getTemperatureControl() return self.getTemperatureControl()
@temp_control.setter @temp_control.setter
@ -1859,6 +1882,12 @@ class Detector(CppDetectorApi):
@property @property
def syncclk(self): def syncclk(self):
"""
[Ctb][Moench] Sync clock in MHz.
Note
-----
:setter: Not implemented
"""
return element_if_equal(self.getSYNCClock()) return element_if_equal(self.getSYNCClock())
@property @property

View File

@ -963,23 +963,24 @@ class Detector {
/** /**
* [Jungfrau]Set threshold temperature * [Jungfrau]Set threshold temperature
* If temperature crosses threshold temperature * If temperature crosses threshold temperature
* and temperature control is enabled, * and temperature control is enabled (default is disabled), power to chip
* power to chip will be switched off and * will be switched off and temperature event will be set. \n To power on
* temperature event will be set * chip again, temperature has to be less than threshold temperature and
* val is value in degrees * temperature event has to be cleared. val is value in degrees
*/ */
void setThresholdTemperature(int temp, Positions pos = {}); void setThresholdTemperature(int temp, Positions pos = {});
/** [Jungfrau] */ /** [Jungfrau] */
Result<bool> getTemperatureControl(Positions pos = {}) const; Result<bool> getTemperatureControl(Positions pos = {}) const;
/** [Jungfrau] */ /** [Jungfrau] refer to setThresholdTemperature
* Default is disabled */
void setTemperatureControl(bool enable, Positions pos = {}); void setTemperatureControl(bool enable, Positions pos = {});
/** [Jungfrau] */ /** [Jungfrau] refer to setThresdholdTemperature */
Result<int> getTemperatureEvent(Positions pos = {}) const; Result<int> getTemperatureEvent(Positions pos = {}) const;
/** [Jungfrau] */ /** [Jungfrau] refer to setThresdholdTemperature */
void resetTemperatureEvent(Positions pos = {}); void resetTemperatureEvent(Positions pos = {});
/** [Jungfrau] */ /** [Jungfrau] */
@ -1201,7 +1202,7 @@ class Detector {
/** [CTB][Moench] */ /** [CTB][Moench] */
void setRUNClock(int value_in_MHz, Positions pos = {}); void setRUNClock(int value_in_MHz, Positions pos = {});
/** [CTB][Moench] */ /** [CTB][Moench] in MHZ */
Result<int> getSYNCClock(Positions pos = {}) const; Result<int> getSYNCClock(Positions pos = {}) const;
/** [CTB][Moench] */ /** [CTB][Moench] */