detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-29 17:40:01 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-28 09:24:57 +01:00
commit 620f7651a0
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -109,8 +109,13 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
* @returns receiver streaming out ZMQ port * @returns receiver streaming out ZMQ port
*/ */
int setReceiverDataStreamingOutPort(int i) { \ int setReceiverDataStreamingOutPort(int i) { \
if (i >= 0) { ostringstream ss; ss << i; string s = ss.str(); \ if (i >= 0) { \
setNetworkParameter(RECEIVER_STREAMING_PORT, s);} \ ostringstream ss; ss << i; string s = ss.str(); \
int prev_streaming = enableDataStreamingFromReceiver(); \
setNetworkParameter(RECEIVER_STREAMING_PORT, s); \
if (prev_streaming) { \
enableDataStreamingFromReceiver(0); \
enableDataStreamingFromReceiver(1);}} \
return atoi(getNetworkParameter(RECEIVER_STREAMING_PORT).c_str());}; \ return atoi(getNetworkParameter(RECEIVER_STREAMING_PORT).c_str());}; \
/** /**
@ -120,8 +125,13 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
* @returns client streaming in ZMQ port * @returns client streaming in ZMQ port
*/ */
int setClientDataStreamingInPort(int i){ \ int setClientDataStreamingInPort(int i){ \
if (i >= 0) { ostringstream ss; ss << i; string s = ss.str(); \ if (i >= 0) { \
setNetworkParameter(CLIENT_STREAMING_PORT, s);} \ ostringstream ss; ss << i; string s = ss.str(); \
int prev_streaming = enableDataStreamingToClient()(); \
setNetworkParameter(CLIENT_STREAMING_PORT, s); \
if (prev_streaming) { \
enableDataStreamingToClient(0); \
enableDataStreamingToClient(1);}} \
return atoi(getNetworkParameter(CLIENT_STREAMING_PORT).c_str());}; \ return atoi(getNetworkParameter(CLIENT_STREAMING_PORT).c_str());}; \