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

Merge branch 'developer' into dev/test_all_acquire_file

Browse Source
This commit is contained in:
maliakal_d 2025-05-01 16:42:39 +02:00
commit 8bb9de0de1
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -352,6 +352,9 @@ void DataProcessor::ProcessAnImage(sls_receiver_header &header, size_t &size,
if (framePadding && nump < generalData->packetsPerFrame) if (framePadding && nump < generalData->packetsPerFrame)
PadMissingPackets(header, data); PadMissingPackets(header, data);
if (generalData->readoutType == slsDetectorDefs::DIGITAL_ONLY ||
generalData->readoutType == slsDetectorDefs::ANALOG_AND_DIGITAL ||
generalData->readoutType == slsDetectorDefs::DIGITAL_AND_TRANSCEIVER) {
// rearrange ctb digital bits // rearrange ctb digital bits
if (!generalData->ctbDbitList.empty()) { if (!generalData->ctbDbitList.empty()) {
ArrangeDbitData(size, data); ArrangeDbitData(size, data);
@ -363,6 +366,7 @@ void DataProcessor::ProcessAnImage(sls_receiver_header &header, size_t &size,
} else if (generalData->ctbDbitOffset > 0) { } else if (generalData->ctbDbitOffset > 0) {
RemoveTrailingBits(size, data); RemoveTrailingBits(size, data);
} }
}
// 'stream Image' check has to be done here before crop image // 'stream Image' check has to be done here before crop image
// stream (if time/freq to stream) or free // stream (if time/freq to stream) or free