From e65b41621517c1ed92a6b93a18381c415c31af82 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Thu, 24 May 2018 16:32:20 +0200 Subject: [PATCH] cleaning up sgetDetectorsType --- .../multiSlsDetector/multiSlsDetector.cpp | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index c4764e6c7..bea8ff9ef 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -622,7 +622,6 @@ string multiSlsDetector::ssetDetectorsType(string name, int pos) { } - string multiSlsDetector::getHostname(int pos) { string hostnames; if (pos>=0){ @@ -654,35 +653,19 @@ slsDetectorDefs::detectorType multiSlsDetector::getDetectorsType(int pos) { string multiSlsDetector::sgetDetectorsType(int pos) { - - string s=string(""); -#ifdef VERBOSE - cout << "returning type" << pos << endl; -#endif + string s; if (pos>=0) { if (detectors[pos]) return detectors[pos]->sgetDetectorsType(); } else { for (int ip=0; ipnumberOfDetectors; ++ip) { -#ifdef VERBOSE - cout << "detector " << ip << endl; -#endif - if (detectors[ip]) { - s+=detectors[ip]->sgetDetectorsType(); - s+=string("+"); - } -#ifdef VERBOSE - cout << "type " << s << endl; -#endif + if (detectors[ip]) + s+=detectors[ip]->sgetDetectorsType() + "+"; } } return s; - } - - - int multiSlsDetector::getDetectorId(int pos) { #ifdef VERBOSE