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

removed conditional operator and moved to range for

Browse Source
This commit is contained in:
Erik Frojdh
2018-10-16 15:25:15 +02:00
parent 66e79dc9a9
commit 3c9b1884d3
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
slsReceiverSoftware/src/slsReceiverImplementation.cpp
View File

@ -238,14 +238,13 @@ uint64_t slsReceiverImplementation::getTotalFramesCaught() const {
uint64_t sum = 0; uint64_t sum = 0;
uint32_t flagsum = 0; uint32_t flagsum = 0;
std::vector<DataProcessor*>::const_iterator it; for (const auto& it : dataProcessor){
for (std::vector<DataProcessor*>::const_iterator it = dataProcessor.begin(); it != dataProcessor.end(); ++it) { flagsum += it->GetMeasurementStartedFlag();
flagsum += ((*it)->GetMeasurementStartedFlag() ? 1 : 0); sum += it->GetNumTotalFramesCaught();
sum += (*it)->GetNumTotalFramesCaught();
} }
//no data processed //no data processed
if (flagsum != dataProcessor.size()) return 0; if (flagsum != dataProcessor.size())
return 0;
return (sum/dataProcessor.size()); return (sum/dataProcessor.size());
} }
@ -254,13 +253,13 @@ uint64_t slsReceiverImplementation::getFramesCaught() const {
uint64_t sum = 0; uint64_t sum = 0;
uint32_t flagsum = 0; uint32_t flagsum = 0;
for (std::vector<DataProcessor*>::const_iterator it = dataProcessor.begin(); it != dataProcessor.end(); ++it) { for (const auto& it : dataProcessor){
flagsum += ((*it)->GetAcquisitionStartedFlag() ? 1 : 0); flagsum += it->GetMeasurementStartedFlag();
sum += (*it)->GetNumFramesCaught(); sum += it->GetNumFramesCaught();
} }
//no data processed //no data processed
if (flagsum != dataProcessor.size()) return 0; if (flagsum != dataProcessor.size())
return 0;
return (sum/dataProcessor.size()); return (sum/dataProcessor.size());
} }
@ -269,13 +268,13 @@ int64_t slsReceiverImplementation::getAcquisitionIndex() const {
uint64_t sum = 0; uint64_t sum = 0;
uint32_t flagsum = 0; uint32_t flagsum = 0;
for (std::vector<DataProcessor*>::const_iterator it = dataProcessor.begin(); it != dataProcessor.end(); ++it){ for (const auto& it : dataProcessor){
flagsum += ((*it)->GetAcquisitionStartedFlag() ? 1 : 0); flagsum += it->GetMeasurementStartedFlag();
sum += (*it)->GetActualProcessedAcquisitionIndex(); sum += it->GetActualProcessedAcquisitionIndex();
} }
//no data processed //no data processed
if (flagsum != dataProcessor.size()) return -1; if (flagsum != dataProcessor.size())
return -1;
return (sum/dataProcessor.size()); return (sum/dataProcessor.size());
} }