detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-06 01:50:40 +02:00
Code Issues Actions Packages Releases Activity

updated update_image_size in xilinx

Browse Source
This commit is contained in:
Mazzoleni Alice Francesca 2025-04-11 12:38:28 +02:00
parent 3297707ab7
commit 4d8bdae836
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
slsReceiverSoftware/src/GeneralData.h
View File

@ -60,8 +60,8 @@ class GeneralData {
slsDetectorDefs::frameDiscardPolicy frameDiscardMode{ slsDetectorDefs::frameDiscardPolicy frameDiscardMode{
slsDetectorDefs::NO_DISCARD}; slsDetectorDefs::NO_DISCARD};
GeneralData(){}; GeneralData() {};
virtual ~GeneralData(){}; virtual ~GeneralData() {};
// Returns the pixel depth in byte, 4 bits being 0.5 byte // Returns the pixel depth in byte, 4 bits being 0.5 byte
float GetPixelDepth() { return float(dynamicRange) / 8; } float GetPixelDepth() { return float(dynamicRange) / 8; }
@ -569,6 +569,7 @@ class XilinxChipTestBoardData : public GeneralData {
nDigitalBytes = 0; nDigitalBytes = 0;
nTransceiverBytes = 0; nTransceiverBytes = 0;
int nAnalogChans = 0, nDigitalChans = 0, nTransceiverChans = 0; int nAnalogChans = 0, nDigitalChans = 0, nTransceiverChans = 0;
uint64_t digital_bytes_reserved = 0;
// analog channels (normal, analog/digital readout) // analog channels (normal, analog/digital readout)
if (readoutType == slsDetectorDefs::ANALOG_ONLY || if (readoutType == slsDetectorDefs::ANALOG_ONLY ||
@ -586,7 +587,11 @@ class XilinxChipTestBoardData : public GeneralData {
readoutType == slsDetectorDefs::ANALOG_AND_DIGITAL || readoutType == slsDetectorDefs::ANALOG_AND_DIGITAL ||
readoutType == slsDetectorDefs::DIGITAL_AND_TRANSCEIVER) { readoutType == slsDetectorDefs::DIGITAL_AND_TRANSCEIVER) {
nDigitalChans = NCHAN_DIGITAL; nDigitalChans = NCHAN_DIGITAL;
nDigitalBytes = (sizeof(uint64_t) * nDigitalSamples); uint32_t num_bytes_per_bit = (nDigitalSamples % 8 == 0)
? nDigitalSamples / 8
: nDigitalSamples / 8 + 1;
digital_bytes_reserved = 64 * num_bytes_per_bit;
nDigitalBytes = sizeof(uint64_t) * nDigitalSamples;
LOG(logDEBUG1) << "Number of Digital Channels:" << nDigitalChans LOG(logDEBUG1) << "Number of Digital Channels:" << nDigitalChans
<< " Databytes: " << nDigitalBytes; << " Databytes: " << nDigitalBytes;
} }
@ -604,7 +609,7 @@ class XilinxChipTestBoardData : public GeneralData {
} }
nPixelsX = nAnalogChans + nDigitalChans + nTransceiverChans; nPixelsX = nAnalogChans + nDigitalChans + nTransceiverChans;
imageSize = nAnalogBytes + nDigitalBytes + nTransceiverBytes; imageSize = nAnalogBytes + digital_bytes_reserved + nTransceiverBytes;
packetsPerFrame = ceil((double)imageSize / (double)dataSize); packetsPerFrame = ceil((double)imageSize / (double)dataSize);
LOG(logDEBUG1) << "Total Number of Channels:" << nPixelsX LOG(logDEBUG1) << "Total Number of Channels:" << nPixelsX