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

in between

Browse Source
This commit is contained in:
maliakal_d
2018-04-06 17:48:10 +02:00
parent 753290b228
commit 8cf6e0cbd6
10 changed files with 170 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsReceiverSoftware/include/DataStreamer.h
View File

@ -24,8 +24,9 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
* @param dr pointer to dynamic range
* @param sEnable pointer to short frame enable
* @param fi pointer to file index
* @param fd flipped data enable for x and y dimensions
*/
DataStreamer(Fifo*& f, uint32_t* dr, int* sEnable, uint64_t* fi);
DataStreamer(Fifo*& f, uint32_t* dr, int* sEnable, uint64_t* fi, int* fd);
/**
* Destructor
@ -229,5 +230,8 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
/** Complete buffer used for roi, eg. shortGotthard */
char* completeBuffer;
/** flipped data across both dimensions enable */
int* flippedData;
};

17
slsReceiverSoftware/include/ZmqSocket.h
View File

@ -276,7 +276,7 @@ public:
uint64_t bunchId = 0, uint64_t timestamp = 0,
uint16_t modId = 0, uint16_t xCoord = 0, uint16_t yCoord = 0, uint16_t zCoord = 0,
uint32_t debug = 0, uint16_t roundRNumber = 0,
uint8_t detType = 0, uint8_t version = 0) {
uint8_t detType = 0, uint8_t version = 0, int* flippedData = 0) {
char buf[MAX_STR_LENGTH] = "";
@ -305,14 +305,23 @@ public:
"\"debug\":%u, "
"\"roundRNumber\":%u, "
"\"detType\":%u, "
"\"version\":%u"
"\"version\":%u, "
//additional stuff
"\"flippedDataX\":%u"
"}\n\0";
int length = sprintf(buf, jsonHeaderFormat,
jsonversion, dynamicrange, fileIndex, npixelsx, npixelsy, imageSize,
acqIndex, fIndex, (fname == NULL)? "":fname, dummy?0:1,
frameNumber, expLength, packetNumber, bunchId, timestamp,
frameNumber, expLength, packetNumber, bunchId, timestamp,
modId, xCoord, yCoord, zCoord, debug, roundRNumber,
detType, version);
detType, version,
//additional stuff
((flippedData == 0 ) ? 0 :flippedData[0])
);
#ifdef VERBOSE
//if(!index)
FILE_LOG(logINFO) << index << ": Streamer: buf:" << buf;