refactor: Centralize Examples Track typedef (#1838)

We want the examples to always write the same concrete track container to the white board
acts-project · Feb 10, 2023 · 97a8458 · 97a8458
1 parent 1de6551
commit 97a8458
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/TrackFindingAlgorithm.hpp b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/TrackFindingAlgorithm.hpp
@@ -37,9 +37,6 @@ class TrackFindingAlgorithm final : public BareAlgorithm {
   using TrackFinderOptions =
       Acts::CombinatorialKalmanFilterOptions<IndexSourceLinkAccessor::Iterator,
                                              Acts::VectorMultiTrajectory>;
-  using TrackContainer =
-      Acts::TrackContainer<Acts::VectorTrackContainer,
-                           Acts::VectorMultiTrajectory, std::shared_ptr>;
   using TrackFinderResult =
       Acts::Result<std::vector<TrackContainer::TrackProxy>>;
 

diff --git a/...thms/TrackFittingChi2/include/ActsExamples/TrackFittingChi2/TrackFittingChi2Algorithm.hpp b/...thms/TrackFittingChi2/include/ActsExamples/TrackFittingChi2/TrackFittingChi2Algorithm.hpp
@@ -36,10 +36,6 @@ class TrackFittingChi2Algorithm final : public BareAlgorithm {
   using TrackFitterChi2Options =
       Acts::Experimental::Chi2FitterOptions<Acts::VectorMultiTrajectory>;
 
-  using TrackContainer =
-      Acts::TrackContainer<Acts::VectorTrackContainer,
-                           Acts::VectorMultiTrajectory, std::shared_ptr>;
-
   using TrackFitterChi2Result = Acts::Result<TrackContainer::TrackProxy>;
 
   /// Fit function that takes the above parameters and runs a fit

diff --git a/Examples/Algorithms/TrackFittingChi2/src/TrackFittingChi2AlgorithmFunction.cpp b/Examples/Algorithms/TrackFittingChi2/src/TrackFittingChi2AlgorithmFunction.cpp
@@ -16,6 +16,7 @@
 #include "Acts/TrackFitting/GainMatrixSmoother.hpp"
 #include "Acts/TrackFitting/GainMatrixUpdater.hpp"
 #include "Acts/Utilities/Helpers.hpp"
+#include "ActsExamples/EventData/Track.hpp"
 #include "ActsExamples/MagneticField/MagneticField.hpp"
 #include "ActsExamples/TrackFittingChi2/TrackFittingChi2Algorithm.hpp"
 
@@ -37,8 +38,7 @@ struct TrackFitterChi2FunctionImpl
       const ActsExamples::TrackParameters& initialParameters,
       const ActsExamples::TrackFittingChi2Algorithm::TrackFitterChi2Options&
           options,
-      ActsExamples::TrackFittingChi2Algorithm::TrackContainer& trackContainer)
-      const override {
+      ActsExamples::TrackContainer& trackContainer) const override {
     return trackFitterChi2.fit(sourceLinks.begin(), sourceLinks.end(),
                                initialParameters, options, trackContainer);
   };

diff --git a/Examples/Framework/include/ActsExamples/EventData/Track.hpp b/Examples/Framework/include/ActsExamples/EventData/Track.hpp
@@ -8,7 +8,10 @@
 
 #pragma once
 
+#include "Acts/EventData/Track.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/EventData/VectorMultiTrajectory.hpp"
+#include "Acts/EventData/VectorTrackContainer.hpp"
 
 #include <vector>
 
@@ -19,4 +22,8 @@ using TrackParameters = ::Acts::BoundTrackParameters;
 /// Container of reconstructed track states for multiple tracks.
 using TrackParametersContainer = std::vector<TrackParameters>;
 
+using TrackContainer =
+    Acts::TrackContainer<Acts::VectorTrackContainer,
+                         Acts::VectorMultiTrajectory, std::shared_ptr>;
+
 }  // namespace ActsExamples