Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor

This commit is contained in:
Erik Frojdh
2018-10-10 12:17:36 +02:00
10 changed files with 110 additions and 49 deletions

View File

@@ -2708,6 +2708,18 @@ int multiSlsDetector::exitReceiver(int detPos) {
}
int multiSlsDetector::execReceiverCommand(std::string cmd, int detPos) {
// single
if (detPos >= 0) {
return detectors[detPos]->execReceiverCommand(cmd);
}
// multi
auto r = parallelCall(&slsDetector::execReceiverCommand, cmd);
return sls::allEqualTo(r, static_cast<int>(OK)) ? OK : FAIL;
}
std::string multiSlsDetector::getFilePath(int detPos) {
// single
if (detPos >= 0) {