update

acts-project · Nov 14, 2023 · e38b7e4 · e38b7e4
1 parent 0121803
commit e38b7e4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/Core/include/Acts/TrackFitting/detail/GsfActor.hpp b/Core/include/Acts/TrackFitting/detail/GsfActor.hpp
@@ -300,11 +300,9 @@ struct GsfActor {
                           result.nInvalidBetheHeitler);
 
       if (componentCache.empty()) {
-        ACTS_WARNING(
-            "No components left after applying energy loss. "
-            "Is the weight cutoff "
-            << m_cfg.weightCutoff << " too high?");
-        ACTS_WARNING("Return to propagator without applying energy loss");
+        ACTS_DEBUG(
+            "No components left after applying energy loss, stop propagation");
+        navigator.navigationBreak(state.navigation, true);
         return;
       }
 
@@ -416,10 +414,9 @@ struct GsfActor {
       assert(p_prev + delta_p > 0. && "new momentum must be > 0");
       new_pars[eBoundQOverP] = old_bound.charge() / (p_prev + delta_p);
 
-      const auto p_new = state.stepping.particleHypothesis.extractMomentum(
-          new_pars[eBoundQOverP]);
-      if (p_new < m_cfg.momentumCutoff) {
-        ACTS_VERBOSE("Skip new component with p=" << p_new << " GeV");
+      if (p_prev + delta_p < m_cfg.momentumCutoff) {
+        ACTS_VERBOSE("Skip new component with p=" << p_prev + delta_p
+                                                  << " GeV");
         continue;
       }
 

diff --git a/Core/include/Acts/TrackFitting/detail/GsfUtils.hpp b/Core/include/Acts/TrackFitting/detail/GsfUtils.hpp
@@ -109,7 +109,6 @@ class ScopedGsfInfoPrinterAndChecker {
       assert(allFinite && "weights not finite at the start");
       assert(allNormalized && "not normalized at the start");
     } else {
-      assert(!zeroComponents && "no cmps at the end");
       assert(allFinite && "weights not finite at the end");
       assert(allNormalized && "not normalized at the end");
     }

diff --git a/Examples/Algorithms/TrackFitting/src/GsfFitterFunction.cpp b/Examples/Algorithms/TrackFitting/src/GsfFitterFunction.cpp
@@ -79,6 +79,7 @@ struct GsfFitterFunctionImpl final : public ActsExamples::TrackFitterFunction {
 
   size_t maxComponents = 0;
   double weightCutoff = 0;
+  const double momentumCutoff = 500_MeV;
   bool abortOnError = false;
   bool disableAllMaterialHandling = false;
   MixtureReductionAlgorithm reductionAlg =
@@ -102,7 +103,6 @@ struct GsfFitterFunctionImpl final : public ActsExamples::TrackFitterFunction {
         &Acts::GainMatrixUpdater::operator()<Acts::VectorMultiTrajectory>>(
         &updater);
 
-    const double momentumCutoff = 500_MeV;
     Acts::GsfOptions<Acts::VectorMultiTrajectory> gsfOptions{
         options.geoContext,
         options.magFieldContext,