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

using callDetectorMember for portType

Browse Source
This commit is contained in:
Erik Frojdh 2018-05-29 15:51:55 +02:00
parent fc7ae98eee
commit 6cf7bf2e06
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3718,21 +3718,7 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s)
int multiSlsDetector::setPort(portType t, int p) int multiSlsDetector::setPort(portType t, int p)
{ {
return callDetectorMember(&slsDetector::setPort, t, p);
int ret = -100, ret1;
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) {
ret1 = detectors[idet]->setPort(t, p);
if (detectors[idet]->getErrorMask())
setErrorMask(getErrorMask() | (1 << idet));
if (ret == -100)
ret = ret1;
else if (ret != ret1)
ret = -1;
}
}
return ret;
} }
int multiSlsDetector::lockServer(int p) int multiSlsDetector::lockServer(int p)
@ -5789,7 +5775,7 @@ string multiSlsDetector::getReceiverLastClientIP()
int multiSlsDetector::exitReceiver() int multiSlsDetector::exitReceiver()
{ {
//(Erik) logic is flawed should return fail if any fails //(Erik) logic is flawed should return fail if any fails?
int ival = FAIL, iv; int ival = FAIL, iv;
for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) { for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) {
if (detectors[idet]) { if (detectors[idet]) {
@ -6048,8 +6034,6 @@ bool multiSlsDetector::isAcquireReady()
return OK; return OK;
} }
int multiSlsDetector::checkVersionCompatibility(portType t) { int multiSlsDetector::checkVersionCompatibility(portType t) {
return parallelCallDetectorMember(&slsDetector::checkVersionCompatibility, t); return parallelCallDetectorMember(&slsDetector::checkVersionCompatibility, t);
} }