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

merge from 3.0.1 with patches for file write disable

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-10-18 17:53:55 +02:00
parent 4d92744dea 72b71cd680
commit 1cddb9a542
6 changed files with 65 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsReceiverSoftware/include/DataProcessor.h
View File

@ -26,14 +26,14 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
* Calls Base Class CreateThread(), sets ErrorMask if error and increments NumberofDataProcessors
* @param f address of Fifo pointer
* @param ftype pointer to file format type
* @param fwenable pointer to file writer enable
* @param fwenable file writer enable
* @param dsEnable pointer to data stream enable
* @param freq pointer to streaming frequency
* @param timer pointer to timer if streaming frequency is random
* @param dataReadycb pointer to data ready call back function
* @param pDataReadycb pointer to arguments of data ready call back function
*/
DataProcessor(Fifo*& f, fileFormat* ftype, bool* fwenable, bool* dsEnable,
DataProcessor(Fifo*& f, fileFormat* ftype, bool fwenable, bool* dsEnable,
uint32_t* freq, uint32_t* timer,
void (*dataReadycb)(uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint16_t, uint8_t, uint8_t,
char*, uint32_t, void*),
@ -162,6 +162,7 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
/**
* Set up file writer object and call backs
* @param fwe file write enable
* @param nd pointer to number of detectors in each dimension
* @param fname pointer to file name prefix
* @param fpath pointer to file path
@ -174,10 +175,9 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
* @param portno pointer to udp port number
* @param g address of GeneralData (Detector Data) pointer
*/
void SetupFileWriter(int* nd, char* fname, char* fpath, uint64_t* findex,
void SetupFileWriter(bool fwe, int* nd, char* fname, char* fpath, uint64_t* findex,
bool* owenable, int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno, GeneralData* g = 0);
/**
* Create New File
* @param en ten giga enable
@ -305,7 +305,7 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
fileFormat* fileFormatType;
/** File Write Enable */
bool* fileWriteEnable;
bool fileWriteEnable;
/** Pointer to Streaming frequency, if 0, sending random images with a timer */
uint32_t* streamingFrequency;
@ -319,6 +319,9 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
/** timer beginning stamp for random streaming */
struct timespec timerBegin;
/** x coord hardcoded, as detector does not send them yet **/
uint16_t xcoord;
//acquisition start

6
slsReceiverSoftware/include/UDPStandardImplementation.h
View File

@ -59,6 +59,12 @@ class UDPStandardImplementation: private virtual slsReceiverDefs, public UDPBase
*/
void setFileFormat(slsReceiverDefs::fileFormat f);
/**
* Set File Write Enable
* @param b true for file write enable, else false
*/
void setFileWriteEnable(const bool b);
/**
* Set Short Frame Enabled, later will be moved to getROI (so far only for gotthard)
* @param i index of adc enabled, else -1 if all enabled

8
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH ""
#define SVNREPUUID "27301393e82602889700db12ab68a0c67a6f9736"
//#define SVNREV 0x662
#define SVNREPUUID "820bd8c6a08b5ac05dc6e28e6cfd5674f07d57f7"
//#define SVNREV 0x663
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x662
#define SVNDATE 0x20170920
#define SVNREV 0x663
#define SVNDATE 0x20171018
//