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

merge conflict from 3.0.1

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-17 11:35:02 +01:00
parent d9fcac0236 f647bdaa48
commit 51499fa503
11 changed files with 271 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -219,6 +219,9 @@ class multiSlsDetector : public slsDetectorUtils {
/** receiver online flag - is set if the receiver is connected, unset if socket connection is not possible */
int receiverOnlineFlag;
/** data streaming (up stream) enable in receiver */
bool receiver_datastream;
} sharedMultiSlsDetector;
@ -1367,17 +1370,19 @@ class multiSlsDetector : public slsDetectorUtils {
/**
* Get Streaming sockets created in client from reciever
/returns 1 if sockets created, else 0
* Enable data streaming to client
* @param enable 0 to disable, 1 to enable, -1 to get the value
* @returns data streaming to client enable
*/
int getStreamingSocketsCreatedInClient();
int enableDataStreamingToClient(int enable=-1);
/** Enable or disable streaming data from receiver to client
* @param enable 0 to disable 1 to enable -1 to only get the value
* @returns data streaming
* @param enable 0 to disable 1 to enable -1 to only get the value
* @returns data streaming from receiver enable
*/
int enableDataStreamingFromReceiver(int enable=-1);
/** updates the multidetector offsets */
void updateOffsets();
@ -1523,8 +1528,8 @@ private:
/** Ensures if sockets created successfully */
bool dataSocketsStarted;
/** data streaming (down stream) enabled in client (zmq sckets created) */
bool client_datastream;
/** ZMQ Socket - Receiver to Client */
ZmqSocket* zmqSocket[MAXDET];