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