From 206740efd6fc3c96fc09362b31c7f19816a57909 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Fri, 9 Aug 2019 15:35:33 +0200 Subject: [PATCH] WIP --- slsDetectorSoftware/include/Detector.h | 9 +++++++-- slsDetectorSoftware/src/Detector.cpp | 7 +++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/include/Detector.h b/slsDetectorSoftware/include/Detector.h index beed21c63..01210f044 100644 --- a/slsDetectorSoftware/include/Detector.h +++ b/slsDetectorSoftware/include/Detector.h @@ -8,8 +8,7 @@ class multiSlsDetector; namespace sls { using ns = std::chrono::nanoseconds; -using Positions = const std::vector &; -using defs = slsDetectorDefs; +class MacAddr; /** * \class Detector @@ -1289,6 +1288,12 @@ class Detector { /** [Eiger][Jungfrau] */ void setReceiverUDPPort(int udpport, Positions pos = {}); + + /** [Jungfrau] */ + Result getReceiverUDPMAC2(Positions pos = {}) const; + + /** [Jungfrau] */ + void setReceiverUDPMAC2(const std::string &udpmac, Positions pos = {}); }; } // namespace sls \ No newline at end of file diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index 9825a9a14..b8de96c73 100644 --- a/slsDetectorSoftware/src/Detector.cpp +++ b/slsDetectorSoftware/src/Detector.cpp @@ -1113,4 +1113,11 @@ void Detector::setReceiverUDPPort(int udpport, Positions pos){ pimpl->Parallel(&slsDetector::setReceiverUDPPort2, pos, udpport); } +Result Detector::getReceiverUDPMAC2(Positions pos) const{ + return pimpl->Parallel(&slsDetector::getReceiverUDPMAC2, pos); +} + +void Detector::setReceiverUDPMAC2(const std::string &udpmac, Positions pos){ + pimpl->Parallel(&slsDetector::setReceiverUDPMAC2, pos, udpmac); +} } // namespace sls \ No newline at end of file