From 8b162de2344cea211c95bb327316acd109b48bb6 Mon Sep 17 00:00:00 2001 From: cvarni Date: Fri, 1 Nov 2024 22:08:47 +0100 Subject: [PATCH] compiles but orthognonal does not run --- Core/include/Acts/Seeding/SeedFilter.hpp | 13 ++++++------- Core/include/Acts/Seeding/SeedFinder.hpp | 4 ++-- Core/include/Acts/Seeding/SeedFinder.ipp | 17 +++++++++++++---- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Core/include/Acts/Seeding/SeedFilter.hpp b/Core/include/Acts/Seeding/SeedFilter.hpp index 15ce7365c669..e7adfa9f3f0d 100644 --- a/Core/include/Acts/Seeding/SeedFilter.hpp +++ b/Core/include/Acts/Seeding/SeedFilter.hpp @@ -25,17 +25,16 @@ namespace Acts { template concept CollectionStoresSeedsTo = - requires(collection_t coll, Acts::Seed seed) { - Acts::detail::pushBackOrInsertAtEnd(coll, seed); -}; + requires(collection_t coll, Acts::Seed seed) { + Acts::detail::pushBackOrInsertAtEnd(coll, seed); + }; -template -concept CollectionStoresSeedsToProxied = // (!CollectionStoresSeedsTo) && +template +concept CollectionStoresSeedsToProxied = requires(external_t sp) { typename external_t::ValueType; sp.externalSpacePoint(); - } && CollectionStoresSeedsTo >, N>; diff --git a/Core/include/Acts/Seeding/SeedFinder.hpp b/Core/include/Acts/Seeding/SeedFinder.hpp index 8b86c4fba0b3..6e7692b15bc7 100644 --- a/Core/include/Acts/Seeding/SeedFinder.hpp +++ b/Core/include/Acts/Seeding/SeedFinder.hpp @@ -113,8 +113,8 @@ class SeedFinder { /// @note Ranges must return pointers. /// @note Ranges must be separate objects for each parallel call. template - requires Acts::CollectionStoresSeedsTo + // requires Acts::CollectionStoresSeedsTo void createSeedsForGroup(const Acts::SeedFinderOptions& options, SeedingState& state, const grid_t& grid, container_t& outputCollection, diff --git a/Core/include/Acts/Seeding/SeedFinder.ipp b/Core/include/Acts/Seeding/SeedFinder.ipp index 706e02759e39..31b0fecad2c1 100644 --- a/Core/include/Acts/Seeding/SeedFinder.ipp +++ b/Core/include/Acts/Seeding/SeedFinder.ipp @@ -6,6 +6,15 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. +// -*- C++ -*- +// This file is part of the ACTS project. +// +// Copyright (C) 2016 CERN for the benefit of the ACTS project +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at https://mozilla.org/MPL/2.0/. + #include #include #include @@ -38,8 +47,8 @@ SeedFinder::SeedFinder( template template - requires Acts::CollectionStoresSeedsTo +// requires Acts::CollectionStoresSeedsTo void SeedFinder::createSeedsForGroup( const Acts::SeedFinderOptions& options, SeedingState& state, const grid_t& grid, container_t& outputCollection, @@ -111,7 +120,7 @@ void SeedFinder::createSeedsForGroup( auto [minRadiusRangeForMiddle, maxRadiusRangeForMiddle] = retrieveRadiusRangeForMiddle(middleSPs.front(), rMiddleSPRange); ACTS_VERBOSE("Current global bin: " << middleSPsIdx << ", z value of " - << middleSPs.front()->z()); + << middleSPs.front().z()); ACTS_VERBOSE("Validity range (radius) for the middle space point is [" << minRadiusRangeForMiddle << ", " << maxRadiusRangeForMiddle << "]"); @@ -187,7 +196,7 @@ void SeedFinder::createSeedsForGroup( ACTS_VERBOSE("Candidates: " << state.compatBottomSP.size() << " bottoms and " << state.compatTopSP.size() << " tops for middle candidate indexed " - << spM->index()); + << spM.index()); // filter candidates if (m_config.useDetailedDoubleMeasurementInfo) { filterCandidates(