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

somewhere in separating zmq rxr and client

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-14 16:26:17 +01:00
parent 6693d08331
commit dda86cfe9b
5 changed files with 61 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3690,7 +3690,7 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
// disable data streaming before changing zmq port (but only if they were on)
int prev_streaming = 0;
if (p == RECEIVER_STREAMING_PORT) {
if (p == RECEIVER_STREAMING_PORT || p == CLIENT_STREAMING_PORT) {
prev_streaming = getStreamingSocketsCreatedInClient();
enableDataStreamingFromReceiver(0);
}
@ -3704,7 +3704,7 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
string* sret[thisMultiDetector->numberOfDetectors];
for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
if(detectors[idet]){
if (p == RECEIVER_STREAMING_PORT)
if (p == RECEIVER_STREAMING_PORT || p == CLIENT_STREAMING_PORT)
s.append("multi\0");
sret[idet]=new string("error");
Task* task = new Task(new func2_t<string,networkParameter,string>(&slsDetector::setNetworkParameter,
@ -3748,7 +3748,7 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
}
//enable data streaming if it was on
if (p == RECEIVER_STREAMING_PORT && prev_streaming)
if ((p == RECEIVER_STREAMING_PORT || p == CLIENT_STREAMING_PORT) && prev_streaming)
enableDataStreamingFromReceiver(1);
return getNetworkParameter(p);