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

cleaning up sgetDetectorsType

Browse Source
This commit is contained in:
Erik Frojdh 2018-05-24 16:32:20 +02:00
parent 24df69d57f
commit e65b416215
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -622,7 +622,6 @@ string multiSlsDetector::ssetDetectorsType(string name, int pos) {
} }
string multiSlsDetector::getHostname(int pos) { string multiSlsDetector::getHostname(int pos) {
string hostnames; string hostnames;
if (pos>=0){ if (pos>=0){
@ -654,35 +653,19 @@ slsDetectorDefs::detectorType multiSlsDetector::getDetectorsType(int pos) {
string multiSlsDetector::sgetDetectorsType(int pos) { string multiSlsDetector::sgetDetectorsType(int pos) {
string s;
string s=string("");
#ifdef VERBOSE
cout << "returning type" << pos << endl;
#endif
if (pos>=0) { if (pos>=0) {
if (detectors[pos]) if (detectors[pos])
return detectors[pos]->sgetDetectorsType(); return detectors[pos]->sgetDetectorsType();
} else { } else {
for (int ip=0; ip<thisMultiDetector->numberOfDetectors; ++ip) { for (int ip=0; ip<thisMultiDetector->numberOfDetectors; ++ip) {
#ifdef VERBOSE if (detectors[ip])
cout << "detector " << ip << endl; s+=detectors[ip]->sgetDetectorsType() + "+";
#endif
if (detectors[ip]) {
s+=detectors[ip]->sgetDetectorsType();
s+=string("+");
}
#ifdef VERBOSE
cout << "type " << s << endl;
#endif
} }
} }
return s; return s;
} }
int multiSlsDetector::getDetectorId(int pos) { int multiSlsDetector::getDetectorId(int pos) {
#ifdef VERBOSE #ifdef VERBOSE