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

used clang-formating

Browse Source
This commit is contained in:
mazzol_a 2025-03-11 16:32:31 +01:00
parent 23aa9c2814
commit 8d87a6ee4e
4 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -75,9 +75,7 @@ void DataProcessor::SetCtbDbitList(std::vector<int> value) {
ctbDbitList = value; ctbDbitList = value;
} }
void DataProcessor::SetReorder(const bool value) { void DataProcessor::SetReorder(const bool value) { reorder = value; }
reorder = value;
}
void DataProcessor::SetCtbDbitOffset(int value) { ctbDbitOffset = value; } void DataProcessor::SetCtbDbitOffset(int value) { ctbDbitOffset = value; }
@ -538,7 +536,8 @@ void DataProcessor::PadMissingPackets(sls_receiver_header header, char *data) {
void DataProcessor::ArrangeDbitData(size_t &size, char *data) { void DataProcessor::ArrangeDbitData(size_t &size, char *data) {
size_t nAnalogDataBytes = generalData->GetNumberOfAnalogDatabytes(); size_t nAnalogDataBytes = generalData->GetNumberOfAnalogDatabytes();
size_t nDigitalDataBytes = generalData->GetNumberOfDigitalDatabytes(); size_t nDigitalDataBytes = generalData->GetNumberOfDigitalDatabytes();
size_t nTransceiverDataBytes = generalData->GetNumberOfTransceiverDatabytes(); size_t nTransceiverDataBytes =
generalData->GetNumberOfTransceiverDatabytes();
// TODO! (Erik) Refactor and add tests // TODO! (Erik) Refactor and add tests
int ctbDigitalDataBytes = nDigitalDataBytes - ctbDbitOffset; int ctbDigitalDataBytes = nDigitalDataBytes - ctbDbitOffset;
@ -553,18 +552,21 @@ void DataProcessor::ArrangeDbitData(size_t &size, char *data) {
const int numDigitalSamples = (ctbDigitalDataBytes / sizeof(uint64_t)); const int numDigitalSamples = (ctbDigitalDataBytes / sizeof(uint64_t));
int totalNumBytes = 0; //number of bytes for selected digital data given by dtbDbitList int totalNumBytes =
0; // number of bytes for selected digital data given by dtbDbitList
// store each selected bit from all samples consecutively // store each selected bit from all samples consecutively
if (reorder) { if (reorder) {
int numBitsPerDbit = numDigitalSamples; //num bits per selected digital Bit for all samples int numBitsPerDbit = numDigitalSamples; // num bits per selected digital
// Bit for all samples
if ((numBitsPerDbit % 8) != 0) if ((numBitsPerDbit % 8) != 0)
numBitsPerDbit += (8 - (numDigitalSamples % 8)); numBitsPerDbit += (8 - (numDigitalSamples % 8));
totalNumBytes = (numBitsPerDbit / 8) * ctbDbitList.size(); totalNumBytes = (numBitsPerDbit / 8) * ctbDbitList.size();
} }
// store all selected bits from one sample consecutively // store all selected bits from one sample consecutively
else { else {
size_t numBitsPerSample = ctbDbitList.size(); //num bits for all selected bits per sample size_t numBitsPerSample =
ctbDbitList.size(); // num bits for all selected bits per sample
if ((numBitsPerSample % 8) != 0) if ((numBitsPerSample % 8) != 0)
numBitsPerSample += (8 - (numBitsPerSample % 8)); numBitsPerSample += (8 - (numBitsPerSample % 8));
totalNumBytes = (numBitsPerSample / 8) * numDigitalSamples; totalNumBytes = (numBitsPerSample / 8) * numDigitalSamples;
@ -596,8 +598,7 @@ void DataProcessor::ArrangeDbitData(size_t &size, char *data) {
} }
} }
} }
} } else {
else {
// loop through the digital data // loop through the digital data
int bitoffset = 0; int bitoffset = 0;
for (auto *ptr = source; ptr < (source + numDigitalSamples); ++ptr) { for (auto *ptr = source; ptr < (source + numDigitalSamples); ++ptr) {
@ -631,7 +632,9 @@ void DataProcessor::ArrangeDbitData(size_t &size, char *data) {
// check if size changed, if so move transceiver data to avoid gap in memory // check if size changed, if so move transceiver data to avoid gap in memory
if (size < nAnalogDataBytes + nDigitalDataBytes + nTransceiverDataBytes) if (size < nAnalogDataBytes + nDigitalDataBytes + nTransceiverDataBytes)
memmove(data + nAnalogDataBytes + totalNumBytes * sizeof(uint8_t), data + nAnalogDataBytes + nDigitalDataBytes, nTransceiverDataBytes); memmove(data + nAnalogDataBytes + totalNumBytes * sizeof(uint8_t),
data + nAnalogDataBytes + nDigitalDataBytes,
nTransceiverDataBytes);
LOG(logDEBUG1) << "totalNumBytes: " << totalNumBytes LOG(logDEBUG1) << "totalNumBytes: " << totalNumBytes
<< " nAnalogDataBytes:" << nAnalogDataBytes << " nAnalogDataBytes:" << nAnalogDataBytes