Skip to content

Commit

Permalink
compiles but orthognonal does not run
Browse files Browse the repository at this point in the history
  • Loading branch information
cvarni committed Nov 1, 2024
1 parent 7f1a378 commit 8b162de
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 13 deletions.
13 changes: 6 additions & 7 deletions Core/include/Acts/Seeding/SeedFilter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,16 @@
namespace Acts {
template <typename collection_t, typename external_t, std::size_t N = 3ul>
concept CollectionStoresSeedsTo =
requires(collection_t coll, Acts::Seed<external_t, N> seed) {
Acts::detail::pushBackOrInsertAtEnd(coll, seed);
};
requires(collection_t coll, Acts::Seed<external_t, N> seed) {
Acts::detail::pushBackOrInsertAtEnd(coll, seed);
};

template <typename Coll, typename external_t, std::size_t N = 3ul>
concept CollectionStoresSeedsToProxied = // (!CollectionStoresSeedsTo<Coll,
// external_t, N>) &&
template <typename collection_t, typename external_t, std::size_t N = 3ul>
concept CollectionStoresSeedsToProxied =
requires(external_t sp) {
typename external_t::ValueType;
sp.externalSpacePoint();
} && CollectionStoresSeedsTo<Coll,
} && CollectionStoresSeedsTo<collection_t,
std::remove_const_t<std::remove_pointer_t<
typename external_t::ValueType> >,
N>;
Expand Down
4 changes: 2 additions & 2 deletions Core/include/Acts/Seeding/SeedFinder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ class SeedFinder {
/// @note Ranges must return pointers.
/// @note Ranges must be separate objects for each parallel call.
template <typename container_t, Acts::GridBinCollection sp_range_t>
requires Acts::CollectionStoresSeedsTo<container_t, external_spacepoint_t,
3ul>
// requires Acts::CollectionStoresSeedsTo<container_t, external_spacepoint_t,
// 3ul>
void createSeedsForGroup(const Acts::SeedFinderOptions& options,
SeedingState& state, const grid_t& grid,
container_t& outputCollection,
Expand Down
17 changes: 13 additions & 4 deletions Core/include/Acts/Seeding/SeedFinder.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <algorithm>
#include <cmath>
#include <numeric>
Expand Down Expand Up @@ -38,8 +47,8 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::SeedFinder(

template <typename external_spacepoint_t, typename grid_t, typename platform_t>
template <typename container_t, Acts::GridBinCollection sp_range_t>
requires Acts::CollectionStoresSeedsTo<container_t, external_spacepoint_t,
3ul>
// requires Acts::CollectionStoresSeedsTo<container_t, external_spacepoint_t,
// 3ul>
void SeedFinder<external_spacepoint_t, grid_t, platform_t>::createSeedsForGroup(
const Acts::SeedFinderOptions& options, SeedingState& state,
const grid_t& grid, container_t& outputCollection,
Expand Down Expand Up @@ -111,7 +120,7 @@ void SeedFinder<external_spacepoint_t, grid_t, platform_t>::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
<< "]");
Expand Down Expand Up @@ -187,7 +196,7 @@ void SeedFinder<external_spacepoint_t, grid_t, platform_t>::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<Acts::DetectorMeasurementInfo::eDetailed>(
Expand Down

0 comments on commit 8b162de

Please sign in to comment.