diff --git a/Core/include/Acts/Utilities/BinUtility.hpp b/Core/include/Acts/Utilities/BinUtility.hpp index 8ae8581cf10..83ec2115f0e 100644 --- a/Core/include/Acts/Utilities/BinUtility.hpp +++ b/Core/include/Acts/Utilities/BinUtility.hpp @@ -62,7 +62,7 @@ class BinUtility { const Transform3& tForm = Transform3::Identity()) : m_binningData(), m_transform(tForm), m_itransform(tForm.inverse()) { m_binningData.reserve(3); - m_binningData.push_back(bData); + m_binningData.emplace_back(bData); } /// Constructor for equidistant @@ -78,7 +78,7 @@ class BinUtility { const Transform3& tForm = Transform3::Identity()) : m_binningData(), m_transform(tForm), m_itransform(tForm.inverse()) { m_binningData.reserve(3); - m_binningData.push_back(BinningData(opt, value, bins, min, max)); + m_binningData.emplace_back(BinningData(opt, value, bins, min, max)); } /// Constructor for arbitrary @@ -92,7 +92,7 @@ class BinUtility { const Transform3& tForm = Transform3::Identity()) : m_binningData(), m_transform(tForm), m_itransform(tForm.inverse()) { m_binningData.reserve(3); - m_binningData.push_back(BinningData(opt, value, bValues)); + m_binningData.emplace_back(BinningData(opt, value, bValues)); } /// Copy constructor @@ -110,19 +110,19 @@ class BinUtility { m_transform(Transform3::Identity()), m_itransform(Transform3::Identity()) { m_binningData.reserve(3); - m_binningData.push_back(BinningData(pAxis)); + m_binningData.emplace_back(BinningData(pAxis)); } /// Create from ProtoAxis /// /// @param pAxes the ProtoAxes to be used - BinUtility(const std::vector& pAxes) + explicit BinUtility(const std::vector& pAxes) : m_binningData(), m_transform(Transform3::Identity()), m_itransform(Transform3::Identity()) { m_binningData.reserve(3); for (const auto& pAxis : pAxes) { - m_binningData.push_back(BinningData(pAxis)); + m_binningData.emplace_back(BinningData(pAxis)); } } diff --git a/Core/include/Acts/Utilities/BinningData.hpp b/Core/include/Acts/Utilities/BinningData.hpp index cfe948c17ab..8f982131eb2 100644 --- a/Core/include/Acts/Utilities/BinningData.hpp +++ b/Core/include/Acts/Utilities/BinningData.hpp @@ -187,7 +187,7 @@ class BinningData { min = static_cast(axis.getMin()); max = static_cast(axis.getMax()); m_bins = axis.getNBins(); - step = (max - min) / (1. * m_bins); + step = (max - min) / static_cast(m_bins); zdim = (m_bins == 1); m_boundaries.reserve(axis.getBinEdges().size()); for (const auto& edge : axis.getBinEdges()) { diff --git a/Core/src/Utilities/ProtoAxis.cpp b/Core/src/Utilities/ProtoAxis.cpp index 313ea340e70..afd73614d87 100644 --- a/Core/src/Utilities/ProtoAxis.cpp +++ b/Core/src/Utilities/ProtoAxis.cpp @@ -113,11 +113,8 @@ void Acts::ProtoAxis::setRange(double minE, double maxE) { } else { std::vector edges = m_axis->getBinEdges(); // Clip it to min/max - edges.erase(std::remove_if(edges.begin(), edges.end(), - [minE, maxE](double e) -> bool { - return (e < minE || e > maxE); - }), - edges.end()); + std::erase_if(edges, + [minE, maxE](double e) { return (e < minE || e > maxE); }); // Add the min and max edges.emplace_back(minE); edges.emplace_back(maxE);