detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-22 01:27:59 +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/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