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

templated functions in multi

Browse Source
This commit is contained in:
Erik Frojdh 2018-05-28 13:23:30 +02:00
parent 22ef1cee8b
commit 49d6dcb6e2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3302,9 +3302,10 @@ int multiSlsDetector::exitServer()
} }
/* utility function to check a range of return values*/ /* utility function to check a range of return values*/
int multiSlsDetector::minusOneIfDifferent(const std::vector<int>& return_values) template<typename T>
T multiSlsDetector::minusOneIfDifferent(const std::vector<T>& return_values)
{ {
int ret = -100; T ret = -100;
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) { for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) { if (detectors[idet]) {
if (ret == -100) if (ret == -100)

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1050,7 +1050,9 @@ class multiSlsDetector : public slsDetectorUtils {
int parallelCallDetectorMember(int (slsDetector::*somefunc)()); int parallelCallDetectorMember(int (slsDetector::*somefunc)());
int parallelCallDetectorMember(int (slsDetector::*somefunc)(int), int value); //Should probably be templated int parallelCallDetectorMember(int (slsDetector::*somefunc)(int), int value); //Should probably be templated
int parallelCallDetectorMember(int (slsDetector::*somefunc)(int, int, int), int v0, int v1, int v2); //Should probably be templated int parallelCallDetectorMember(int (slsDetector::*somefunc)(int, int, int), int v0, int v1, int v2); //Should probably be templated
int minusOneIfDifferent(const std::vector<int>&);
template<typename T>
T minusOneIfDifferent(const std::vector<T>&);
/** returns the detector trimbit/settings directory \sa sharedSlsDetector */ /** returns the detector trimbit/settings directory \sa sharedSlsDetector */
std::string getSettingsDir(); std::string getSettingsDir();