From f5773de068f7a8809fd9ff5300af8eacef86101d Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 28 Jul 2017 12:16:07 +0200 Subject: [PATCH] changes for single images with index 0 not realized as caught and therefore no virtual file created, fixed --- slsReceiverSoftware/src/DataProcessor.cpp | 2 +- slsReceiverSoftware/src/UDPStandardImplementation.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index 8d53bf6e1..612aae001 100644 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -260,7 +260,7 @@ void DataProcessor::CloseFiles() { } void DataProcessor::EndofAcquisition(uint64_t numf) { - if (*fileWriteEnable && file->GetFileType() == HDF5 && numf) { + if (*fileWriteEnable && file->GetFileType() == HDF5) { file->EndofAcquisition(numf); } } diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp index a04e5131e..25e9e9ebd 100644 --- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp +++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp @@ -494,10 +494,13 @@ void UDPStandardImplementation::stopReceiver(){ //create virtual file if (fileWriteEnable && fileFormatType == HDF5) { uint64_t maxIndexCaught = 0; + bool anycaught = false; for (vector::const_iterator it = dataProcessor.begin(); it != dataProcessor.end(); ++it) { maxIndexCaught = max(maxIndexCaught, (*it)->GetProcessedMeasurementIndex()); + if((*it)->GetMeasurementStartedFlag()) + anycaught = true; } - if (maxIndexCaught) + if (anycaught) dataProcessor[0]->EndofAcquisition(maxIndexCaught); //to create virtual file }