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

outdir for multi is for all

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-10-26 11:26:16 +01:00
parent feb6f0d0e2
commit dd1233bc7c
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4351,20 +4351,24 @@ string multiSlsDetector::checkReceiverOnline() {
string multiSlsDetector::setFilePath(string s) {
if(!s.empty())
fileIO::setFilePath(s);
/*
string ret="error", ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) {
ret1=detectors[idet]->setFilePath(s);
if (ret=="error")
ret=ret1;
else if (ret!=ret1)
ret="";
}
}
return ret;*/
string ret="errorerror", ret1;
if(!s.empty()){
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) {
ret1=detectors[idet]->setFilePath(s);
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
if (ret=="errorerror")
ret=ret1;
else if (ret!=ret1)
ret="";
}
}
fileIO::setFilePath(ret);
}
return fileIO::getFilePath();
}