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

updates for merge for r_readfreq without reciever

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-23 18:30:48 +01:00
parent ab5229bcbf 16e4fbf8dd
commit 3439ccbec9
8 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -275,6 +275,8 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
int receiver_zmqport;
/** data streaming (up stream) enable in receiver */
bool receiver_datastream;
/* Receiver read frequency */
int receiver_read_freq;
/** zmq tcp src ip address in client (only data) **/
char zmqip[MAX_STR_LENGTH];
/** zmq tcp src ip address in receiver (only data) **/
@ -286,6 +288,8 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
/** data bytes including gap pixels */
int dataBytesInclGapPixels;
} sharedSlsDetector;
@ -1800,12 +1804,10 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
/** Sets the read receiver frequency
if data required from receiver randomly readRxrFrequency=0,
else every nth frame to be sent to gui
@param getFromReceiver is 1 if it should ask the receiver,
0 if it can get it from multi structure
@param freq is the receiver read frequency
/returns read receiver frequency
*/
int setReadReceiverFrequency(int getFromReceiver, int freq=-1);
int setReadReceiverFrequency(int freq=-1);
/** Sets the read receiver timer
if data required from receiver randomly readRxrFrequency=0,