detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 03:10:02 +02:00
Code Issues Actions Packages Releases Activity

slsReceiver bug fix in ctb extracting digital bits

Browse Source
This commit is contained in:
maliakal_d 2019-05-14 16:41:25 +02:00
parent d114f8db90
commit 3e654977ca
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -513,32 +513,43 @@ void DataProcessor::RearrangeDbitData(char* buf) {
} }
const int numSamples = (ctbDigitalDataBytes / sizeof(uint64_t)); const int numSamples = (ctbDigitalDataBytes / sizeof(uint64_t));
const int digOffset = FIFO_HEADER_NUMBYTES + sizeof(sls_receiver_header) + (*ctbAnalogDataBytes);
// ceil as numResult64Bytes could be decimal // ceil as numResult32Bits could be decimal
const int numResult64Bytes = ceil((double)(numSamples * (*ctbDbitList).size()) / 64.00); const int numResult32Bits = ceil((double)(numSamples * (*ctbDbitList).size()) / 32.00);
std::vector<uint64_t> result(numResult64Bytes, 0); uint32_t result[numResult32Bits];
memset(result, 0, numResult32Bits * sizeof(uint32_t));
auto dest = result.data(); uint32_t* dest = result;
const int digOffset = FIFO_HEADER_NUMBYTES + sizeof(sls_receiver_header) + (*ctbAnalogDataBytes) + (*ctbDbitOffset); uint64_t* source = (uint64_t*)(buf + digOffset + (*ctbDbitOffset));
auto source = (uint64_t*)(buf + digOffset);
// loop through digital bit enable vector // loop through digital bit enable vector
int bitoffset = 0;
for (auto bi : (*ctbDbitList)) { for (auto bi : (*ctbDbitList)) {
// where numbits * numsamples is not a multiple of 32
if (bitoffset != 0) {
bitoffset = 0;
++dest;
}
// loop through the frame digital data // loop through the frame digital data
for (auto ptr = source; ptr < (source + numSamples);) { for (auto ptr = source; ptr < (source + numSamples);) {
// extract destination in 64 bit batches // get selected bit from each 32 bit
for (int i = 0; i != 64; ++i) { uint32_t bit = (*ptr++ >> bi) & 1;
// get selected bit from each 64 bit *dest |= bit << bitoffset;
int bit = (*ptr++ >> bi) & 1; ++bitoffset;
*dest |= bit << i; // extract destination in 32 bit batches
} if (bitoffset == 32) {
bitoffset = 0;
++dest; ++dest;
} }
} }
}
// copy back to buf and update size // copy back to buf and update size
memcpy(buf + digOffset - (*ctbDbitOffset), result.data(), result.size() * sizeof(uint64_t)); memcpy(buf + digOffset, result, numResult32Bits * sizeof(uint32_t));
(*((uint32_t*)buf)) = result.size() * sizeof(uint64_t); (*((uint32_t*)buf)) = numResult32Bits * sizeof(uint32_t);
} }
/** eiger specific */ /** eiger specific */