Merge branch 'main' into fix/tracking-volume-portal

acts-project · Jan 15, 2025 · c0af7ca · c0af7ca
2 parents cad208a + f060123
commit c0af7ca
Show file tree

Hide file tree

Showing 61 changed files with 1,729 additions and 2,308 deletions.
diff --git a/CI/physmon/reference/trackfinding_1muon/seeded/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_1muon/seeded/performance_fitting_ckf.root
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ml_solver.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ml_solver.root
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf.root
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf_ambi.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf_ambi.root
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf_ml_solver.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf_ml_solver.root
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root
diff --git a/...smon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_gauss_notime_hist.root b/...smon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_gauss_notime_hist.root
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_grid_time_hist.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_grid_time_hist.root
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/tracksummary_ckf_hist.root b/CI/physmon/reference/trackfinding_ttbar_pu200/tracksummary_ckf_hist.root
diff --git a/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root b/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root
diff --git a/Core/include/Acts/Navigation/DetectorNavigator.hpp b/Core/include/Acts/Navigation/DetectorNavigator.hpp
diff --git a/Core/include/Acts/Navigation/NavigationState.hpp b/Core/include/Acts/Navigation/NavigationState.hpp
@@ -10,9 +10,7 @@
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Units.hpp"
-#include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
-#include "Acts/Utilities/Delegate.hpp"
 #include "Acts/Utilities/Intersection.hpp"
 
 #include <any>
@@ -59,15 +57,6 @@ struct NavigationState {
   /// The current direction
   Vector3 direction = Vector3(0., 0., 0.);
 
-  /// The current absolute momentum
-  double absMomentum = 0.;
-
-  /// The current absolute charge
-  double absCharge = 0.;
-
-  /// The current magnetic field
-  Vector3 magneticField = Vector3(0., 0., 0.);
-
   /// The current detector in processing
   const Detector* currentDetector = nullptr;
 

diff --git a/Core/include/Acts/Propagator/AtlasStepper.hpp b/Core/include/Acts/Propagator/AtlasStepper.hpp
@@ -28,10 +28,11 @@
 
 #include <cmath>
 
-// This is based original stepper code from the ATLAS RungeKuttaPropagator
 namespace Acts {
 
 /// @brief the AtlasStepper implementation for the
+///
+/// This is based original stepper code from the ATLAS RungeKuttaPropagator
 class AtlasStepper {
  public:
   using Jacobian = BoundMatrix;
@@ -78,7 +79,7 @@ class AtlasStepper {
     bool needgradient = false;
     bool newfield = true;
     // internal parameters to be used
-    Vector3 field;
+    Vector3 field = Vector3::Zero();
     std::array<double, 60> pVector{};
 
     /// Storage pattern of pVector
@@ -115,9 +116,6 @@ class AtlasStepper {
     // Previous step size for overstep estimation
     double previousStepSize = 0.;
 
-    /// The tolerance for the stepping
-    double tolerance = s_onSurfaceTolerance;
-
     /// It caches the current magnetic field cell and stays (and interpolates)
     ///  within as long as this is valid. See step() code for details.
     MagneticFieldProvider::Cache fieldCache;
@@ -143,11 +141,13 @@ class AtlasStepper {
                   const BoundTrackParameters& par) const {
     State state{options, m_bField->makeCache(options.magFieldContext)};
 
+    state.particleHypothesis = par.particleHypothesis();
+
     // The rest of this constructor is copy&paste of AtlasStepper::update() -
     // this is a nasty but working solution for the stepper state without
     // functions
 
-    const auto pos = par.position(state.options.geoContext);
+    const auto pos = par.position(options.geoContext);
     const auto Vp = par.parameters();
 
     double Sf = std::sin(Vp[eBoundPhi]);
@@ -179,7 +179,7 @@ class AtlasStepper {
       state.covTransport = true;
       state.useJacobian = true;
       const auto transform = par.referenceSurface().referenceFrame(
-          state.options.geoContext, pos, par.direction());
+          options.geoContext, pos, par.direction());
 
       pVector[8] = transform(0, eBoundLoc0);
       pVector[16] = transform(0, eBoundLoc1);