From 9df128fceddb4de818bae46505df1123decd5f14 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 20 Apr 2020 18:35:30 +0200 Subject: [PATCH] WIP, cant compile squash for rxParameters --- slsDetectorSoftware/src/DetectorImpl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index 910d0728c..ff0d023c9 100755 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -452,21 +452,21 @@ void DetectorImpl::configureReceiver(const int udpInterface, Positions pos, Parallel1(&Receiver::setTCPPort, pos, {}, port); } Parallel1(&Receiver::setHostname, pos, {}, hostname); - /*auto t = Parallel(&Module::getReceiverParameters, pos).squash(); + auto t = Parallel(&Module::getReceiverParameters, pos).squash(); auto m = Parallel1(&Receiver::configure, pos, {}, t).squash(); if (m != 0) { Parallel(&Module::setDestinationUDPMAC, pos, m); - }*/ + } } else { if (port != 0) { Parallel2(&Receiver::setTCPPort, pos, {}, port); } Parallel2(&Receiver::setHostname, pos, {}, hostname); - /*auto t = Parallel(&Module::getReceiverParameters, pos).squash(); + auto t = Parallel(&Module::getReceiverParameters, pos).squash(); auto m = Parallel2(&Receiver::configure, pos, {}, t).squash(); if (m != 0) { Parallel(&Module::setDestinationUDPMAC2, pos, m); - }*/ + } } }