detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +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-28 09:37:09 +01:00
parent 747e9af431 1dd300f713
commit bca7c649d7
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -583,6 +583,12 @@ virtual void readFrameFromReceiver()=0;
*/
virtual int enableDataStreamingToClient(int enable=-1)=0;
/** 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 from receiver enable
*/
virtual int enableDataStreamingFromReceiver(int enable=-1)=0;
/** Sets the read receiver frequency
if data required from receiver randomly readRxrFrequency=0,
else every nth frame to be sent to gui

6
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -402,7 +402,7 @@ class slsDetectorUsers
int setReceiverMode(int n=-1);
/**
@short register calbback for accessing detector final data
@short register calbback for accessing detector final data, also enables data streaming in client and receiver (if receiver exists)
\param userCallback function for plotting/analyzing the data. Its arguments are the data structure d and the frame number f, s is for subframe number for eiger for 32 bit mode
*/
@ -459,7 +459,7 @@ class slsDetectorUsers
*/
int enableDataStreamingToClient(int i=-1);
/**
/** (for expert users)
* Set/Get receiver streaming out ZMQ port
* For multi modules, it calculates (increments), sets the ports and restarts the sockets
* @param i sets, -1 gets
@ -467,7 +467,7 @@ class slsDetectorUsers
*/
int setReceiverDataStreamingOutPort(int i=-1);
/**
/** (for expert users)
* Set/Get client streaming in ZMQ port
* For multi modules, it calculates (increments), sets the ports and restarts the sockets
* @param i sets, -1 gets