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

separating zmqport, enabling in client and receiver works

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-16 15:01:22 +01:00
parent 2fca426ec0
commit 8e0414d1b9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6224,7 +6224,7 @@ int slsDetector::setReceiverUDPPort2(int udpport){
}
int slsDetector::setClientStreamingPort(string port) {
string slsDetector::setClientStreamingPort(string port) {
int defaultport = 0;
int numsockets = (thisDetector->myDetectorType == EIGER) ? 2:1;
int arg = 0;
@ -6240,13 +6240,13 @@ int slsDetector::setClientStreamingPort(string port) {
sscanf(port.c_str(),"%d",&arg);
thisDetector->zmqport = arg;
return thisDetector->zmqport;
return getClientStreamingPort();
}
int slsDetector::setReceiverStreamingPort(string port) {
string slsDetector::setReceiverStreamingPort(string port) {
int defaultport = 0;
int numsockets = (thisDetector->myDetectorType == EIGER) ? 2:1;
int arg = 0;
@ -6279,7 +6279,7 @@ int slsDetector::setReceiverStreamingPort(string port) {
updateReceiver();
}
return thisDetector->receiver_zmqport;
return getReceiverStreamingPort();
}
string slsDetector::setDetectorNetworkParameter(networkParameter index, int delay){