From 0b7c202f98e14222a78c8805a84e0589956c0b37 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil <33750417+thattil@users.noreply.github.com> Date: Thu, 24 Feb 2022 16:16:48 +0100 Subject: [PATCH] datastream 10g Receiver (#401) * datastream not updated when tengiga enabled in receiver --- slsReceiverSoftware/src/Implementation.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index fae4c1180..b5d6b31ef 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -1476,10 +1476,10 @@ void Implementation::setTenGigaEnable(const bool b) { detectorDataStream[LEFT] = detectorDataStream10GbE[LEFT]; detectorDataStream[RIGHT] = detectorDataStream10GbE[RIGHT]; } - LOG(logINFO) << "Detector datastream updated [Left: " - << sls::ToString(detectorDataStream[LEFT]) - << ", Right: " - << sls::ToString(detectorDataStream[RIGHT]) << "]"; + LOG(logDEBUG) << "Detector datastream updated [Left: " + << sls::ToString(detectorDataStream[LEFT]) + << ", Right: " + << sls::ToString(detectorDataStream[RIGHT]) << "]"; } } LOG(logINFO) << "Ten Giga: " << (tengigaEnable ? "enabled" : "disabled"); @@ -1550,6 +1550,13 @@ void Implementation::setDetectorDataStream(const portPosition port, detectorDataStream10GbE[index] = enable; LOG(logINFO) << "Detector 10GbE datastream (" << sls::ToString(port) << " Port): " << sls::ToString(detectorDataStream10GbE[index]); + // update datastream for 10g + if (tengigaEnable) { + detectorDataStream[index] = detectorDataStream10GbE[index]; + LOG(logDEBUG) << "Detector datastream updated [" + << (index == 0 ? "Left" : "Right") + << "] : " << sls::ToString(detectorDataStream[index]); + } } int Implementation::getReadNRows() const { return readNRows; }