Skip to content

Commit

Permalink
everything?
Browse files Browse the repository at this point in the history
  • Loading branch information
AJPfleger committed Sep 30, 2024
1 parent 6d039ab commit 913f0fd
Show file tree
Hide file tree
Showing 18 changed files with 51 additions and 38 deletions.
4 changes: 2 additions & 2 deletions Core/include/Acts/EventData/VectorMultiTrajectory.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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);
}
}

Expand Down
17 changes: 17 additions & 0 deletions Core/include/Acts/Geometry/GeometryHierarchyMap.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -303,4 +314,10 @@ inline auto GeometryHierarchyMap<value_t>::find(
return end();
}

template <typename value_t>
inline auto GeometryHierarchyMap<value_t>::contains(
const GeometryIdentifier& id) const -> bool {
return this->find(id) != this->end();
}

} // namespace Acts
5 changes: 2 additions & 3 deletions Core/src/Material/MaterialInteractionAssignment.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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]);
Expand Down
4 changes: 2 additions & 2 deletions Core/src/Vertexing/AdaptiveGridTrackDensity.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ Result<double> 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;
}
Expand All @@ -308,7 +308,7 @@ Result<double> 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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "
Expand Down
4 changes: 2 additions & 2 deletions Examples/Scripts/MaterialMapping/MaterialComposition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -89,7 +89,7 @@ int main(int argc, char** argv) {
// Subdetector configurations
std::vector<Region> dRegion = {};

if (vm.count("config") > 0) {
if (vm.contains("config")) {
std::filesystem::path config = vm["config"].as<std::string>();
std::cout << "Reading region configuration from JSON: " << config
<< std::endl;
Expand Down
9 changes: 5 additions & 4 deletions Examples/Scripts/MaterialMapping/materialPlotHelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::string, std::string>& surface_name,
const std::map<std::string, std::string>& surfaceName,
const std::uint64_t& id, const int& type, const float& pos,
const float& range_min, const float& range_max) {
Acts::GeometryIdentifier ID(id);
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Examples/Scripts/TrackingPerformance/ResidualsAndPulls.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion Examples/Scripts/TrackingPerformance/TrackSummary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion Plugins/ExaTrkX/src/CugraphTrackBuilding.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ std::vector<std::vector<int>> 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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(); }
Expand Down Expand Up @@ -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(); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion Tests/Benchmarks/BinUtilityBenchmark.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion Tests/Benchmarks/StepperBenchmarkCommons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
12 changes: 6 additions & 6 deletions Tests/UnitTests/Core/Seeding/UtilityFunctionsTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
2 changes: 1 addition & 1 deletion Tests/UnitTests/Core/TrackFitting/Gx2fTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ std::shared_ptr<const TrackingGeometry> 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<HomogeneousSurfaceMaterial>(matProp);
Expand Down
10 changes: 3 additions & 7 deletions Tests/UnitTests/Core/Utilities/GridIterationTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -538,9 +538,7 @@ BOOST_AUTO_TEST_CASE(grid_iteration_test_3d_local_norepetitions) {
for (std::size_t z : navigation[2ul]) {
std::array<std::size_t, 3ul> 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);
}
}
Expand All @@ -559,10 +557,8 @@ BOOST_AUTO_TEST_CASE(grid_iteration_test_3d_local_norepetitions) {
++numIterations;
std::array<std::size_t, 3ul> 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);
}

Expand Down

0 comments on commit 913f0fd

Please sign in to comment.