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

minor clean

Browse Source
This commit is contained in:
Erik Frojdh 2018-05-28 12:22:25 +02:00
parent 06f84585af
commit 9d3fdaaadc
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -17,8 +17,6 @@ ID: $Id$
#include "slsDetector.h" #include "slsDetector.h"
#include "usersFunctions.h" #include "usersFunctions.h"
#include <iostream> #include <iostream>
#include <rapidjson/document.h> //json header in zmq stream #include <rapidjson/document.h> //json header in zmq stream
#include <string> #include <string>
@ -642,10 +640,6 @@ string multiSlsDetector::sgetDetectorsType(int pos)
int multiSlsDetector::getDetectorId(int pos) int multiSlsDetector::getDetectorId(int pos)
{ {
#ifdef VERBOSE
cout << "Getting detector ID " << pos << endl;
#endif
if (pos >= 0) { if (pos >= 0) {
if (detectors[pos]) if (detectors[pos])
return detectors[pos]->getDetectorId(); return detectors[pos]->getDetectorId();
@ -3307,6 +3301,7 @@ int multiSlsDetector::exitServer()
return ival; return ival;
} }
/* utility function to check a range of return values*/
int multiSlsDetector::minusOneIfDifferent(const std::vector<int>& return_values) int multiSlsDetector::minusOneIfDifferent(const std::vector<int>& return_values)
{ {
int ret = -100; int ret = -100;
@ -3323,36 +3318,43 @@ int multiSlsDetector::minusOneIfDifferent(const std::vector<int>& return_values)
return ret; return ret;
} }
// int multiSlsDetector::callDetectorMemeber(int (slsDetector::*somefunc)())
// {
// int ret = -100, ret1;
// for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet)
// if (detectors[idet]) {
// ret1 = (detectors[idet]->*somefunc)();
// if (detectors[idet]->getErrorMask())
// setErrorMask(getErrorMask() | (1 << idet));
// if (ret == -100)
// ret = ret1;
// else if (ret != ret1)
// ret = -1;
// }
// return ret;
// }
int multiSlsDetector::callDetectorMemeber(int (slsDetector::*somefunc)()) int multiSlsDetector::callDetectorMemeber(int (slsDetector::*somefunc)())
{ {
int ret = -100, ret1; std::vector<int> values(thisMultiDetector->numberOfDetectors, -1);
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet)
if (detectors[idet]) { if (detectors[idet]) {
ret1 = (detectors[idet]->*somefunc)(); values[idet] = (detectors[idet]->*somefunc)();
if (detectors[idet]->getErrorMask()) if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet)); setErrorMask(getErrorMask() | (1 << idet));
if (ret == -100)
ret = ret1;
else if (ret != ret1)
ret = -1;
} }
return ret; return minusOneIfDifferent(values);
} }
int multiSlsDetector::callDetectorMemeber(int (slsDetector::*somefunc)(int), int value) int multiSlsDetector::callDetectorMemeber(int (slsDetector::*somefunc)(int), int value)
{ {
int ret = -100, ret1; std::vector<int> values(thisMultiDetector->numberOfDetectors, -1);
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet)
if (detectors[idet]) { if (detectors[idet]) {
ret1 = (detectors[idet]->*somefunc)(value); values[idet] = (detectors[idet]->*somefunc)(value);
if (detectors[idet]->getErrorMask()) if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet)); setErrorMask(getErrorMask() | (1 << idet));
if (ret == -100)
ret = ret1;
else if (ret != ret1)
ret = -1;
} }
return ret; return minusOneIfDifferent(values);
} }
string multiSlsDetector::callDetectorMemeber(string (slsDetector::*somefunc)()) string multiSlsDetector::callDetectorMemeber(string (slsDetector::*somefunc)())