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

in between separating datastreaming in client and receiver

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-15 16:16:59 +01:00
parent 0ae706d9a5
commit 32d32dbcdc
6 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsReceiverSoftware/include/ZmqSocket.h
View File

@ -8,9 +8,6 @@
*/
#include "ansi.h"
//#include "sls_receiver_defs.h"
//#define ZMQ_DETAIL
#include <zmq.h>
#include <errno.h>
@ -19,7 +16,8 @@
#include <rapidjson/document.h> //json header in zmq stream
using namespace rapidjson;
#define DEFAULT_ZMQ_PORTNO 30001
//#define ZMQ_DETAIL
class ZmqSocket {

10
slsReceiverSoftware/include/genericSocket.h
View File

@ -51,27 +51,21 @@ class sockaddr_in;
#include <ifaddrs.h>
#endif
#include <stdlib.h> /******exit */
#include <stdlib.h> /******exit */
#include <unistd.h>
#include <string.h>
#include <iostream>
#include <math.h>
#include <errno.h>
#include <stdio.h>
using namespace std;
#define DEFAULT_PACKET_SIZE 1286
/*#define SOCKET_BUFFER_SIZE (100*1024*1024) //100MB*/
#define SOCKET_BUFFER_SIZE (2000*1024*1024) //100MB
#define DEFAULT_PORTNO 1952
#define DEFAULT_BACKLOG 5
#define DEFAULT_UDP_PORTNO 50001
#define DEFAULT_GUI_PORTNO 65000
//#define DEFAULT_ZMQ_PORTNO defined in zmqSocket.h (40001)
class genericSocket{

7
slsReceiverSoftware/include/sls_receiver_defs.h
View File

@ -29,6 +29,13 @@ typedef int int32_t;
#define DEFAULT_STREAMING_TIMER_IN_MS 200
/** default ports */
#define DEFAULT_PORTNO 1952
#define DEFAULT_UDP_PORTNO 50001
#define DEFAULT_GUI_PORTNO 65001
#define DEFAULT_ZMQ_CL_PORTNO 30001
#define DEFAULT_ZMQ_RX_PORTNO 31000
/**
\file sls_receiver_defs.h
This file contains all the basic definitions common to the slsReceiver class

6
slsReceiverSoftware/src/UDPBaseImplementation.cpp
View File

@ -563,11 +563,7 @@ int UDPBaseImplementation::setActivate(int enable){
}
void UDPBaseImplementation::setStreamingPort(const uint32_t i) {
if (streamingPort == 0)
streamingPort = DEFAULT_ZMQ_PORTNO + (detID * ((myDetectorType == EIGER) ? 2 : 1) ); // multiplied by 2 as eiger has 2 ports
else
streamingPort = i;
streamingPort = i;
FILE_LOG(logINFO) << "Streaming Port: " << streamingPort;
}

3
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -211,9 +211,6 @@ int UDPStandardImplementation::setDataStreamEnable(const bool enable) {\
for ( int i = 0; i < numThreads; ++i ) {
dataStreamer.push_back(new DataStreamer(fifo[i], &dynamicRange, &shortFrameEnable, &fileIndex));
dataStreamer[i]->SetGeneralData(generalData);
// check again
if (streamingPort == 0)
streamingPort = DEFAULT_ZMQ_PORTNO + (detID * ((myDetectorType == EIGER) ? 2 : 1) ); // multiplied by 2 as eiger has 2 ports
if (dataStreamer[i]->CreateZmqSockets(&numThreads, streamingPort) == FAIL) {
error = true;
break;

5
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -2345,11 +2345,6 @@ int slsReceiverTCPIPInterface::set_streaming_port() {
}
//get
retval=receiverBase->getStreamingPort();
if(port > 0 && retval != port) { //if port = 0, its actual value calculated
ret = FAIL;
strcpy(mess, "Could not set streaming port\n");
FILE_LOG(logERROR) << "Warning: " << mess;
}
}
#endif
#ifdef VERYVERBOSE