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

Merge branch 'jungfrau1.1' into j11udpate

Browse Source
This commit is contained in:
maliakal_d
2021-08-03 20:31:43 +02:00
parent 5ba41894ef c7326504eb
commit 6dfcd9607f
7 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/src/CmdProxy.h
View File

@ -1838,7 +1838,7 @@ class CmdProxy {
"cleared.");
INTEGER_COMMAND_VEC_ID(
auto_comp_disable, getAutoCompDisable, setAutoCompDisable,
auto_comp_disable, getAutoComparatorDisable, setAutoComparatorDisable,
StringTo<int>,
"[0, 1]\n\t[Jungfrau] Auto comparator disable mode. By default, the "
"on-chip gain switching is active during the entire exposure.This mode "

4
slsDetectorSoftware/src/Detector.cpp
View File

@ -1451,11 +1451,11 @@ void Detector::resetTemperatureEvent(Positions pos) {
pimpl->Parallel(&Module::resetTemperatureEvent, pos);
}
Result<bool> Detector::getAutoCompDisable(Positions pos) const {
Result<bool> Detector::getAutoComparatorDisable(Positions pos) const {
return pimpl->Parallel(&Module::getAutoComparatorDisableMode, pos);
}
void Detector::setAutoCompDisable(bool value, Positions pos) {
void Detector::setAutoComparatorDisable(bool value, Positions pos) {
pimpl->Parallel(&Module::setAutoComparatorDisableMode, pos, value);
}