Merge pull request #40017 from mmusich/proposalFixGsfTracking_12_6_X

[TsosGaussianStateConversions] proposal fix for Gsf Tracking segmentation fault when no states are passing selection criteria
cms-sw · Nov 14, 2022 · 69d9c71 · 69d9c71
2 parents 6806e8d + a40b3e3
commit 69d9c71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/TrackingTools/GsfTracking/src/GsfTrajectoryFitter.cc b/TrackingTools/GsfTracking/src/GsfTrajectoryFitter.cc
@@ -121,6 +121,9 @@ Trajectory GsfTrajectoryFitter::fitOne(const TrajectorySeed& aSeed,
       //update
       assert((!(*ihit)->canImproveWithTrack()) | (nullptr != theHitCloner));
       assert((!(*ihit)->canImproveWithTrack()) | (nullptr != dynamic_cast<BaseTrackerRecHit const*>((*ihit).get())));
+      if (!predTsos.isValid()) {
+        return Trajectory();
+      }
       auto preciseHit = theHitCloner->makeShared(*ihit, predTsos);
       dump(*preciseHit, hitcounter, "GsfTrackFitters");
       currTsos = updator()->update(predTsos, *preciseHit);

diff --git a/TrackingTools/GsfTracking/src/TsosGaussianStateConversions.cc b/TrackingTools/GsfTracking/src/TsosGaussianStateConversions.cc
@@ -50,6 +50,8 @@ namespace GaussianStateConversions {
                                 side);
       }
     }
-    return TrajectoryStateOnSurface((BasicTrajectoryState*)new BasicMultiTrajectoryState(components));
+    return components.empty()
+               ? TrajectoryStateOnSurface()
+               : TrajectoryStateOnSurface((BasicTrajectoryState*)new BasicMultiTrajectoryState(components));
   }
 }  // namespace GaussianStateConversions