detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 03:40:04 +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-23 17:20:13 +01:00
commit 585661412c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6369,6 +6369,8 @@ string slsDetector::setReceiverStreamingPort(string port) {
else else
sscanf(port.c_str(),"%d",&arg); sscanf(port.c_str(),"%d",&arg);
thisDetector->receiver_zmqport = arg;
// send to receiver // send to receiver
int fnum=F_SET_RECEIVER_STREAMING_PORT; int fnum=F_SET_RECEIVER_STREAMING_PORT;
int ret = FAIL; int ret = FAIL;
@ -6381,8 +6383,10 @@ string slsDetector::setReceiverStreamingPort(string port) {
ret=thisReceiver->sendInt(fnum,retval,arg); ret=thisReceiver->sendInt(fnum,retval,arg);
disconnectData(); disconnectData();
} }
if(ret!=FAIL) if (ret==FAIL) {
thisDetector->receiver_zmqport = retval; setErrorMask((getErrorMask())|(COULDNOT_SET_NETWORK_PARAMETER));
std::cout << "Warning: Could not set receiver zmq port" << std::endl;
}
if(ret==FORCE_UPDATE) if(ret==FORCE_UPDATE)
updateReceiver(); updateReceiver();
} }