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

fixed ctb tests, need to fix in develoepr (if digital modfe not enabled, should not take into accoutn dbitlist or dbitoffset or dbitreorder

Browse Source
This commit is contained in:
maliakal_d
2025-05-01 15:45:14 +02:00
parent 5073769403
commit 62a5fda33f
10 changed files with 188 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -589,7 +589,6 @@ void DataProcessor::ArrangeDbitData(size_t &size, char *data) {
// store each selected bit from all samples consecutively
if (ctbDbitReorder) {
LOG(logINFORED) << "Reordering digital data";
size_t numBitsPerDbit =
numDigitalSamples; // num bits per selected digital
// Bit for all samples
@ -604,8 +603,6 @@ void DataProcessor::ArrangeDbitData(size_t &size, char *data) {
if ((numBitsPerSample % 8) != 0)
numBitsPerSample += (8 - (numBitsPerSample % 8));
totalNumBytes = (numBitsPerSample / 8) * numDigitalSamples;
LOG(logINFORED) << "total numDigital bytes without reorder:"
<< totalNumBytes;
}
std::vector<uint8_t> result(totalNumBytes, 0);
@ -678,11 +675,11 @@ void DataProcessor::ArrangeDbitData(size_t &size, char *data) {
memcpy(data + nAnalogDataBytes, result.data(),
totalNumBytes * sizeof(uint8_t));
LOG(logINFORED) << "totalNumBytes: " << totalNumBytes
<< " nAnalogDataBytes:" << nAnalogDataBytes
<< " ctbDbitOffset:" << ctbDbitOffset
<< " nTransceiverDataBytes:" << nTransceiverDataBytes
<< " size:" << size;
LOG(logDEBUG1) << "nDigitalDataBytes: " << totalNumBytes
<< " nAnalogDataBytes:" << nAnalogDataBytes
<< " ctbDbitOffset:" << ctbDbitOffset
<< " nTransceiverDataBytes:" << nTransceiverDataBytes
<< " toal size:" << size;
}
void DataProcessor::CropImage(size_t &size, char *data) {