diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index 9493eaaff..d1778d2f3 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -23,29 +23,12 @@ /** cosntructor & destructor */ Implementation::Implementation(const detectorType d) { - - // network configuration (UDP) - eth.resize(MAX_NUMBER_OF_LISTENING_THREADS); - udpPortNum.resize(MAX_NUMBER_OF_LISTENING_THREADS); - for (int i = 0; i < MAX_NUMBER_OF_LISTENING_THREADS; ++i) { - udpPortNum[i] = DEFAULT_UDP_PORTNO + i; - } - setDetectorType(d); } Implementation::~Implementation() { delete generalData; generalData = nullptr; - additionalJsonHeader.clear(); - listener.clear(); - dataProcessor.clear(); - dataStreamer.clear(); - fifo.clear(); - eth.clear(); - udpPortNum.clear(); - rateCorrections.clear(); - ctbDbitList.clear(); } void Implementation::SetLocalNetworkParameters() { diff --git a/slsReceiverSoftware/src/Implementation.h b/slsReceiverSoftware/src/Implementation.h index 890f9634e..f80290b26 100644 --- a/slsReceiverSoftware/src/Implementation.h +++ b/slsReceiverSoftware/src/Implementation.h @@ -295,8 +295,8 @@ class Implementation : private virtual slsDetectorDefs { // network configuration (UDP) int numUDPInterfaces{1}; - std::vector eth; //(MAX_NUMBER_OF_LISTENING_THREADS); - std::vector udpPortNum; //(MAX_NUMBER_OF_LISTENING_THREADS); + std::arrayeth; + std::array udpPortNum{DEFAULT_UDP_PORTNO, DEFAULT_UDP_PORTNO+1}; int64_t udpSocketBufferSize{0}; int64_t actualUDPSocketBufferSize{0};