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

trials

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-08-22 19:43:26 +02:00
parent a7dab9a257
commit 4f28df03ab
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3590,10 +3590,10 @@ 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) {
/*prev_streaming = getStreamingSocketsCreatedInClient();*/
enableDataStreamingFromReceiver(0);
}
// enableDataStreamingFromReceiver(0);
// }
if (s.find('+')==string::npos) {
@ -5883,8 +5883,8 @@ int multiSlsDetector::getStreamingSocketsCreatedInClient() {
int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
if(enable >= 0){
/*if(dataSocketsStarted != enable){*/
/* if(enable >= 0){
//destroy data threads
if(dataSocketsStarted)
createReceivingDataSockets(true);
@ -5899,9 +5899,9 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
return -1;
}
}
/*}*/
}
}*/
@ -5937,9 +5937,9 @@ int multiSlsDetector::enableDataStreamingFromReceiver(int enable){
}
}
if(ret != dataSocketsStarted)
/* if(ret != dataSocketsStarted)
ret = -1;
*/
return ret;
}

4
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -5868,7 +5868,7 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) {
if (action==PUT_ACTION) {
if(!strcasecmp(args[1],"start")) {
//to ensure data streaming enable is the same across client and receiver
if (receivers == ONLINE_FLAG) {
/*if (receivers == ONLINE_FLAG) {
//if it was not off
if (myDet->enableDataStreamingFromReceiver(-1) != 0){
//switch it off, if error
@ -5876,7 +5876,7 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) {
return string("could not disable data streaming in receiver\n");
}
}
}
}*/
myDet->startReceiver();
}
else if(!strcasecmp(args[1],"stop")){