detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-07 18:40:42 +02:00
Code Issues Actions Packages Releases Activity

WIP

Browse Source
This commit is contained in:
maliakal_d 2019-11-21 12:35:07 +01:00
parent 83221ee955
commit 8727a93e3e
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsReceiverSoftware/include/Implementation.h
View File

@ -228,7 +228,6 @@ class Implementation : private virtual slsDetectorDefs {
// config parameters
int numThreads;
const static int MAX_NUMBER_OF_LISTENING_THREADS = 2;
detectorType myDetectorType;
int numDet[MAX_DIMENSIONS];
int detID;
@ -255,7 +254,7 @@ class Implementation : private virtual slsDetectorDefs {
// network configuration (UDP)
int numUDPInterfaces;
std::vector <std::string> eth;
uint32_t udpPortNum[MAX_NUMBER_OF_LISTENING_THREADS];
std::vector <uint32_t> udpPortNum;
int64_t udpSocketBufferSize;
int64_t actualUDPSocketBufferSize;

2
slsReceiverSoftware/include/receiver_defs.h
View File

@ -4,6 +4,8 @@
#include <stdint.h>
#define MAX_DIMENSIONS (2)
#define MAX_NUMBER_OF_LISTENING_THREADS (2)
//socket
#define GOODBYE (-200)
#define RECEIVE_SOCKET_BUFFER_SIZE (100*1024*1024)

5
slsReceiverSoftware/src/Implementation.cpp
View File

@ -39,6 +39,8 @@ void Implementation::DeleteMembers() {
dataProcessor.clear();
dataStreamer.clear();
fifo.clear();
eth.clear();
udpPortNum.clear();
ctbDbitList.clear();
}
@ -74,7 +76,8 @@ void Implementation::InitializeMembers() {
// network configuration (UDP)
numUDPInterfaces = 1;
eth.resize(MAX_NUMBER_OF_LISTENING_THREADS);
for (int i = 0; i < MAX_NUMBER_OF_LISTENING_THREADS; i++) {
udpPortNum.resize(MAX_NUMBER_OF_LISTENING_THREADS);
for (int i = 0; i < MAX_NUMBER_OF_LISTENING_THREADS; ++i) {
eth[i] = "";
udpPortNum[i] = DEFAULT_UDP_PORTNO + i;
}