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

commented out concatResultOrPos which seems not to be used

Browse Source
This commit is contained in:
Erik Frojdh 2018-10-10 12:01:30 +02:00
parent 938dd5e06c
commit 6147383677
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -107,17 +107,17 @@ std::vector<RT> multiSlsDetector::parallelCall(RT (slsDetector::*somefunc)(CT...
} }
std::string multiSlsDetector::concatResultOrPos(std::string (slsDetector::*somefunc)(int), int pos) { // std::string multiSlsDetector::concatResultOrPos(std::string (slsDetector::*somefunc)(int), int pos) {
if (pos >= 0 && pos < (int)detectors.size()) { // if (pos >= 0 && pos < (int)detectors.size()) {
return (detectors[pos].get()->*somefunc)(pos); // return (detectors[pos].get()->*somefunc)(pos);
} else { // } else {
std::string s; // std::string s;
for (auto& d : detectors) { // for (auto& d : detectors) {
s += (d.get()->*somefunc)(pos) + "+"; // s += (d.get()->*somefunc)(pos) + "+";
} // }
return s; // return s;
} // }
} // }
int multiSlsDetector::decodeNChannel(int offsetX, int offsetY, int& channelX, int& channelY) { int multiSlsDetector::decodeNChannel(int offsetX, int offsetY, int& channelX, int& channelY) {

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -163,7 +163,7 @@ public:
* @param pos positin of detector in array (-1 is for all) * @param pos positin of detector in array (-1 is for all)
* @returns result for detector at that position or concatenated string of all detectors * @returns result for detector at that position or concatenated string of all detectors
*/ */
std::string concatResultOrPos(std::string (slsDetector::*somefunc)(int), int pos); // std::string concatResultOrPos(std::string (slsDetector::*somefunc)(int), int pos);
/** /**
* Decodes which detector and the corresponding channel numbers for it * Decodes which detector and the corresponding channel numbers for it