mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-05-05 12:20:02 +02:00
Merge branch 'developer' into dev/test_all_acquire_file
This commit is contained in:
commit
8bb9de0de1
@ -352,6 +352,9 @@ void DataProcessor::ProcessAnImage(sls_receiver_header &header, size_t &size,
|
||||
if (framePadding && nump < generalData->packetsPerFrame)
|
||||
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
|
||||
if (!generalData->ctbDbitList.empty()) {
|
||||
ArrangeDbitData(size, data);
|
||||
@ -363,6 +366,7 @@ void DataProcessor::ProcessAnImage(sls_receiver_header &header, size_t &size,
|
||||
} else if (generalData->ctbDbitOffset > 0) {
|
||||
RemoveTrailingBits(size, data);
|
||||
}
|
||||
}
|
||||
|
||||
// 'stream Image' check has to be done here before crop image
|
||||
// stream (if time/freq to stream) or free
|
||||
|
Loading…
x
Reference in New Issue
Block a user