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

replacing ReceiverReadTimer, Frequency calibratePedestal

Browse Source
This commit is contained in:
Erik Frojdh 2018-05-25 11:44:39 +02:00
parent 7702865409
commit ad14381ab4
1 changed files with 12 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3423,12 +3423,13 @@ int multiSlsDetector::exitServer()
return ival; return ival;
} }
int multiSlsDetector::callDetectorMemeber(int (slsDetector::*somefunc)(int), int value){ int multiSlsDetector::callDetectorMemeber(int (slsDetector::*somefunc)(int), int value)
int ret = -100, ret1; {
int ret = -100, ret1;
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]->setReceiverSilentMode(i); // ret1 = detectors[idet]->setReceiverSilentMode(i);
ret1 = (detectors[idet]->*somefunc)(value); ret1 = (detectors[idet]->*somefunc)(value);
if (detectors[idet]->getErrorMask()) if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet)); setErrorMask(getErrorMask() | (1 << idet));
if (ret == -100) if (ret == -100)
@ -3439,8 +3440,6 @@ int multiSlsDetector::callDetectorMemeber(int (slsDetector::*somefunc)(int), int
return ret; return ret;
} }
string multiSlsDetector::callDetectorMemeber(string (slsDetector::*somefunc)()) string multiSlsDetector::callDetectorMemeber(string (slsDetector::*somefunc)())
{ {
string concatenatedValue, firstValue; string concatenatedValue, firstValue;
@ -3801,7 +3800,7 @@ slsDetectorDefs::externalSignalFlag multiSlsDetector::setExternalSignalFlags(ext
string multiSlsDetector::getSettingsFile() string multiSlsDetector::getSettingsFile()
{ {
return callDetectorMemeber(&slsDetector::getSettingsFile); return callDetectorMemeber(&slsDetector::getSettingsFile);
} }
int multiSlsDetector::configureMAC() int multiSlsDetector::configureMAC()
@ -6151,59 +6150,17 @@ int64_t multiSlsDetector::clearAllErrorMask()
int multiSlsDetector::calibratePedestal(int frames) int multiSlsDetector::calibratePedestal(int frames)
{ {
int ret = -100, ret1; return callDetectorMemeber(&slsDetector::calibratePedestal, frames);
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) {
ret1 = detectors[idet]->calibratePedestal(frames);
if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet));
if (ret == -100)
ret = ret1;
else if (ret != ret1)
ret = -1;
}
}
return ret;
} }
int multiSlsDetector::setReadReceiverFrequency(int freq) int multiSlsDetector::setReadReceiverFrequency(int freq)
{ {
int ret = -100, ret1; return callDetectorMemeber(&slsDetector::setReadReceiverFrequency, freq);
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) {
ret1 = detectors[idet]->setReadReceiverFrequency(freq);
if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet));
if (ret == -100)
ret = ret1;
else if (ret != ret1)
ret = -1;
}
}
return ret;
} }
int multiSlsDetector::setReceiverReadTimer(int time_in_ms) int multiSlsDetector::setReceiverReadTimer(int time_in_ms)
{ {
int ret = -100, ret1; return callDetectorMemeber(&slsDetector::setReceiverReadTimer, time_in_ms);
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) {
ret1 = detectors[idet]->setReceiverReadTimer(time_in_ms);
if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet));
if (ret == -100)
ret = ret1;
else if (ret != ret1)
ret = -1;
}
}
return ret;
} }
int multiSlsDetector::enableDataStreamingToClient(int enable) int multiSlsDetector::enableDataStreamingToClient(int enable)
@ -6270,22 +6227,22 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable)
int multiSlsDetector::enableReceiverCompression(int i) int multiSlsDetector::enableReceiverCompression(int i)
{ {
return callDetectorMemeber(&slsDetector::enableReceiverCompression, i); return callDetectorMemeber(&slsDetector::enableReceiverCompression, i);
} }
int multiSlsDetector::enableTenGigabitEthernet(int i) int multiSlsDetector::enableTenGigabitEthernet(int i)
{ {
return callDetectorMemeber(&slsDetector::enableTenGigabitEthernet, i); return callDetectorMemeber(&slsDetector::enableTenGigabitEthernet, i);
} }
int multiSlsDetector::setReceiverFifoDepth(int i) int multiSlsDetector::setReceiverFifoDepth(int i)
{ {
return callDetectorMemeber(&slsDetector::setReceiverFifoDepth, i); return callDetectorMemeber(&slsDetector::setReceiverFifoDepth, i);
} }
int multiSlsDetector::setReceiverSilentMode(int i) int multiSlsDetector::setReceiverSilentMode(int i)
{ {
return callDetectorMemeber(&slsDetector::setReceiverSilentMode, i); return callDetectorMemeber(&slsDetector::setReceiverSilentMode, i);
} }
/** opens pattern file and sends pattern to CTB /** opens pattern file and sends pattern to CTB