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

renaming generic call

Browse Source
This commit is contained in:
Erik Frojdh
2018-05-25 11:06:33 +02:00
parent 883317dd28
commit 2f8c1b453e
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3423,10 +3423,11 @@ int multiSlsDetector::exitServer()
return ival; return ival;
} }
std::string multiSlsDetector::callDetectors(std::string (slsDetector::*somefunc)()) string multiSlsDetector::callDetectorMemeber(string (slsDetector::*somefunc)())
{ {
string concatenatedValue, firstValue; string concatenatedValue, firstValue;
bool valueNotSame = false; bool valueNotSame = false;
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) { for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) { if (detectors[idet]) {
string thisValue = (detectors[idet]->*somefunc)(); string thisValue = (detectors[idet]->*somefunc)();
@ -3449,10 +3450,11 @@ std::string multiSlsDetector::callDetectors(std::string (slsDetector::*somefunc)
else else
return firstValue; return firstValue;
} }
/** returns the detector trimbit/settings directory */ /** returns the detector trimbit/settings directory */
string multiSlsDetector::getSettingsDir() string multiSlsDetector::getSettingsDir()
{ {
return callDetectors(&slsDetector::getSettingsDir); return callDetectorMemeber(&slsDetector::getSettingsDir);
} }
/** sets the detector trimbit/settings directory \sa sharedSlsDetector */ /** sets the detector trimbit/settings directory \sa sharedSlsDetector */
@ -3532,7 +3534,7 @@ int multiSlsDetector::getTrimEn(int* ene)
*/ */
string multiSlsDetector::getCalDir() string multiSlsDetector::getCalDir()
{ {
return callDetectors(&slsDetector::getCalDir); return callDetectorMemeber(&slsDetector::getCalDir);
} }
/** /**
@ -3706,7 +3708,7 @@ int multiSlsDetector::lockServer(int p)
string multiSlsDetector::getLastClientIP() string multiSlsDetector::getLastClientIP()
{ {
return callDetectors(&slsDetector::getLastClientIP); return callDetectorMemeber(&slsDetector::getLastClientIP);
} }
int multiSlsDetector::setReadOutFlags(readOutFlags flag) int multiSlsDetector::setReadOutFlags(readOutFlags flag)
@ -3781,7 +3783,7 @@ slsDetectorDefs::externalSignalFlag multiSlsDetector::setExternalSignalFlags(ext
string multiSlsDetector::getSettingsFile() string multiSlsDetector::getSettingsFile()
{ {
return callDetectors(&slsDetector::getSettingsFile); return callDetectorMemeber(&slsDetector::getSettingsFile);
} }
int multiSlsDetector::configureMAC() int multiSlsDetector::configureMAC()
@ -6013,7 +6015,7 @@ int multiSlsDetector::lockReceiver(int lock)
string multiSlsDetector::getReceiverLastClientIP() string multiSlsDetector::getReceiverLastClientIP()
{ {
return callDetectors(&slsDetector::getReceiverLastClientIP); return callDetectorMemeber(&slsDetector::getReceiverLastClientIP);
} }
int multiSlsDetector::exitReceiver() int multiSlsDetector::exitReceiver()

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1044,7 +1044,7 @@ class multiSlsDetector : public slsDetectorUtils {
std::string callDetectors(std::string(slsDetector::*somefunc)()); std::string callDetectorMemeber(std::string(slsDetector::*somefunc)());
/** returns the detector trimbit/settings directory \sa sharedSlsDetector */ /** returns the detector trimbit/settings directory \sa sharedSlsDetector */
std::string getSettingsDir(); std::string getSettingsDir();