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

eiger bug fix: 4 bit mode gap pixels, also added quad to shm

Browse Source
This commit is contained in:
maliakal_d
2019-08-14 15:31:18 +02:00
parent 2a88bc6a1e
commit 633c646239
13 changed files with 96 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsReceiverSoftware/include/DataStreamer.h
View File

@ -32,9 +32,10 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
* @param sm pointer to silent mode
* @param nd pointer to number of detectors in each dimension
* @param gpEnable pointer to gap pixels enable
* @param qe pointer to quad Enable
*/
DataStreamer(int ind, Fifo*& f, uint32_t* dr, std::vector<ROI>* r,
uint64_t* fi, int fd, char* ajh, bool* sm, int* nd, bool* gpEnable);
uint64_t* fi, int fd, char* ajh, bool* sm, int* nd, bool* gpEnable, bool* qe);
/**
* Destructor
@ -227,5 +228,7 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
/** Gap Pixels Enable */
bool* gapPixelsEnable;
/** quad enable */
bool* quadEnable;
};

8
slsReceiverSoftware/include/ZmqSocket.h
View File

@ -274,7 +274,7 @@ public:
uint16_t modId = 0, uint16_t row = 0, uint16_t column = 0, uint16_t reserved = 0,
uint32_t debug = 0, uint16_t roundRNumber = 0,
uint8_t detType = 0, uint8_t version = 0, uint32_t gapPixelsEnable = 0, uint32_t flippedDataX = 0,
char* additionalJsonHeader = 0) {
uint32_t quadEnable = 0, char* additionalJsonHeader = 0) {
char buf[MAX_STR_LENGTH] = "";
@ -308,7 +308,8 @@ public:
//additional stuff
"\"gappixels\":%u, "
"\"flippedDataX\":%u"
"\"flippedDataX\":%u, "
"\"quad\":%u"
;//"}\n";
int length = sprintf(buf, jsonHeaderFormat,
@ -321,7 +322,8 @@ public:
//additional stuff
gapPixelsEnable,
flippedDataX
flippedDataX,
quadEnable
);
if (additionalJsonHeader && strlen(additionalJsonHeader)) {
length = sprintf(buf, "%s, %s}\n", buf, additionalJsonHeader);