ATLASRECTS-5666: Migration of JetFitter package to a modularised version in AthenaMT

Description: A new modularised version of the package tested in 21.2. This is the migration to AthenaMT The code runs in both the split and usual b-tagging configuration as defined in https://gitlab.cern.ch/atlas/athena/-/blob/master/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py

There are several differences between the 21.2 and the master versions, due to the different environments. Configuration python files are provided in the BTagging/python folder, while keeping (for the time being?) the old JetFitter configuration files.

Tagging @cpollard, @sanmay, @cschiavi, @vdao , @dguest and @guirriec.

Jira: ATLASRECTS-5666

InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h

@@ -14,6 +14,8 @@
             christian.weiser@cern.ch
     changes: second version in January 2008!
  
+  2008 (c) Atlas Detector Software
+
   This class implements the finder functionality for using 
   the JetFitter algorithm. It uses as input a ParticleJet and 
   then gives the VxJetCandidate out after having performed the 
@@ -36,25 +38,18 @@
 #include "TrkTrackLink/ITrackLink.h"
 
 namespace Trk {
-  class IVertexFitter;
   class TrackParticleBase;
   class VxSecVertexInfo;
   class VxJetCandidate;
   class RecVertex;
-  class JetFitterInitializationHelper;
-  class JetFitterHelper;
-  class JetFitterRoutines;
-  class ITrackSelectorTool;
-  class IExtrapolator;
-  class IVertexSeedFinder;
-  class IMode3dFinder;
-  class INeutralParticleParameterCalculator;
-  class IVxCandidateXAODVertex;
 }
 
-namespace InDet 
-{
-  class InDetJetFitterUtils;
+// Hackathon: add any new package here
+namespace InDet {
+  class JetFitterTrackSelectorTool;
+  class JetFitterTwoTrackVtxFinderTool;
+  class JetFitterV0FinderTool;
+  class JetFitterMultiStageFit;
 }
 
 namespace xAOD
@@ -64,17 +59,11 @@ namespace xAOD
 
 namespace InDet {
 
-  //  static const InterfaceID IID_InDetImprovedJetFitterVxFinder("InDetImprovedJetFitterVxFinder", 1, 0);
-
   class InDetImprovedJetFitterVxFinder : public AthAlgTool, public ISecVertexInJetFinder
   {
-
+    
   public:
-
-    //static const InterfaceID& interfaceID() {
-    //return IID_InDetImprovedJetFitterVxFinder;
-    //}
- 
+    
 
     StatusCode initialize();
     StatusCode finalize();
@@ -84,20 +73,13 @@ namespace InDet {
     ~InDetImprovedJetFitterVxFinder();
 
 
-    Trk::VxSecVertexInfo* findSecVertex(const xAOD::Vertex & primaryVertex,
-                                              const TLorentzVector & jetMomentum,
-                                              const std::vector<const xAOD::IParticle*> & inputTracks) const;
-
-    Trk::VxSecVertexInfo* findSecVertex(const Trk::RecVertex & primaryVertex,
-                                              const TLorentzVector & jetMomentum,
-					      const std::vector<const Trk::TrackParticleBase*> & inputTracks) const;
+    virtual Trk::VxSecVertexInfo* findSecVertex(const xAOD::Vertex & primaryVertex,
+						const TLorentzVector & jetMomentum,
+						const std::vector<const xAOD::IParticle*> & inputTracks) const;
 
   private:
-    
-    Trk::VxSecVertexInfo* doTheFinding(const xAOD::Vertex & primaryVertex, //const Trk::RecVertex & primaryVertex ,
-                                              const TLorentzVector & jetMomentum,
-                                             const std::vector<const Trk::ITrackLink*> & myTracks) const;
-    
+
+    void sortTrackCollectionByPt( std::vector< const Trk::ITrackLink* >& ) const;
 
     Trk::VxJetCandidate* findSecVertex(const Trk::RecVertex & primaryVertex,
                                        const TLorentzVector & jetMomentum,
@@ -109,115 +91,12 @@ namespace InDet {
     void doTheFit(Trk::VxJetCandidate* myJetCandidate,
                   bool performClustering=true) const;
 
-
-    ToolHandle<Trk::JetFitterInitializationHelper> m_initializationHelper;
-    ToolHandle<Trk::JetFitterHelper> m_helper;
-    ToolHandle<Trk::JetFitterRoutines> m_routines;
-    ToolHandle<Trk::ITrackSelectorTool> m_trkFilter; 
-    ToolHandle<Trk::IExtrapolator> m_extrapolator;
-    ToolHandle<InDet::InDetJetFitterUtils> m_jetFitterUtils;
-    ToolHandle<Trk::IVertexSeedFinder> m_CrossDistancesSeedFinder;
-    ToolHandle<Trk::IMode3dFinder> m_mode3dfinder;
-    ToolHandle<Trk::IVertexFitter> m_SequentialVertexFitter;
-    //ToolHandle<Trk::INeutralParticleParameterCalculator> m_convUtils;
-    ToolHandle< Trk::IVxCandidateXAODVertex > m_VertexEdmFactory;
-    
-
-    int m_maxNumDeleteIterations;
-    double m_vertexProbCut;
-    int m_maxClusteringIterations;
-    double m_vertexClusteringProbabilityCut;
-    double m_vertexClusteringProbabilityCutWithMass;
-    double m_vertexClusteringProbabilityCutWithMass0010;
-    double m_vertexClusteringProbabilityCutWithMass1015;
-    double m_vertexClusteringProbabilityCutWithMass1520;
-    double m_vertexClusteringProbabilityCutWithMass2025;
-    double m_vertexClusteringProbabilityCutWithMass2530;
-    double m_vertexClusteringProbabilityCutWithMass3040;
-    double m_vertexClusteringProbabilityCutWithMass4050;
-    double m_vertexClusteringProbabilityCutWithMass5060;
-    double m_vertexClusteringProbabilityCutWithMass6070;
-    double m_vertexClusteringTwoVtxMassForProbCut;
-
-    bool m_useFastClustering;
-
-    double m_cutCompatibilityPrimaryVertexForPositiveLifetimeTracks;
-    double m_cutCompatibilityPrimaryVertexForNegativeLifetimeTracks;
-    double m_twoVertexProbabilityCut;
-    double m_cutDeltaMKs;
-    double m_cutDeltaMLambda;
-    double m_cutDeltaMGamma;
-    double m_cutCompatibilityPrimaryVertexSingleTrackForKsAndLambda;
-    double m_cutCompatibilityPrimaryVertexBothTracksForKsAndLambda;
-    double m_cutTwoTrkVtxLifetimeSignificanceForKs;
-    double m_cutTwoTrkVtxLifetimeSignificanceForLambda;
-    double m_cutIPD0BothTracksCriteriumOneForKsAndLambda;
-    double m_cutIPZ0BothTracksCriteriumOneForKsAndLambda;
-    double m_cutTransverseTwoTrkVtxDistanceCriteriumTwoForKsAndLambda;
-    double m_cutCompatibilityChi2ToPrimaryNeutralTrackFromConversion;
-    double m_cutCompatibilityChi2ToPrimaryNeutralTrackFromKs;
-    double m_cutCompatibilityChi2ToPrimaryNeutralTrackFromLambda;
-    double m_cutCompatibilityPrimaryVertexSingleTrackForBFirstSelection;
-    double m_cutCompatibilityPrimaryVertexBothTracksForBFirstSelection;
-    double m_cutIPD0BothTracksForBFirstSelection;
-    double m_cutIPZ0BothTracksForBFirstSelection;
-    double m_cutPtBothTracksForBFirstSelection;
-    double m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionFirstCriterium;
-    double m_cutTwoTrkVtxVertexProbForBFirstSelectionFirstCriterium;
-    double m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionSecondCriterium;
-    double m_cutTwoTrkVtxVertexProbForBFirstSelectionSecondCriterium;
-//material interaction removal... (is it usefull at all???)
-    double m_firstBeam_min;
-    double m_firstBeam_max;
-    double m_secondBeam_min;
-    double m_secondBeam_max;
-    double m_firstLayer_min;
-    double m_firstLayer_max;
-    double m_secondLayer_min;
-    double m_secondLayer_max;
-    double m_cutCompatibilityToPrimarySingleTrackForMatInteractions;
-    double m_cutCompatibilityToPrimaryBothTracksForMatInteractions;
-//cuts for additional tracks (SecondSelection)
-    double m_cutIPD0SingleTrackForBSecondSelection;
-    double m_cutIPZ0SingleTrackForBSecondSelection;
-    double m_cutPtSingleTrackForBSecondSelection;
-    double m_cutIPD0SigBoxSingleTrackForBSecondSelection; //box cut for PU rejection in 1-t vtx
-    double m_cutIPZ0SigBoxSingleTrackForBSecondSelection; //box cut for PU rejection in 1-t vtx
-    double m_cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection;
-    double m_cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection;
-//don't use the primary vertex finder information to estimate the compatibility! 
-    double m_doNotUsePrimaryVertexCombatibilityInfo;
-//invert the cuts for estimating the negative tags!
-    bool m_revertFromPositiveToNegativeTags;
-    
-    /*
-     * Avoid vertex to be initialize outside ID envelope given bu m_maxR and m_maxZ
-     */
-
-    double m_maxR;
-    double m_maxZ;
-
-    std::string  m_VxContainerName;
-
+  private:
+    ToolHandle< JetFitterTrackSelectorTool > m_theTrackSelector {this,"JetFitterTrackSelectorTool","JetFitterTrackSelectorTool/JetFitterTrackSelectorTool",""}; //Hackathon addition    
+    ToolHandle< JetFitterTwoTrackVtxFinderTool > m_theTwoTrackVtxFinderTool {this,"JetFitterTwoTrackVtxFinderTool","JetFitterV0FinderTool/JetFitterTwoTrackVtxFinderTool",""}; //Hackathon addition
+    ToolHandle< JetFitterV0FinderTool > m_theV0FinderTool {this,"JetFitterV0FinderTool","JetFitterV0FinderTool/JetFitterV0FinderTool",""}; //Hackathon addition
+    ToolHandle< JetFitterMultiStageFit > m_multiStageFitter {this,"JetFitterMultiStageFit","JetFitterMultiStageFit/JetFitterMultiStageFit",""}; //Hackathon addition
     
-    /*
-     * Number of tracks above which do not perform detailed clustering 
-     * (to avoid explosion of combinatorics)
-     */    
-
-    int m_maxTracksForDetailedClustering;
-
-    /*
-     * sum pT dependent cuts on track pT
-     * pT(track)< pTMinOffset + pTsum * m_pTMinSlope
-     * OR pTsum
-     */
-    bool m_usepTDepTrackSel;
-    double m_pTMinOffset;
-    double m_pTMinSlope;
-    double m_pTMax;
-
-
   };//end class declaration
 
 }//end namespace Rec