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

bug fix set error mask when setting wrong settings

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-27 16:11:33 +01:00
parent 386ef7766c
commit c0a114345b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3556,6 +3556,8 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
break; break;
default: default:
printf("Unknown settings %s for this detector!\n", getDetectorSettings(isettings).c_str()); printf("Unknown settings %s for this detector!\n", getDetectorSettings(isettings).c_str());
setErrorMask((getErrorMask())|(SETTINGS_NOT_SET));
break;
} }
return thisDetector->currentSettings; return thisDetector->currentSettings;
} }
@ -3681,7 +3683,8 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
if (isettings != thisDetector->currentSettings) { if (isettings != thisDetector->currentSettings) {
std::cout<< "Unknown settings for this detector!" << std::endl; printf("Unknown settings %s for this detector!\n", getDetectorSettings(isettings).c_str());
setErrorMask((getErrorMask())|(SETTINGS_NOT_SET));
}else{ }else{
if (imod<0) { if (imod<0) {
modmi=0; modmi=0;