detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-19 11:11:03 +01:00
Code Issues Actions Packages Releases Activity

bug fix on quad: if no data streaming enabled in the beginning

Browse Source
This commit is contained in:
maliakal_d
2019-07-22 17:09:34 +02:00
parent 445f3c66fd
commit 350b4f0368
6 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsReceiverSoftware/include/DataStreamer.h
View File

@@ -27,14 +27,14 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
* @param dr pointer to dynamic range
* @param r roi
* @param fi pointer to file index
* @param fd flipped data enable for x and y dimensions
* @param fd flipped data enable for x dimension
* @param ajh additional json header
* @param sm pointer to silent mode
* @param nd pointer to number of detectors in each dimension
* @param gpEnable pointer to gap pixels 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);
/**
* Destructor
@@ -97,10 +97,10 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
void SetNumberofDetectors(int* nd);
/**
* Set Flipped data enable across both dimensions
* @param flipped data enable in both dimensions
* Set Flipped data enable across x dimension
* @param flipped data enable in x dimension
*/
void SetFlippedData(int* fd);
void SetFlippedDataX(int fd);
/**
* Creates Zmq Sockets
@@ -197,8 +197,8 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
/** Pointer to file index */
uint64_t* fileIndex;
/** flipped data across both dimensions enable */
int flippedData[2];
/** flipped data across x dimension */
int flippedDataX;
/** additional json header */
char* additionJsonHeader;

4
slsReceiverSoftware/include/UDPBaseImplementation.h
View File

@@ -747,8 +747,8 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
bool tengigaEnable;
/** Fifo Depth */
uint32_t fifoDepth;
/** enable for flipping data across both axes */
int flippedData[2];
/** enable for flipping data across x axis */
int flippedDataX;
/** gap pixels enable */
bool gapPixelsEnable;
/** quad type enable */

4
slsReceiverSoftware/include/ZmqSocket.h
View File

@@ -273,7 +273,7 @@ public:
uint64_t bunchId = 0, uint64_t timestamp = 0,
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, int gapPixelsEnable = 0, int* flippedData = 0,
uint8_t detType = 0, uint8_t version = 0, uint32_t gapPixelsEnable = 0, uint32_t flippedDataX = 0,
char* additionalJsonHeader = 0) {
@@ -321,7 +321,7 @@ public:
//additional stuff
gapPixelsEnable,
((flippedData == 0 ) ? 0 :flippedData[0])
flippedDataX
);
if (additionalJsonHeader && strlen(additionalJsonHeader)) {
length = sprintf(buf, "%s, %s}\n", buf, additionalJsonHeader);