From c0a114345b8b987d595e2bbc3865f1a7e59dd2f7 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Mon, 27 Nov 2017 16:11:33 +0100 Subject: [PATCH] bug fix set error mask when setting wrong settings --- slsDetectorSoftware/slsDetector/slsDetector.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 88e8a1443..8e368142b 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -3556,6 +3556,8 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise break; default: printf("Unknown settings %s for this detector!\n", getDetectorSettings(isettings).c_str()); + setErrorMask((getErrorMask())|(SETTINGS_NOT_SET)); + break; } return thisDetector->currentSettings; } @@ -3681,7 +3683,8 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise 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{ if (imod<0) { modmi=0;