detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 08:39:21 +01:00
Code Issues Actions Packages Releases Activity

added error mask for loading/writing config file to be caught by python

Browse Source
This commit is contained in:
maliakal_d
2018-03-26 18:07:10 +02:00
parent 14546247e4
commit 5340b8ef24
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -5149,6 +5149,7 @@ int multiSlsDetector::readConfigurationFile(string const fname){
} else {
std::cout<< "Error opening configuration file " << fname << " for reading" << std::endl;
setErrorMask(getErrorMask()|MULTI_CONFIG_FILE_ERROR);
return FAIL;
}
#ifdef VERBOSE
@@ -5255,6 +5256,7 @@ int multiSlsDetector::writeConfigurationFile(string const fname){
#endif
} else {
std::cout<< "Error opening configuration file " << fname << " for writing" << std::endl;
setErrorMask(getErrorMask()|MULTI_CONFIG_FILE_ERROR);
ret = FAIL;
}
@@ -6510,6 +6512,10 @@ string multiSlsDetector::getErrorMessage(int &critical){
"Please check the console\n");
critical = 0;
}
if(multiMask & MULTI_CONFIG_FILE_ERROR) {
retval.append("Could not load Config File\n");
critical = 0;
}
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) {