adressing comments

Corentin-Allaire · Nov 21, 2024 · fa8d97b · fa8d97b
1 parent 4135c0e
commit fa8d97b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/Core/include/Acts/AmbiguityResolution/AmbiguityNetworkConcept.hpp b/Core/include/Acts/AmbiguityResolution/AmbiguityNetworkConcept.hpp
@@ -36,21 +36,23 @@ using DummyTrackContainer =
 ///
 /// @tparam N the type of the network
 template <typename network_t>
-concept AmbiguityNetworkConcept = requires(
-    DummyTrackContainer &tracks,
-    std::unordered_map<std::size_t, std::vector<std::size_t>> &clusters,
-    std::vector<std::vector<float>> &outputTensor, const char *modelPath,
-    network_t &n) {
-  requires TrackContainerFrontend<DummyTrackContainer>;
-
-  { network_t(modelPath) } -> std::same_as<network_t>;
-
-  {
-    n.inferScores(clusters, tracks)
-  } -> std::same_as<std::vector<std::vector<float>>>;
-  {
-    n.trackSelection(clusters, outputTensor)
-  } -> std::same_as<std::vector<std::size_t>>;
-};
+concept AmbiguityNetworkConcept =
+    TrackContainerFrontend<DummyTrackContainer> &&
+    requires(
+        DummyTrackContainer &tracks,
+        std::unordered_map<std::size_t, std::vector<std::size_t>> &clusters,
+        std::vector<std::vector<float>> &outputTensor, const char *modelPath,
+        network_t &n) {
+      requires TrackContainerFrontend<DummyTrackContainer>;
+
+      { network_t(modelPath) } -> std::same_as<network_t>;
+
+      {
+        n.inferScores(clusters, tracks)
+      } -> std::same_as<std::vector<std::vector<float>>>;
+      {
+        n.trackSelection(clusters, outputTensor)
+      } -> std::same_as<std::vector<std::size_t>>;
+    };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/AmbiguityResolution/AmbiguityResolutionML.hpp b/Core/include/Acts/AmbiguityResolution/AmbiguityResolutionML.hpp
@@ -60,8 +60,8 @@ class AmbiguityResolutionML {
             typename source_link_hash_t, typename source_link_equality_t>
   std::multimap<int, std::pair<std::size_t, std::vector<std::size_t>>>
   mapTrackHits(const track_container_t& tracks,
-               source_link_hash_t&& sourceLinkHash,
-               source_link_equality_t&& sourceLinkEquality) const {
+               const source_link_hash_t& sourceLinkHash,
+               const source_link_equality_t& sourceLinkEquality) const {
     // A map to store (and generate) the measurement index for each source link
     auto measurementIndexMap =
         std::unordered_map<SourceLink, std::size_t, source_link_hash_t,

diff --git a/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionMLAlgorithm.cpp b/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionMLAlgorithm.cpp
@@ -15,12 +15,13 @@
 #include <iterator>
 #include <map>
 
-std::size_t sourceLinkHash(const Acts::SourceLink& a) {
+static std::size_t sourceLinkHash(const Acts::SourceLink& a) {
   return static_cast<std::size_t>(
       a.get<ActsExamples::IndexSourceLink>().index());
 }
 
-bool sourceLinkEquality(const Acts::SourceLink& a, const Acts::SourceLink& b) {
+static bool sourceLinkEquality(const Acts::SourceLink& a,
+                               const Acts::SourceLink& b) {
   return a.get<ActsExamples::IndexSourceLink>().index() ==
          b.get<ActsExamples::IndexSourceLink>().index();
 }