From 913f0fd28962269ad19a85f1b210e0034975d72a Mon Sep 17 00:00:00 2001 From: AJPfleger Date: Mon, 30 Sep 2024 11:17:31 +0200 Subject: [PATCH] everything? --- .../Acts/EventData/VectorMultiTrajectory.hpp | 4 ++-- .../Acts/Geometry/GeometryHierarchyMap.hpp | 17 +++++++++++++++++ .../Material/MaterialInteractionAssignment.cpp | 5 ++--- Core/src/Vertexing/AdaptiveGridTrackDensity.cpp | 4 ++-- .../TruthTracking/TrackTruthMatcher.cpp | 2 +- .../TruthTracking/TruthVertexFinder.cpp | 2 +- .../MaterialMapping/MaterialComposition.cpp | 4 ++-- .../MaterialMapping/materialPlotHelper.cpp | 9 +++++---- .../TrackingPerformance/ResidualsAndPulls.cpp | 2 +- .../TrackingPerformance/TrackSummary.cpp | 2 +- Plugins/ExaTrkX/src/CugraphTrackBuilding.cpp | 2 +- .../Acts/Plugins/Podio/PodioTrackContainer.hpp | 4 ++-- .../Plugins/Podio/PodioTrackStateContainer.hpp | 4 ++-- Tests/Benchmarks/BinUtilityBenchmark.cpp | 2 +- Tests/Benchmarks/StepperBenchmarkCommons.hpp | 2 +- .../Core/Seeding/UtilityFunctionsTests.cpp | 12 ++++++------ Tests/UnitTests/Core/TrackFitting/Gx2fTests.cpp | 2 +- .../Core/Utilities/GridIterationTests.cpp | 10 +++------- 18 files changed, 51 insertions(+), 38 deletions(-) diff --git a/Core/include/Acts/EventData/VectorMultiTrajectory.hpp b/Core/include/Acts/EventData/VectorMultiTrajectory.hpp index 2dbc3b3687d..66d6bd26da0 100644 --- a/Core/include/Acts/EventData/VectorMultiTrajectory.hpp +++ b/Core/include/Acts/EventData/VectorMultiTrajectory.hpp @@ -220,7 +220,7 @@ class VectorMultiTrajectoryBase { case "typeFlags"_hash: return true; default: - return instance.m_dynamic.find(key) != instance.m_dynamic.end(); + return instance.m_dynamic.contains(key); } } @@ -287,7 +287,7 @@ class VectorMultiTrajectoryBase { case "typeFlags"_hash: return true; default: - return instance.m_dynamic.find(key) != instance.m_dynamic.end(); + return instance.m_dynamic.contains(key); } } diff --git a/Core/include/Acts/Geometry/GeometryHierarchyMap.hpp b/Core/include/Acts/Geometry/GeometryHierarchyMap.hpp index b2b10b9e52f..e7ddd27c5e6 100644 --- a/Core/include/Acts/Geometry/GeometryHierarchyMap.hpp +++ b/Core/include/Acts/Geometry/GeometryHierarchyMap.hpp @@ -117,6 +117,17 @@ class GeometryHierarchyMap { /// @retval `.end()` iterator if no matching element exists Iterator find(const GeometryIdentifier& id) const; + /// Check if the most specific value exists for a given geometry identifier. + /// + /// This function checks if there is an element matching exactly the given + /// geometry id, or from the element for the next available higher level + /// within the geometry hierarchy. + /// + /// @param id geometry identifier for which existence is being checked + /// @retval `true` if a matching element exists + /// @retval `false` if no matching element exists + bool contains(const GeometryIdentifier& id) const; + private: // NOTE this class assumes that it knows the ordering of the levels within // the geometry id. if the geometry id changes, this code has to be @@ -303,4 +314,10 @@ inline auto GeometryHierarchyMap::find( return end(); } +template +inline auto GeometryHierarchyMap::contains( + const GeometryIdentifier& id) const -> bool { + return this->find(id) != this->end(); +} + } // namespace Acts diff --git a/Core/src/Material/MaterialInteractionAssignment.cpp b/Core/src/Material/MaterialInteractionAssignment.cpp index 5678710161c..549f88e7a25 100644 --- a/Core/src/Material/MaterialInteractionAssignment.cpp +++ b/Core/src/Material/MaterialInteractionAssignment.cpp @@ -73,7 +73,7 @@ Acts::MaterialInteractionAssignment::assign( // A local veta veto kicked in GeometryIdentifier intersectionID = surface->geometryId(); - if (options.localVetos.find(intersectionID) != options.localVetos.end()) { + if (options.localVetos.contains(intersectionID)) { const auto& localVeto = *options.localVetos.find(intersectionID); if (localVeto(materialInteraction, intersectedSurfaces[is])) { unassignedMaterialInteractions.push_back(materialInteraction); @@ -91,8 +91,7 @@ Acts::MaterialInteractionAssignment::assign( assignedMaterialInteraction.intersectionID = intersectionID; // Check for possible reassignment if (is + 1u < intersectedSurfaces.size() && - options.reAssignments.find(intersectionID) != - options.reAssignments.end()) { + options.reAssignments.contains(intersectionID)) { auto reAssignment = (*options.reAssignments.find(intersectionID)); reAssignment(assignedMaterialInteraction, intersectedSurfaces[is], intersectedSurfaces[is + 1]); diff --git a/Core/src/Vertexing/AdaptiveGridTrackDensity.cpp b/Core/src/Vertexing/AdaptiveGridTrackDensity.cpp index bff02fa8910..37f59506f6f 100644 --- a/Core/src/Vertexing/AdaptiveGridTrackDensity.cpp +++ b/Core/src/Vertexing/AdaptiveGridTrackDensity.cpp @@ -286,7 +286,7 @@ Result AdaptiveGridTrackDensity::estimateSeedWidth( bool binFilled = true; while (gridValue > maxValue / 2) { // Check if we are still operating on continuous z values - if (densityMap.count({rhmBin + 1, tMaxBin}) == 0) { + if (!densityMap.contains({rhmBin + 1, tMaxBin})) { binFilled = false; break; } @@ -308,7 +308,7 @@ Result AdaptiveGridTrackDensity::estimateSeedWidth( binFilled = true; while (gridValue > maxValue / 2) { // Check if we are still operating on continuous z values - if (densityMap.count({lhmBin - 1, tMaxBin}) == 0) { + if (!densityMap.contains({lhmBin - 1, tMaxBin})) { binFilled = false; break; } diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackTruthMatcher.cpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackTruthMatcher.cpp index 46ff000f591..dcdb1dc834c 100644 --- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackTruthMatcher.cpp +++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackTruthMatcher.cpp @@ -84,7 +84,7 @@ ActsExamples::ProcessCode TrackTruthMatcher::execute( particleHitCounts.front().particleId; std::size_t nMajorityHits = particleHitCounts.front().hitCount; - if (particles.find(majorityParticleId) == particles.end()) { + if (!particles.contains(majorityParticleId)) { ACTS_DEBUG( "The majority particle is not in the input particle collection, " "majorityParticleId = " diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthVertexFinder.cpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthVertexFinder.cpp index 9c73b49f267..527d0ec6750 100644 --- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthVertexFinder.cpp +++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthVertexFinder.cpp @@ -104,7 +104,7 @@ ProcessCode TruthVertexFinder::execute(const AlgorithmContext& ctx) const { particleHitCounts.front().particleId; std::size_t nMajorityHits = particleHitCounts.front().hitCount; - if (particles.find(majorityParticleId) == particles.end()) { + if (!particles.contains(majorityParticleId)) { ACTS_DEBUG( "The majority particle is not in the input particle collection, " "majorityParticleId = " diff --git a/Examples/Scripts/MaterialMapping/MaterialComposition.cpp b/Examples/Scripts/MaterialMapping/MaterialComposition.cpp index bc9f7936f67..cecaedb49b3 100644 --- a/Examples/Scripts/MaterialMapping/MaterialComposition.cpp +++ b/Examples/Scripts/MaterialMapping/MaterialComposition.cpp @@ -73,7 +73,7 @@ int main(int argc, char** argv) { store(command_line_parser(argc, argv).options(description).run(), vm); notify(vm); - if (vm.count("help") != 0u) { + if (vm.contains("help")) { std::cout << description; } @@ -89,7 +89,7 @@ int main(int argc, char** argv) { // Subdetector configurations std::vector dRegion = {}; - if (vm.count("config") > 0) { + if (vm.contains("config")) { std::filesystem::path config = vm["config"].as(); std::cout << "Reading region configuration from JSON: " << config << std::endl; diff --git a/Examples/Scripts/MaterialMapping/materialPlotHelper.cpp b/Examples/Scripts/MaterialMapping/materialPlotHelper.cpp index 0558219cbbf..4df1adc84b4 100644 --- a/Examples/Scripts/MaterialMapping/materialPlotHelper.cpp +++ b/Examples/Scripts/MaterialMapping/materialPlotHelper.cpp @@ -36,7 +36,7 @@ std::ostream& Acts::operator<<(std::ostream& os, Acts::GeometryIdentifier id) { /// Initialise the information on each surface. void Initialise_info(sinfo& surface_info, - const std::map& surface_name, + const std::map& surfaceName, const std::uint64_t& id, const int& type, const float& pos, const float& range_min, const float& range_max) { Acts::GeometryIdentifier ID(id); @@ -67,10 +67,11 @@ void Initialise_info(sinfo& surface_info, Ids[3] + "_s" + Ids[4]; surface_info.type = type; - if (surface_name.find(surface_id) != surface_name.end()) { - surface_info.name = surface_name.at(surface_id); - } else + if (surfaceName.contains(surface_id)) { + surface_info.name = surfaceName.at(surface_id); + } else { surface_info.name = ""; + } surface_info.id = surface_id; surface_info.pos = pos; diff --git a/Examples/Scripts/TrackingPerformance/ResidualsAndPulls.cpp b/Examples/Scripts/TrackingPerformance/ResidualsAndPulls.cpp index f0875b1a77f..5c87a8fd1c4 100644 --- a/Examples/Scripts/TrackingPerformance/ResidualsAndPulls.cpp +++ b/Examples/Scripts/TrackingPerformance/ResidualsAndPulls.cpp @@ -46,7 +46,7 @@ int main(int argc, char** argv) { variables_map vm; store(command_line_parser(argc, argv).options(description).run(), vm); - if (vm.count("help") != 0u) { + if (vm.contains("help")) { std::cout << description; return 1; } diff --git a/Examples/Scripts/TrackingPerformance/TrackSummary.cpp b/Examples/Scripts/TrackingPerformance/TrackSummary.cpp index 06d547bd357..05e33a81d46 100644 --- a/Examples/Scripts/TrackingPerformance/TrackSummary.cpp +++ b/Examples/Scripts/TrackingPerformance/TrackSummary.cpp @@ -109,7 +109,7 @@ int main(int argc, char** argv) { variables_map vm; store(command_line_parser(argc, argv).options(description).run(), vm); - if (vm.count("help") != 0u) { + if (vm.contains("help")) { std::cout << description; return 1; } diff --git a/Plugins/ExaTrkX/src/CugraphTrackBuilding.cpp b/Plugins/ExaTrkX/src/CugraphTrackBuilding.cpp index 87e2adbf161..56469e79083 100644 --- a/Plugins/ExaTrkX/src/CugraphTrackBuilding.cpp +++ b/Plugins/ExaTrkX/src/CugraphTrackBuilding.cpp @@ -65,7 +65,7 @@ std::vector> CugraphTrackBuilding::operator()( int spacepointID = spacepointIDs[idx]; int trkId; - if (trackLableToIds.find(trackLabel) != trackLableToIds.end()) { + if (trackLableToIds.contains(trackLabel)) { trkId = trackLableToIds[trackLabel]; trackCandidates[trkId].push_back(spacepointID); } else { diff --git a/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackContainer.hpp b/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackContainer.hpp index f04cf6d7c6a..16a25795f6a 100644 --- a/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackContainer.hpp +++ b/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackContainer.hpp @@ -189,7 +189,7 @@ class MutablePodioTrackContainer : public PodioTrackContainerBase { } bool hasColumn_impl(HashedString key) const { - return m_dynamic.find(key) != m_dynamic.end(); + return m_dynamic.contains(key); } std::size_t size_impl() const { return m_collection->size(); } @@ -365,7 +365,7 @@ class ConstPodioTrackContainer : public PodioTrackContainerBase { } bool hasColumn_impl(HashedString key) const { - return m_dynamic.find(key) != m_dynamic.end(); + return m_dynamic.contains(key); } std::size_t size_impl() const { return m_collection->size(); } diff --git a/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackStateContainer.hpp b/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackStateContainer.hpp index 590d62a8d87..53643ab4a7d 100644 --- a/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackStateContainer.hpp +++ b/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackStateContainer.hpp @@ -88,7 +88,7 @@ class PodioTrackStateContainerBase { case "typeFlags"_hash: return true; default: - return instance.m_dynamic.find(key) != instance.m_dynamic.end(); + return instance.m_dynamic.contains(key); } return false; @@ -166,7 +166,7 @@ class PodioTrackStateContainerBase { case "typeFlags"_hash: return true; default: - return instance.m_dynamic.find(key) != instance.m_dynamic.end(); + return instance.m_dynamic.contains(key); } } diff --git a/Tests/Benchmarks/BinUtilityBenchmark.cpp b/Tests/Benchmarks/BinUtilityBenchmark.cpp index 6c9abdf5e4d..d6ed2970a80 100644 --- a/Tests/Benchmarks/BinUtilityBenchmark.cpp +++ b/Tests/Benchmarks/BinUtilityBenchmark.cpp @@ -34,7 +34,7 @@ int main(int argc, char* argv[]) { po::store(po::parse_command_line(argc, argv, desc), vm); po::notify(vm); - if (vm.count("help") != 0u) { + if (vm.contains("help")) { std::cout << desc << std::endl; return 0; } diff --git a/Tests/Benchmarks/StepperBenchmarkCommons.hpp b/Tests/Benchmarks/StepperBenchmarkCommons.hpp index 3fc6d361bef..0d4462f96c9 100644 --- a/Tests/Benchmarks/StepperBenchmarkCommons.hpp +++ b/Tests/Benchmarks/StepperBenchmarkCommons.hpp @@ -54,7 +54,7 @@ struct BenchmarkStepper { po::store(po::parse_command_line(argc, argv, desc), vm); po::notify(vm); - if (vm.count("help") != 0u) { + if (vm.contains("help")) { std::cout << desc << std::endl; return 0; } diff --git a/Tests/UnitTests/Core/Seeding/UtilityFunctionsTests.cpp b/Tests/UnitTests/Core/Seeding/UtilityFunctionsTests.cpp index 31085adaa63..9c5f86f6037 100644 --- a/Tests/UnitTests/Core/Seeding/UtilityFunctionsTests.cpp +++ b/Tests/UnitTests/Core/Seeding/UtilityFunctionsTests.cpp @@ -62,9 +62,9 @@ BOOST_AUTO_TEST_CASE(pushBackOrInsertAtEnd_set) { Acts::detail::pushBackOrInsertAtEnd(coll, val); BOOST_CHECK(coll.size() == 3ul); - BOOST_CHECK(coll.find(2ul) != coll.end()); - BOOST_CHECK(coll.find(5ul) != coll.end()); - BOOST_CHECK(coll.find(1ul) != coll.end()); + BOOST_CHECK(coll.contains(2ul)); + BOOST_CHECK(coll.contains(5ul)); + BOOST_CHECK(coll.contains(1ul)); } BOOST_AUTO_TEST_CASE(pushBackOrInsertAtEnd_unordered_set) { @@ -77,9 +77,9 @@ BOOST_AUTO_TEST_CASE(pushBackOrInsertAtEnd_unordered_set) { Acts::detail::pushBackOrInsertAtEnd(coll, val); BOOST_CHECK(coll.size() == 3ul); - BOOST_CHECK(coll.find(2ul) != coll.end()); - BOOST_CHECK(coll.find(5ul) != coll.end()); - BOOST_CHECK(coll.find(1ul) != coll.end()); + BOOST_CHECK(coll.contains(2ul)); + BOOST_CHECK(coll.contains(5ul)); + BOOST_CHECK(coll.contains(1ul)); } } // namespace Acts::Test diff --git a/Tests/UnitTests/Core/TrackFitting/Gx2fTests.cpp b/Tests/UnitTests/Core/TrackFitting/Gx2fTests.cpp index 2d9d110ec5f..e03f67f6cfe 100644 --- a/Tests/UnitTests/Core/TrackFitting/Gx2fTests.cpp +++ b/Tests/UnitTests/Core/TrackFitting/Gx2fTests.cpp @@ -149,7 +149,7 @@ std::shared_ptr makeToyDetector( RectangleBounds(halfSizeSurface, halfSizeSurface)); // Add material only for selected surfaces - if (surfaceIndexWithMaterial.count(surfPos) != 0) { + if (surfaceIndexWithMaterial.contains(surfPos)) { // Material of the surfaces MaterialSlab matProp(makeSilicon(), 5_mm); cfg.surMat = std::make_shared(matProp); diff --git a/Tests/UnitTests/Core/Utilities/GridIterationTests.cpp b/Tests/UnitTests/Core/Utilities/GridIterationTests.cpp index f3e8210eb55..fd67a2f03b3 100644 --- a/Tests/UnitTests/Core/Utilities/GridIterationTests.cpp +++ b/Tests/UnitTests/Core/Utilities/GridIterationTests.cpp @@ -538,9 +538,7 @@ BOOST_AUTO_TEST_CASE(grid_iteration_test_3d_local_norepetitions) { for (std::size_t z : navigation[2ul]) { std::array locPos({x, y, z}); std::size_t globPos = grid.globalBinFromLocalBins(locPos); - BOOST_CHECK_EQUAL( - allowed_global_bins.find(globPos) != allowed_global_bins.end(), - false); + BOOST_CHECK(!allowed_global_bins.contains(globPos)); allowed_global_bins.insert(globPos); } } @@ -559,10 +557,8 @@ BOOST_AUTO_TEST_CASE(grid_iteration_test_3d_local_norepetitions) { ++numIterations; std::array locPos = gridStart.localBinsIndices(); std::size_t globPos = grid.globalBinFromLocalBins(locPos); - BOOST_CHECK_EQUAL( - visited_global_bins.find(globPos) != visited_global_bins.end(), false); - BOOST_CHECK_EQUAL( - allowed_global_bins.find(globPos) != allowed_global_bins.end(), true); + BOOST_CHECK(!visited_global_bins.contains(globPos)); + BOOST_CHECK(allowed_global_bins.contains(globPos)); visited_global_bins.insert(globPos); }