merged with zmqdata

This commit is contained in:
Dhanya Maliakal
2016-10-20 08:54:29 +02:00
49 changed files with 17399 additions and 1398 deletions

View File

@ -154,6 +154,13 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
*/
uint32_t getFrameToGuiFrequency() const;
/**
* Get the data stream enable
* @return 1 to send via zmq, else 0
*/
uint32_t getDataStreamEnable() const;
/**
* Get Acquisition Period
* @return acquisition period
@ -203,7 +210,6 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
/*************************************************************************
* Setters ***************************************************************
* They modify the local cache of configuration or detector parameters ***
@ -306,10 +312,17 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
/**
* Set the Frequency of Frames Sent to GUI
* @param i 0 for random frame requests, n for nth frame frequency
* @param freq 0 for random frame requests, n for nth frame frequency
* @return OK or FAIL
*/
int setFrameToGuiFrequency(const uint32_t i);
int setFrameToGuiFrequency(const uint32_t freq);
/**
* Set the data stream enable
* @param enable 0 to disable, 1 to enable
* @return OK or FAIL
*/
uint32_t setDataStreamEnable(const uint32_t enable);
/**
* Set Acquisition Period
@ -406,12 +419,13 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
/**
* Get the buffer-current frame read by receiver
* @param ithread port thread index
* @param c pointer to current file name
* @param raw address of pointer, pointing to current frame to send to gui
* @param startAcq start index of the acquisition
* @param startFrame start index of the scan
*/
void readFrame(char* c,char** raw, uint64_t &startAcq, uint64_t &startFrame);
void readFrame(int ithread, char* c,char** raw, int64_t &startAcq, int64_t &startFrame);
/**
* abort acquisition with minimum damage: close open files, cleanup.
@ -421,9 +435,9 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
/**
* Closes file / all files(if multiple files)
* @param i thread index (if multiple files used eg. root files) -1 for all threads
* @param ithread writer thread index
*/
void closeFile(int i = -1);
void closeFile(int ithread = 0);
/**
* Activate / Deactivate Receiver
@ -432,7 +446,6 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
*/
int setActivate(int enable = -1);
//***callback functions***
/**
* Call back for start acquisition
@ -530,7 +543,7 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
//***acquisition count parameters***
/** Total packets caught for an entire acquisition (including all scans) */
uint64_t totalPacketsCaught;
/** Frames Caught for each real time acquisition (eg. for each scan) */
/** Packets Caught for each real time acquisition (eg. for each scan) */
uint64_t packetsCaught;
//***acquisition indices parameters***
@ -541,7 +554,9 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
/* Short Frame Enable or index of adc enabled, else -1 if all enabled (gotthard specific) TODO: move to setROI */
int shortFrameEnable;
/** Frequency of Frames sent to GUI */
uint32_t FrameToGuiFrequency;
uint32_t frameToGuiFrequency;
/** Data Stream Enable from Receiver */
int32_t dataStreamEnable;