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

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

43
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -75,9 +75,7 @@ void DataProcessor::SetCtbDbitList(std::vector<int> value) {
ctbDbitList = value;
}
void DataProcessor::SetReorder(const bool value) {
reorder = value;
}
void DataProcessor::SetReorder(const bool value) { reorder = value; }
void DataProcessor::SetCtbDbitOffset(int value) { ctbDbitOffset = value; }
@ -536,9 +534,10 @@ void DataProcessor::PadMissingPackets(sls_receiver_header header, char *data) {
/** ctb specific */
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 nTransceiverDataBytes = generalData->GetNumberOfTransceiverDatabytes();
size_t nTransceiverDataBytes =
generalData->GetNumberOfTransceiverDatabytes();
// TODO! (Erik) Refactor and add tests
int ctbDigitalDataBytes = nDigitalDataBytes - ctbDbitOffset;
@ -553,18 +552,21 @@ void DataProcessor::ArrangeDbitData(size_t &size, char *data) {
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
if(reorder) {
int numBitsPerDbit = numDigitalSamples; //num bits per selected digital Bit for all samples
// store each selected bit from all samples consecutively
if (reorder) {
int numBitsPerDbit = numDigitalSamples; // num bits per selected digital
// Bit for all samples
if ((numBitsPerDbit % 8) != 0)
numBitsPerDbit += (8 - (numDigitalSamples % 8));
totalNumBytes = (numBitsPerDbit / 8) * ctbDbitList.size();
}
//store all selected bits from one sample consecutively
else {
size_t numBitsPerSample = ctbDbitList.size(); //num bits for all selected bits per sample
// store all selected bits from one sample consecutively
else {
size_t numBitsPerSample =
ctbDbitList.size(); // num bits for all selected bits per sample
if ((numBitsPerSample % 8) != 0)
numBitsPerSample += (8 - (numBitsPerSample % 8));
totalNumBytes = (numBitsPerSample / 8) * numDigitalSamples;
@ -573,7 +575,7 @@ void DataProcessor::ArrangeDbitData(size_t &size, char *data) {
std::vector<uint8_t> result(totalNumBytes, 0);
uint8_t *dest = &result[0];
if(reorder) {
if (reorder) {
// loop through digital bit enable vector
int bitoffset = 0;
for (auto bi : ctbDbitList) {
@ -596,8 +598,7 @@ void DataProcessor::ArrangeDbitData(size_t &size, char *data) {
}
}
}
}
else {
} else {
// loop through the digital data
int bitoffset = 0;
for (auto *ptr = source; ptr < (source + numDigitalSamples); ++ptr) {
@ -625,13 +626,15 @@ void DataProcessor::ArrangeDbitData(size_t &size, char *data) {
// copy back to memory and update size
memcpy(data + nAnalogDataBytes, result.data(),
totalNumBytes * sizeof(uint8_t));
size = totalNumBytes * sizeof(uint8_t) + nAnalogDataBytes +
nTransceiverDataBytes;
//check if size changed, if so move transceiver data to avoid gap in memory
if(size < nAnalogDataBytes + nDigitalDataBytes + nTransceiverDataBytes)
memmove(data + nAnalogDataBytes + totalNumBytes * sizeof(uint8_t), data + nAnalogDataBytes + nDigitalDataBytes, nTransceiverDataBytes);
// check if size changed, if so move transceiver data to avoid gap in memory
if (size < nAnalogDataBytes + nDigitalDataBytes + nTransceiverDataBytes)
memmove(data + nAnalogDataBytes + totalNumBytes * sizeof(uint8_t),
data + nAnalogDataBytes + nDigitalDataBytes,
nTransceiverDataBytes);
LOG(logDEBUG1) << "totalNumBytes: " << totalNumBytes
<< " nAnalogDataBytes:" << nAnalogDataBytes

8
slsReceiverSoftware/src/DataProcessor.h
View File

@ -140,11 +140,11 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
/**
* Align corresponding digital bits together (CTB only if ctbDbitlist is not
* empty)
* set variable reorder to true if, data should be rearranged such that
* empty)
* set variable reorder to true if, data should be rearranged such that
* individual digital bits from all samples are consecutive in memory
*/
void ArrangeDbitData(size_t &size, char *data);
void ArrangeDbitData(size_t &size, char *data);
void CropImage(size_t &size, char *data);
@ -168,7 +168,7 @@ class DataProcessor : private virtual slsDetectorDefs, public ThreadObject {
struct timespec timerbegin {};
bool framePadding;
std::vector<int> ctbDbitList;
bool reorder{false}; //true if data should be reordered TODO: add as mode
bool reorder{false}; // true if data should be reordered TODO: add as mode
int ctbDbitOffset;
std::atomic<bool> startedFlag{false};
std::atomic<uint64_t> firstIndex{0};

6
slsReceiverSoftware/src/Implementation.cpp
View File

@ -915,10 +915,10 @@ void Implementation::CreateUDPSockets() {
}
void Implementation::SetupWriter() {
try {
//check if filePath empty and throw error
if(filePath.empty()){
// check if filePath empty and throw error
if (filePath.empty()) {
throw ReceiverError("File path cannot be empty");
}
// check if folder exists and throw if it cant create

10
slsSupportLib/include/sls/versionAPI.h
View File

@ -3,10 +3,10 @@
/** API versions */
#define APILIB "developer 0x241122"
#define APIRECEIVER "developer 0x241122"
#define APICTB "developer 0x250310"
#define APICTB "developer 0x250310"
#define APIGOTTHARD2 "developer 0x250310"
#define APIJUNGFRAU "developer 0x250310"
#define APIMYTHEN3 "developer 0x250310"
#define APIMOENCH "developer 0x250310"
#define APIJUNGFRAU "developer 0x250310"
#define APIMYTHEN3 "developer 0x250310"
#define APIMOENCH "developer 0x250310"
#define APIXILINXCTB "developer 0x250310"
#define APIEIGER "developer 0x250310"
#define APIEIGER "developer 0x250310"