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

Merge branch 'developer' into checkargs

Browse Source
This commit is contained in:
Dhanya Thattil
2020-07-27 15:49:08 +02:00
committed by GitHub
parent dc33f1a5da 879b2c8864
commit 3ec637601d
7 changed files with 181 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/src/Module.cpp
View File

@ -1274,12 +1274,8 @@ void Module::setQuad(const bool enable) {
// Jungfrau Specific
int Module::getThresholdTemperature() const {
int arg = GET_FLAG;
auto retval = sendToDetectorStop<int>(F_THRESHOLD_TEMP, arg);
if (retval != 0) {
retval /= 1000;
}
return retval;
auto retval = sendToDetectorStop<int>(F_THRESHOLD_TEMP, GET_FLAG);
return retval / 1000;
}
void Module::setThresholdTemperature(int val) {