Merge pull request #47454 from kerstinlovisa/KalmanVertexFit_configurableTrackerBounds

Function to set tracker bounds in KalmanVertexFitter

Author: cmsbuild

RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h

@@ -29,11 +29,17 @@ class KalmanVertexFitter : public VertexFitter<5> {
 
   KalmanVertexFitter(bool useSmoothing = false);
 
+  /**
+   * Same as above, including a boolean for extending tracker bounds to muon system
+   * \param useMuonSystemBounds Specifies whether the tracker bounds should include the muon system or not.
+   */
+  KalmanVertexFitter(bool useSmoothing, bool useMuonSystemBounds);
+
   /**
    * Same as above, using a ParameterSet to set the convergence criteria
    */
 
-  KalmanVertexFitter(const edm::ParameterSet& pSet, bool useSmoothing = false);
+  KalmanVertexFitter(const edm::ParameterSet& pSet, bool useSmoothing = false, bool useMuonSystemBounds = false);
 
   KalmanVertexFitter(const KalmanVertexFitter& other) : theSequentialFitter(other.theSequentialFitter->clone()) {}
 
@@ -104,11 +110,11 @@ class KalmanVertexFitter : public VertexFitter<5> {
   //  edm::ParameterSet defaultParameters() const;
 
 private:
-  void setup(const edm::ParameterSet& pSet, bool useSmoothing);
+  void setup(const edm::ParameterSet& pSet, bool useSmoothing, bool useMuonSystemBounds);
 
   edm::ParameterSet defaultParameters() const;
 
-  const SequentialVertexFitter<5>* theSequentialFitter;
+  SequentialVertexFitter<5>* theSequentialFitter;
 };
 
 #endif

RecoVertex/KalmanVertexFit/src/KalmanVertexFitter.cc

@@ -7,14 +7,18 @@
 #include "RecoVertex/KalmanVertexFit/interface/KalmanTrackToTrackCovCalculator.h"
 #include "RecoVertex/LinearizationPointFinders/interface/FsmwLinearizationPointFinder.h"
 
-KalmanVertexFitter::KalmanVertexFitter(bool useSmoothing) {
+KalmanVertexFitter::KalmanVertexFitter(bool useSmoothing) : KalmanVertexFitter(useSmoothing, false) {}
+
+KalmanVertexFitter::KalmanVertexFitter(bool useSmoothing, bool useMuonSystemBounds) {
   edm::ParameterSet pSet = defaultParameters();
-  setup(pSet, useSmoothing);
+  setup(pSet, useSmoothing, useMuonSystemBounds);
 }
 
-KalmanVertexFitter::KalmanVertexFitter(const edm::ParameterSet& pSet, bool useSmoothing) { setup(pSet, useSmoothing); }
+KalmanVertexFitter::KalmanVertexFitter(const edm::ParameterSet& pSet, bool useSmoothing, bool useMuonSystemBounds) {
+  setup(pSet, useSmoothing, useMuonSystemBounds);
+}
 
-void KalmanVertexFitter::setup(const edm::ParameterSet& pSet, bool useSmoothing) {
+void KalmanVertexFitter::setup(const edm::ParameterSet& pSet, bool useSmoothing, bool useMuonSystemBounds) {
   if (useSmoothing) {
     KalmanVertexTrackUpdator<5> vtu;
     KalmanSmoothedVertexChi2Estimator<5> vse;
@@ -33,6 +37,8 @@ void KalmanVertexFitter::setup(const edm::ParameterSet& pSet, bool useSmoothing)
                                                         smoother,
                                                         LinearizedTrackStateFactory());
   }
+  if (useMuonSystemBounds)
+    theSequentialFitter->setMuonSystemBounds();
 }
 
 edm::ParameterSet KalmanVertexFitter::defaultParameters() const {

RecoVertex/VertexTools/interface/SequentialVertexFitter.h

@@ -180,6 +180,11 @@ class SequentialVertexFitter : public VertexFitter<N> {
     trackerBoundsHalfLength = halfLength;
   }
 
+  void setMuonSystemBounds() {
+    trackerBoundsRadius = kMuonSystemBoundsRadius;
+    trackerBoundsHalfLength = kMuonSystemBoundsHalfLength;
+  }
+
 protected:
   /**
    *   Default constructor. Is here, as we do not want anybody to use it.
@@ -245,6 +250,8 @@ class SequentialVertexFitter : public VertexFitter<N> {
   // FIXME using hard-coded tracker bounds as default instead of taking them from geometry service
   float trackerBoundsRadius{112.};
   float trackerBoundsHalfLength{273.5};
+  static constexpr float kMuonSystemBoundsRadius = 740.;
+  static constexpr float kMuonSystemBoundsHalfLength = 960.;
 
   edm::ParameterSet thePSet;
   LinearizationPointFinder* theLinP;