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

conflict resolved in merge from 3.0.1 to include file index in zmq streaming

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-14 12:14:26 +01:00
parent dc70c45ef2 0ae706d9a5
commit db2fef5d69
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsReceiverSoftware/include/DataStreamer.h
View File

@ -23,8 +23,9 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
* @param f address of Fifo pointer
* @param dr pointer to dynamic range
* @param sEnable pointer to short frame enable
* @param fi pointer to file index
*/
DataStreamer(Fifo*& f, uint32_t* dr, int* sEnable);
DataStreamer(Fifo*& f, uint32_t* dr, int* sEnable, uint64_t* fi);
/**
* Destructor
@ -201,6 +202,9 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
/** Pointer to short frame enable */
int* shortFrameEnable;
/** Pointer to file index */
uint64_t* fileIndex;
/** Aquisition Started flag */
bool acquisitionStartedFlag;