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

Merge branch '2.1' into 2.1.1-rc

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-06 08:51:06 +02:00
commit 2fdc4389e2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4674,7 +4674,8 @@ string multiSlsDetector::checkReceiverOnline() {
string multiSlsDetector::setFilePath(string s) { string multiSlsDetector::setFilePath(string s) {
string ret="errorerror", ret1; string ret="errorerror", ret1;
if(!s.empty()){ //if the sls file paths are different, it should be realized by always using setfilepath even if string empty
//if(!s.empty()){
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) { for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) { if (detectors[idet]) {
@ -4688,7 +4689,7 @@ string multiSlsDetector::setFilePath(string s) {
} }
} }
fileIO::setFilePath(ret); fileIO::setFilePath(ret);
} //}
return fileIO::getFilePath(); return fileIO::getFilePath();
} }