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

merge solved from developer, xcoord from detector if given

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-10-23 17:21:45 +02:00
parent b6ae3300a9 1f138abac1
commit ce7386e230
5 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsReceiverSoftware/include/DataProcessor.h
View File

@ -343,8 +343,9 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
/** temporary buffer for processing */
char* tempBuffer;
/** x coord hardcoded, as detector does not send them yet **/
uint16_t xcoord;
/** x coord hardcoded ad 1D, if detector does not send them yet **/
uint16_t xcoordin1D;

10
slsReceiverSoftware/include/GeneralData.h
View File

@ -79,6 +79,9 @@ public:
/** Streaming (for ROI - mainly short Gotthard) - Image size (in bytes) */
uint32_t imageSizeComplete;
/** if standard header implemented in firmware */
bool standardheader;
@ -104,7 +107,8 @@ public:
headerPacketSize(0),
nPixelsXComplete(0),
nPixelsYComplete(0),
imageSizeComplete(0)
imageSizeComplete(0),
standardheader(false)
{};
/** Destructor */
@ -207,6 +211,7 @@ public:
FILE_LOG(logDEBUG) << "Complete Pixels X: " << nPixelsXComplete;
FILE_LOG(logDEBUG) << "Complete Pixels Y: " << nPixelsYComplete;
FILE_LOG(logDEBUG) << "Complete Image Size: " << imageSizeComplete;
FILE_LOG(logDEBUG) << "Standard Header: " << standardheader;
};
};
@ -484,7 +489,7 @@ class JungfrauData : public GeneralData {
maxFramesPerFile = JFRAU_MAX_FRAMES_PER_FILE;
fifoBufferHeaderSize= FIFO_HEADER_NUMBYTES + sizeof(slsReceiverDefs::sls_detector_header);
defaultFifoDepth = 2500;
standardheader = true;
};
};
@ -509,6 +514,7 @@ class EigerData : public GeneralData {
defaultFifoDepth = 100;
threadsPerReceiver = 2;
headerPacketSize = 40;
standardheader = true;
};
/**

3
slsReceiverSoftware/include/Listener.h
View File

@ -290,9 +290,6 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
/** Listening buffer for one packet - might be removed when we can peek and eiger fnum is in header */
char* listeningPacket;
/** if the standard header is implemented in firmware */
bool standardheader;
/** if the udp socket is connected */
bool udpSocketAlive;