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

clean up of multiSlsDetector::getSettingsDir

Browse Source
This commit is contained in:
Erik Frojdh 2018-05-24 18:14:02 +02:00
parent 301600e720
commit 4eef81fbe9
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3620,33 +3620,33 @@ int multiSlsDetector::exitServer() {
/** returns the detector trimbit/settings directory */
// char* multiSlsDetector::getSettingsDir() {
string multiSlsDetector::getSettingsDir() {
string s0="", s1="", s;
string concatenatedDir, firstDir;
bool dirNotSame = false;
//char ans[1000];
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) {
s=detectors[idet]->getSettingsDir();
string thisDir = detectors[idet]->getSettingsDir();
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
setErrorMask(getErrorMask()|(1<<idet));
if (s0=="")
s0=s;
else
s0+=string("+")+s;
if (s1=="")
s1=s;
else if (s1!=s)
s1="bad";
if (firstDir.empty()){
concatenatedDir = thisDir;
firstDir = thisDir;
}
else{
concatenatedDir += "+" + thisDir;
}
if (firstDir != thisDir)
dirNotSame = true;
}
}
if (s1=="bad")
return s0;
if (dirNotSame)
return concatenatedDir;
else
return s1;
// return ans;
return firstDir;
}