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

xcoord should not be hardcoded for this version for eiger and jungfrau

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-10-20 10:49:02 +02:00
parent 801817b749
commit 210bcb081d
4 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/include/GeneralData.h
View File

@@ -78,6 +78,9 @@ public:
/** Streaming (for ROI - mainly short Gotthard) - Image size (in bytes) */
uint32_t imageSize_Streamer;
/** if standard header implemented in firmware */
bool standardheader;
@@ -103,7 +106,8 @@ public:
headerPacketSize(0),
nPixelsX_Streamer(0),
nPixelsY_Streamer(0),
imageSize_Streamer(0)
imageSize_Streamer(0),
standardheader(false)
{};
/** Destructor */
@@ -197,6 +201,7 @@ public:
FILE_LOG(logDEBUG) << "Streamer Pixels X: " << nPixelsX_Streamer;
FILE_LOG(logDEBUG) << "Streamer Pixels Y: " << nPixelsY_Streamer;
FILE_LOG(logDEBUG) << "Streamer Image Size: " << imageSize_Streamer;
FILE_LOG(logDEBUG) << "Standard Header: " << standardheader;
};
};
@@ -492,7 +497,7 @@ class JungfrauData : public GeneralData {
nPixelsX_Streamer = nPixelsX;
nPixelsY_Streamer = nPixelsY;
imageSize_Streamer = imageSize;
standardheader = true;
};
};
@@ -520,6 +525,7 @@ class EigerData : public GeneralData {
nPixelsX_Streamer = nPixelsX;
nPixelsY_Streamer = nPixelsY;
imageSize_Streamer = imageSize;
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;