mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-11-16 15:50:01 +01:00
Merge branch 'developer' into dev/fix-pattern-generator
This commit is contained in:
132 files changed
+158016
-2488
No files matched your search
@@ -371,10 +371,10 @@ class Detector {
|
||||
Result<defs::timingMode> getTimingMode(Positions pos = {}) const;
|
||||
|
||||
/**
|
||||
* [Jungfrau][Moench][CTB][Gotthard2][Xilinx CTB]
|
||||
* Options: AUTO_TIMING, TRIGGER_EXPOSURE \n [Mythen3] Options: AUTO_TIMING,
|
||||
* TRIGGER_EXPOSURE, GATED, TRIGGER_GATED \n [Eiger] Options: AUTO_TIMING,
|
||||
* TRIGGER_EXPOSURE, GATED, BURST_TRIGGER
|
||||
* [Jungfrau][Moench][CTB][Gotthard2]
|
||||
* Options: AUTO_TIMING, TRIGGER_EXPOSURE \n [Mythen3][Xilinx CTB] Options:
|
||||
* AUTO_TIMING, TRIGGER_EXPOSURE, GATED, TRIGGER_GATED \n [Eiger] Options:
|
||||
* AUTO_TIMING, TRIGGER_EXPOSURE, GATED, BURST_TRIGGER
|
||||
*/
|
||||
void setTimingMode(defs::timingMode value, Positions pos = {});
|
||||
|
||||
@@ -1301,7 +1301,7 @@ class Detector {
|
||||
* ************************************************/
|
||||
|
||||
/** [Jungfrau] */
|
||||
Result<double> getChipVersion(Positions pos = {}) const;
|
||||
Result<std::string> getChipVersion(Positions pos = {}) const;
|
||||
|
||||
/** [Jungfrau][Moench] */
|
||||
Result<int> getThresholdTemperature(Positions pos = {}) const;
|
||||
|
||||
Reference in new issue
Block a user