detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +02: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
Show Stats 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;

5
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -369,8 +369,9 @@ void DataProcessor::ProcessAnImage(char* buf) {
}
// fix x coord that is currently not provided by detector
header->xCoord = xcoord;
// x coord for those not having standard header
if (!generalData->standardheader)
header->xCoord = xcoord;
if (file)
file->WriteToFile(buf, generalData->imageSize + sizeof(sls_detector_header), fnum-firstMeasurementIndex, nump);

11
slsReceiverSoftware/src/Listener.cpp
View File

@ -60,16 +60,6 @@ Listener::Listener(detectorType dtype, Fifo*& f, runStatus* s, uint32_t* portno,
}
NumberofListeners++;
FILE_LOG (logDEBUG) << "Number of Listeners: " << NumberofListeners;
switch(myDetectorType){
case JUNGFRAU:
case EIGER:
standardheader = true;
break;
default:
standardheader = false;
break;
}
}
@ -345,6 +335,7 @@ uint32_t Listener::ListenToAnImage(char* buf) {
bool isHeaderEmpty = true;
sls_detector_header* old_header = 0;
sls_detector_header* new_header = 0;
bool standardheader = generalData->standardheader;
//reset to -1