From 6cf7bf2e0621bf639ba93cfa83f07b27651edb79 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Tue, 29 May 2018 15:51:55 +0200 Subject: [PATCH] using callDetectorMember for portType --- .../multiSlsDetector/multiSlsDetector.cpp | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 878ca0985..127757165 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -3718,21 +3718,7 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s) int multiSlsDetector::setPort(portType t, int 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; + return callDetectorMember(&slsDetector::setPort, t, p); } int multiSlsDetector::lockServer(int p) @@ -5789,7 +5775,7 @@ string multiSlsDetector::getReceiverLastClientIP() 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; for (int idet = 0; idet < thisMultiDetector->numberOfDetectors; ++idet) { if (detectors[idet]) { @@ -6048,8 +6034,6 @@ bool multiSlsDetector::isAcquireReady() return OK; } - - int multiSlsDetector::checkVersionCompatibility(portType t) { return parallelCallDetectorMember(&slsDetector::checkVersionCompatibility, t); }