refactor!: Untemplate VertexInfo and VertexingOptions (acts-proje…

…ct#2878) Part of: - acts-project#2842 Blocked by: - acts-project#2877
LaraCalic · Feb 10, 2024 · 86cc008 · 86cc008
1 parent aba43ba
commit 86cc008
Show file tree

Hide file tree

Showing 31 changed files with 118 additions and 162 deletions.
diff --git a/Core/include/Acts/Vertexing/AMVFInfo.hpp b/Core/include/Acts/Vertexing/AMVFInfo.hpp
@@ -18,7 +18,6 @@
 namespace Acts {
 
 /// @brief Helper struct for storing vertex related information
-template <typename input_track_t>
 struct VertexInfo {
   VertexInfo() = default;
 

diff --git a/Core/include/Acts/Vertexing/AdaptiveGridDensityVertexFinder.hpp b/Core/include/Acts/Vertexing/AdaptiveGridDensityVertexFinder.hpp
@@ -91,10 +91,9 @@ class AdaptiveGridDensityVertexFinder {
   ///
   /// @return Vector of vertices, filled with a single
   ///         vertex (for consistent interfaces)
-  Result<std::vector<Vertex>> find(
-      const std::vector<InputTrack>& trackVector,
-      const VertexingOptions<InputTrack_t>& vertexingOptions,
-      State& state) const;
+  Result<std::vector<Vertex>> find(const std::vector<InputTrack>& trackVector,
+                                   const VertexingOptions& vertexingOptions,
+                                   State& state) const;
 
   /// @brief Constructor used if InputTrack_t type == BoundTrackParameters
   ///

diff --git a/Core/include/Acts/Vertexing/AdaptiveGridDensityVertexFinder.ipp b/Core/include/Acts/Vertexing/AdaptiveGridDensityVertexFinder.ipp
@@ -9,7 +9,7 @@
 template <typename vfitter_t>
 auto Acts::AdaptiveGridDensityVertexFinder<vfitter_t>::find(
     const std::vector<InputTrack>& trackVector,
-    const VertexingOptions<InputTrack_t>& vertexingOptions, State& state) const
+    const VertexingOptions& vertexingOptions, State& state) const
     -> Result<std::vector<Vertex>> {
   // Remove density contributions from tracks removed from track collection
   if (m_cfg.cacheGridStateForTrackRemoval && state.isInitialized &&

diff --git a/Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.hpp b/Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.hpp
@@ -210,10 +210,9 @@ class AdaptiveMultiVertexFinder {
   /// @param state State for fulfilling interfaces
   ///
   /// @return Vector of all reconstructed vertices
-  Result<std::vector<Vertex>> find(
-      const std::vector<InputTrack>& allTracks,
-      const VertexingOptions<InputTrack_t>& vertexingOptions,
-      State& state) const;
+  Result<std::vector<Vertex>> find(const std::vector<InputTrack>& allTracks,
+                                   const VertexingOptions& vertexingOptions,
+                                   State& state) const;
 
  private:
   /// Configuration object
@@ -245,7 +244,7 @@ class AdaptiveMultiVertexFinder {
   /// @return The seed vertex
   Result<Vertex> doSeeding(
       const std::vector<InputTrack>& trackVector, Vertex& currentConstraint,
-      const VertexingOptions<InputTrack_t>& vertexingOptions,
+      const VertexingOptions& vertexingOptions,
       SeedFinderState_t& seedFinderState,
       const std::vector<InputTrack>& removedSeedTracks) const;
 
@@ -267,7 +266,7 @@ class AdaptiveMultiVertexFinder {
   /// @return The IP significance
   Result<double> getIPSignificance(
       const InputTrack& track, const Vertex& vtx,
-      const VertexingOptions<InputTrack_t>& vertexingOptions) const;
+      const VertexingOptions& vertexingOptions) const;
 
   /// @brief Adds compatible track to vertex candidate
   ///
@@ -278,7 +277,7 @@ class AdaptiveMultiVertexFinder {
   Result<void> addCompatibleTracksToVertex(
       const std::vector<InputTrack>& tracks, Vertex& vtx,
       FitterState_t& fitterState,
-      const VertexingOptions<InputTrack_t>& vertexingOptions) const;
+      const VertexingOptions& vertexingOptions) const;
 
   /// @brief Method that tries to recover from cases where no tracks
   /// were added to the vertex candidate after seeding
@@ -296,7 +295,7 @@ class AdaptiveMultiVertexFinder {
       const std::vector<InputTrack>& allTracks,
       const std::vector<InputTrack>& seedTracks, Vertex& vtx,
       const Vertex& currentConstraint, FitterState_t& fitterState,
-      const VertexingOptions<InputTrack_t>& vertexingOptions) const;
+      const VertexingOptions& vertexingOptions) const;
 
   /// @brief Method that tries to prepare the vertex for the fit
   ///
@@ -313,7 +312,7 @@ class AdaptiveMultiVertexFinder {
       const std::vector<InputTrack>& allTracks,
       const std::vector<InputTrack>& seedTracks, Vertex& vtx,
       const Vertex& currentConstraint, FitterState_t& fitterState,
-      const VertexingOptions<InputTrack_t>& vertexingOptions) const;
+      const VertexingOptions& vertexingOptions) const;
 
   /// @brief Method that checks if vertex is a good vertex and if
   /// compatible tracks are available
@@ -390,7 +389,7 @@ class AdaptiveMultiVertexFinder {
   Result<void> deleteLastVertex(
       Vertex& vtx, std::vector<std::unique_ptr<Vertex>>& allVertices,
       std::vector<Vertex*>& allVerticesPtr, FitterState_t& fitterState,
-      const VertexingOptions<InputTrack_t>& vertexingOptions) const;
+      const VertexingOptions& vertexingOptions) const;
 
   /// @brief Prepares the output vector of vertices
   ///

diff --git a/Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.ipp b/Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.ipp
@@ -12,8 +12,8 @@
 template <typename vfitter_t, typename sfinder_t>
 auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::find(
     const std::vector<InputTrack>& allTracks,
-    const VertexingOptions<InputTrack_t>& vertexingOptions,
-    State& /*state*/) const -> Result<std::vector<Vertex>> {
+    const VertexingOptions& vertexingOptions, State& /*state*/) const
+    -> Result<std::vector<Vertex>> {
   if (allTracks.empty()) {
     ACTS_ERROR("Empty track collection handed to find method");
     return VertexingError::EmptyInput;
@@ -141,10 +141,10 @@ auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::find(
 template <typename vfitter_t, typename sfinder_t>
 auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::doSeeding(
     const std::vector<InputTrack>& trackVector, Vertex& currentConstraint,
-    const VertexingOptions<InputTrack_t>& vertexingOptions,
+    const VertexingOptions& vertexingOptions,
     SeedFinderState_t& seedFinderState,
     const std::vector<InputTrack>& removedSeedTracks) const -> Result<Vertex> {
-  VertexingOptions<InputTrack_t> seedOptions = vertexingOptions;
+  VertexingOptions seedOptions = vertexingOptions;
   seedOptions.constraint = currentConstraint;
 
   if constexpr (NeedsRemovedTracks<typename sfinder_t::State>::value) {
@@ -191,8 +191,7 @@ auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::
 template <typename vfitter_t, typename sfinder_t>
 auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::getIPSignificance(
     const InputTrack& track, const Vertex& vtx,
-    const VertexingOptions<InputTrack_t>& vertexingOptions) const
-    -> Result<double> {
+    const VertexingOptions& vertexingOptions) const -> Result<double> {
   // TODO: In original implementation the covariance of the given vertex is set
   // to zero. I did the same here now, but consider removing this and just
   // passing the vtx object to the estimator without changing its covariance.
@@ -231,10 +230,9 @@ auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::getIPSignificance(
 
 template <typename vfitter_t, typename sfinder_t>
 auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::
-    addCompatibleTracksToVertex(
-        const std::vector<InputTrack>& tracks, Vertex& vtx,
-        FitterState_t& fitterState,
-        const VertexingOptions<InputTrack_t>& vertexingOptions) const
+    addCompatibleTracksToVertex(const std::vector<InputTrack>& tracks,
+                                Vertex& vtx, FitterState_t& fitterState,
+                                const VertexingOptions& vertexingOptions) const
     -> Result<void> {
   for (const auto& trk : tracks) {
     auto params = m_extractParameters(trk);
@@ -267,8 +265,7 @@ auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::
         const std::vector<InputTrack>& allTracks,
         const std::vector<InputTrack>& seedTracks, Vertex& vtx,
         const Vertex& currentConstraint, FitterState_t& fitterState,
-        const VertexingOptions<InputTrack_t>& vertexingOptions) const
-    -> Result<bool> {
+        const VertexingOptions& vertexingOptions) const -> Result<bool> {
   // Recover from cases where no compatible tracks to vertex
   // candidate were found
   // TODO: This is for now how it's done in athena... this look a bit
@@ -292,7 +289,7 @@ auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::
 
       // Update vertex info for current vertex
       fitterState.vtxInfoMap[&vtx] =
-          VertexInfo<InputTrack_t>(currentConstraint, vtx.fullPosition());
+          VertexInfo(currentConstraint, vtx.fullPosition());
 
       // Try to add compatible track with adapted vertex position
       auto res = addCompatibleTracksToVertex(allTracks, vtx, fitterState,
@@ -319,15 +316,15 @@ auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::
 
 template <typename vfitter_t, typename sfinder_t>
 auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::
-    canPrepareVertexForFit(
-        const std::vector<InputTrack>& allTracks,
-        const std::vector<InputTrack>& seedTracks, Vertex& vtx,
-        const Vertex& currentConstraint, FitterState_t& fitterState,
-        const VertexingOptions<InputTrack_t>& vertexingOptions) const
+    canPrepareVertexForFit(const std::vector<InputTrack>& allTracks,
+                           const std::vector<InputTrack>& seedTracks,
+                           Vertex& vtx, const Vertex& currentConstraint,
+                           FitterState_t& fitterState,
+                           const VertexingOptions& vertexingOptions) const
     -> Result<bool> {
   // Add vertex info to fitter state
   fitterState.vtxInfoMap[&vtx] =
-      VertexInfo<InputTrack_t>(currentConstraint, vtx.fullPosition());
+      VertexInfo(currentConstraint, vtx.fullPosition());
 
   // Add all compatible tracks to vertex
   auto resComp = addCompatibleTracksToVertex(allTracks, vtx, fitterState,
@@ -557,8 +554,7 @@ template <typename vfitter_t, typename sfinder_t>
 auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::deleteLastVertex(
     Vertex& vtx, std::vector<std::unique_ptr<Vertex>>& allVertices,
     std::vector<Vertex*>& allVerticesPtr, FitterState_t& fitterState,
-    const VertexingOptions<InputTrack_t>& vertexingOptions) const
-    -> Result<void> {
+    const VertexingOptions& vertexingOptions) const -> Result<void> {
   allVertices.pop_back();
   allVerticesPtr.pop_back();
 

diff --git a/Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.hpp b/Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.hpp
@@ -70,7 +70,7 @@ class AdaptiveMultiVertexFitter {
 
     // Map to store vertices information
     // @TODO Does this have to be a mutable pointer?
-    std::map<Vertex*, VertexInfo<InputTrack_t>> vtxInfoMap;
+    std::map<Vertex*, VertexInfo> vtxInfoMap;
 
     std::multimap<InputTrack, Vertex*> trackToVerticesMultiMap;
 
@@ -200,9 +200,9 @@ class AdaptiveMultiVertexFitter {
   /// @param vertexingOptions Vertexing options
   ///
   /// @return Result<void> object
-  Result<void> addVtxToFit(
-      State& state, Vertex& newVertex, const Linearizer_t& linearizer,
-      const VertexingOptions<InputTrack_t>& vertexingOptions) const;
+  Result<void> addVtxToFit(State& state, Vertex& newVertex,
+                           const Linearizer_t& linearizer,
+                           const VertexingOptions& vertexingOptions) const;
 
   /// @brief Performs a simultaneous fit of all vertices in
   /// state.vertexCollection
@@ -212,9 +212,8 @@ class AdaptiveMultiVertexFitter {
   /// @param vertexingOptions Vertexing options
   ///
   /// @return Result<void> object
-  Result<void> fit(
-      State& state, const Linearizer_t& linearizer,
-      const VertexingOptions<InputTrack_t>& vertexingOptions) const;
+  Result<void> fit(State& state, const Linearizer_t& linearizer,
+                   const VertexingOptions& vertexingOptions) const;
 
  private:
   /// Configuration object
@@ -250,7 +249,7 @@ class AdaptiveMultiVertexFitter {
   /// @param vertexingOptions Vertexing options
   Result<void> prepareVertexForFit(
       State& state, Vertex* vtx,
-      const VertexingOptions<InputTrack_t>& vertexingOptions) const;
+      const VertexingOptions& vertexingOptions) const;
 
   /// @brief Sets the vertexCompatibility for all TrackAtVertex objects
   /// at the current vertex
@@ -260,7 +259,7 @@ class AdaptiveMultiVertexFitter {
   /// @param vertexingOptions Vertexing options
   Result<void> setAllVertexCompatibilities(
       State& state, Vertex* currentVtx,
-      const VertexingOptions<input_track_t>& vertexingOptions) const;
+      const VertexingOptions& vertexingOptions) const;
 
   /// @brief Sets weights to the track according to Eq.(5.46) in Ref.(1)
   ///  and updates the vertices by calling the VertexUpdater
@@ -270,7 +269,7 @@ class AdaptiveMultiVertexFitter {
   /// @param vertexingOptions Vertexing options
   Result<void> setWeightsAndUpdate(
       State& state, const Linearizer_t& linearizer,
-      const VertexingOptions<input_track_t>& vertexingOptions) const;
+      const VertexingOptions& vertexingOptions) const;
 
   /// @brief Collects the compatibility values of the track `trk`
   /// wrt to all of its associated vertices

diff --git a/Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.ipp b/Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.ipp
@@ -14,7 +14,7 @@ template <typename input_track_t, typename linearizer_t>
 Acts::Result<void>
 Acts::AdaptiveMultiVertexFitter<input_track_t, linearizer_t>::fit(
     State& state, const linearizer_t& linearizer,
-    const VertexingOptions<input_track_t>& vertexingOptions) const {
+    const VertexingOptions& vertexingOptions) const {
   // Reset annealing tool
   state.annealingState = AnnealingUtility::State();
 
@@ -33,7 +33,7 @@ Acts::AdaptiveMultiVertexFitter<input_track_t, linearizer_t>::fit(
          (!state.annealingState.equilibriumReached || !isSmallShift)) {
     // Initial loop over all vertices in state.vertexCollection
     for (auto vtx : state.vertexCollection) {
-      VertexInfo<input_track_t>& vtxInfo = state.vtxInfoMap[vtx];
+      VertexInfo& vtxInfo = state.vtxInfoMap[vtx];
       vtxInfo.relinearize = false;
       // Store old position of vertex, i.e. seed position
       // in case of first iteration or position determined
@@ -120,7 +120,7 @@ template <typename input_track_t, typename linearizer_t>
 Acts::Result<void>
 Acts::AdaptiveMultiVertexFitter<input_track_t, linearizer_t>::addVtxToFit(
     State& state, Vertex& newVertex, const linearizer_t& linearizer,
-    const VertexingOptions<input_track_t>& vertexingOptions) const {
+    const VertexingOptions& vertexingOptions) const {
   if (state.vtxInfoMap[&newVertex].trackLinks.empty()) {
     ACTS_ERROR(
         "newVertex does not have any associated tracks (i.e., its trackLinks "
@@ -201,7 +201,7 @@ template <typename input_track_t, typename linearizer_t>
 Acts::Result<void> Acts::
     AdaptiveMultiVertexFitter<input_track_t, linearizer_t>::prepareVertexForFit(
         State& state, Vertex* vtx,
-        const VertexingOptions<input_track_t>& vertexingOptions) const {
+        const VertexingOptions& vertexingOptions) const {
   // Vertex info object
   auto& vtxInfo = state.vtxInfoMap[vtx];
   // Vertex seed position
@@ -222,12 +222,12 @@ Acts::Result<void> Acts::
 }
 
 template <typename input_track_t, typename linearizer_t>
-Acts::Result<void>
-Acts::AdaptiveMultiVertexFitter<input_track_t, linearizer_t>::
-    setAllVertexCompatibilities(
-        State& state, Vertex* vtx,
-        const VertexingOptions<input_track_t>& vertexingOptions) const {
-  VertexInfo<input_track_t>& vtxInfo = state.vtxInfoMap[vtx];
+Acts::Result<void> Acts::AdaptiveMultiVertexFitter<
+    input_track_t,
+    linearizer_t>::setAllVertexCompatibilities(State& state, Vertex* vtx,
+                                               const VertexingOptions&
+                                                   vertexingOptions) const {
+  VertexInfo& vtxInfo = state.vtxInfoMap[vtx];
 
   // Loop over all tracks that are associated with vtx and estimate their
   // compatibility
@@ -269,9 +269,9 @@ template <typename input_track_t, typename linearizer_t>
 Acts::Result<void> Acts::
     AdaptiveMultiVertexFitter<input_track_t, linearizer_t>::setWeightsAndUpdate(
         State& state, const linearizer_t& linearizer,
-        const VertexingOptions<input_track_t>& vertexingOptions) const {
+        const VertexingOptions& vertexingOptions) const {
   for (auto vtx : state.vertexCollection) {
-    VertexInfo<input_track_t>& vtxInfo = state.vtxInfoMap[vtx];
+    VertexInfo& vtxInfo = state.vtxInfoMap[vtx];
 
     if (vtxInfo.relinearize) {
       vtxInfo.linPoint = vtxInfo.oldPosition;

diff --git a/Core/include/Acts/Vertexing/DummyVertexFitter.hpp b/Core/include/Acts/Vertexing/DummyVertexFitter.hpp
@@ -35,7 +35,7 @@ class DummyVertexFitter {
 
   /// @brief Dummy fit method
   Result<Vertex> fit(const std::vector<input_track_t>&, const linearizer_t&,
-                     const VertexingOptions<input_track_t>&) const;
+                     const VertexingOptions&) const;
 };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/Vertexing/FullBilloirVertexFitter.hpp b/Core/include/Acts/Vertexing/FullBilloirVertexFitter.hpp
@@ -114,7 +114,7 @@ class FullBilloirVertexFitter {
   /// @return Fitted vertex
   Result<Vertex> fit(const std::vector<InputTrack>& paramVector,
                      const linearizer_t& linearizer,
-                     const VertexingOptions<input_track_t>& vertexingOptions,
+                     const VertexingOptions& vertexingOptions,
                      State& state) const;
 
  private:

diff --git a/Core/include/Acts/Vertexing/FullBilloirVertexFitter.ipp b/Core/include/Acts/Vertexing/FullBilloirVertexFitter.ipp
@@ -58,8 +58,7 @@ template <typename input_track_t, typename linearizer_t>
 Acts::Result<Acts::Vertex>
 Acts::FullBilloirVertexFitter<input_track_t, linearizer_t>::fit(
     const std::vector<InputTrack>& paramVector, const linearizer_t& linearizer,
-    const VertexingOptions<input_track_t>& vertexingOptions,
-    State& state) const {
+    const VertexingOptions& vertexingOptions, State& state) const {
   unsigned int nTracks = paramVector.size();
   double chi2 = std::numeric_limits<double>::max();
 

diff --git a/Core/include/Acts/Vertexing/GridDensityVertexFinder.hpp b/Core/include/Acts/Vertexing/GridDensityVertexFinder.hpp
@@ -105,10 +105,9 @@ class GridDensityVertexFinder {
   ///
   /// @return Vector of vertices, filled with a single
   ///         vertex (for consistent interfaces)
-  Result<std::vector<Vertex>> find(
-      const std::vector<InputTrack>& trackVector,
-      const VertexingOptions<InputTrack_t>& vertexingOptions,
-      State& state) const;
+  Result<std::vector<Vertex>> find(const std::vector<InputTrack>& trackVector,
+                                   const VertexingOptions& vertexingOptions,
+                                   State& state) const;
 
   /// @brief Constructor used if InputTrack_t type == BoundTrackParameters
   ///

diff --git a/Core/include/Acts/Vertexing/GridDensityVertexFinder.ipp b/Core/include/Acts/Vertexing/GridDensityVertexFinder.ipp
@@ -9,7 +9,7 @@
 template <int mainGridSize, int trkGridSize, typename vfitter_t>
 auto Acts::GridDensityVertexFinder<mainGridSize, trkGridSize, vfitter_t>::find(
     const std::vector<InputTrack>& trackVector,
-    const VertexingOptions<InputTrack_t>& vertexingOptions, State& state) const
+    const VertexingOptions& vertexingOptions, State& state) const
     -> Result<std::vector<Vertex>> {
   // Remove density contributions from tracks removed from track collection
   if (m_cfg.cacheGridStateForTrackRemoval && state.isInitialized &&