detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 21:37: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 defaultport = 0;
int numsockets = (thisDetector->myDetectorType == EIGER) ? 2:1; int numsockets = (thisDetector->myDetectorType == EIGER) ? 2:1;
int arg = 0; int arg = 0;
@ -6240,13 +6240,13 @@ int slsDetector::setClientStreamingPort(string port) {
sscanf(port.c_str(),"%d",&arg); sscanf(port.c_str(),"%d",&arg);
thisDetector->zmqport = arg; thisDetector->zmqport = arg;
return thisDetector->zmqport; return getClientStreamingPort();
} }
int slsDetector::setReceiverStreamingPort(string port) { string slsDetector::setReceiverStreamingPort(string port) {
int defaultport = 0; int defaultport = 0;
int numsockets = (thisDetector->myDetectorType == EIGER) ? 2:1; int numsockets = (thisDetector->myDetectorType == EIGER) ? 2:1;
int arg = 0; int arg = 0;
@ -6279,7 +6279,7 @@ int slsDetector::setReceiverStreamingPort(string port) {
updateReceiver(); updateReceiver();
} }
return thisDetector->receiver_zmqport; return getReceiverStreamingPort();
} }
string slsDetector::setDetectorNetworkParameter(networkParameter index, int delay){ string slsDetector::setDetectorNetworkParameter(networkParameter index, int delay){

4
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1757,9 +1757,9 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
/** sets the receiver udp port2 for Eiger \sa sharedSlsDetector */ /** sets the receiver udp port2 for Eiger \sa sharedSlsDetector */
int setReceiverUDPPort2(int udpport); int setReceiverUDPPort2(int udpport);
/** sets the zmq port in client (includes "multi" at the end if it should calculate individual ports \sa sharedSlsDetector */ /** sets the zmq port in client (includes "multi" at the end if it should calculate individual ports \sa sharedSlsDetector */
int setClientStreamingPort(string port); string setClientStreamingPort(string port);
/** sets the zmq port in receiver (includes "multi" at the end if it should calculate individual ports \sa sharedSlsDetector */ /** sets the zmq port in receiver (includes "multi" at the end if it should calculate individual ports \sa sharedSlsDetector */
int setReceiverStreamingPort(string port); string setReceiverStreamingPort(string port);
/** sets the transmission delay for left or right port or for an entire frame*/ /** sets the transmission delay for left or right port or for an entire frame*/
string setDetectorNetworkParameter(networkParameter index, int delay); string setDetectorNetworkParameter(networkParameter index, int delay);