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

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

Browse Source
This commit is contained in:
maliakal_d
2018-05-28 19:17:37 +02:00
parent cf8b0de433 32c1a45e11
commit 15aaa93130
10 changed files with 5234 additions and 6175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11268
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

File diff suppressed because it is too large Load Diff

39
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1042,24 +1042,55 @@ class multiSlsDetector : public slsDetectorUtils {
//virtual runStatus getRunStatus()=0;
runStatus getRunStatus();
void setErrorMaskFromAllDetectors();
template<typename T>
bool allElemetsEqual(const std::vector<T>&);
template<typename T>
T callDetectorMember(T (slsDetector::*somefunc)());
std::string callDetectorMember(std::string(slsDetector::*somefunc)());
template<typename T, typename V>
T callDetectorMember(T (slsDetector::*somefunc)(V), V value);
template<typename T, typename P1, typename P2>
T callDetectorMember(T (slsDetector::*somefunc)(P1, P2), P1 par1, P2 par2);
//func0_t
template<typename T>
T parallelCallDetectorMember(T (slsDetector::*somefunc)());
//func1_t
template<typename T, typename P1>
T parallelCallDetectorMember(T (slsDetector::*somefunc)(P1), P1 value); //Should probably be templated
//func2_t
template<typename T, typename P1, typename P2>
T parallelCallDetectorMember(T (slsDetector::*somefunc)(P1, P2), P1 par1, P2 par2);
int parallelCallDetectorMember(int (slsDetector::*somefunc)(int, int, int), int v0, int v1, int v2); //Should probably be templated
template<typename T>
T minusOneIfDifferent(const std::vector<T>&);
/** returns the detector trimbit/settings directory \sa sharedSlsDetector */
char* getSettingsDir();
std::string getSettingsDir();
/** sets the detector trimbit/settings directory \sa sharedSlsDetector */
char* setSettingsDir(std::string s);
std::string setSettingsDir(std::string s);
/**
returns the location of the calibration files
\sa sharedSlsDetector
*/
char* getCalDir();
std::string getCalDir();
/**
sets the location of the calibration files
\sa sharedSlsDetector
*/
char* setCalDir(std::string s);
std::string setCalDir(std::string s);
std::string getNetworkParameter(networkParameter);