Merge branch 'R22_TauPileupVertex' into 'master'

tauRecTools: drop unused pileup vertex scheme

See merge request !37865

Reconstruction/tauRec/python/TauAlgorithmsHolder.py

@@ -100,7 +100,6 @@ def getEnergyCalibrationLC(correctEnergy=True, correctAxis=False, postfix=''):
                                     doEnergyCorrection = correctEnergy,
                                     doAxisCorrection = correctAxis,
                                     doPtResponse = True,
-                                    countOnlyPileupVertices = True,
                                     Key_vertexInputContainer = _DefaultVertexContainer 
                                     )
             

Reconstruction/tauRecTools/Root/TauCalibrateLC.cxx

@@ -19,7 +19,6 @@ TauCalibrateLC::TauCalibrateLC(const std::string& name) :
   declareProperty("calibrationFile", m_calibrationFile = "");
   declareProperty("doEnergyCorrection", m_doEnergyCorr = false);
   declareProperty("doPtResponse", m_doPtResponse = false);
-  declareProperty("countOnlyPileupVertices", m_countOnlyPileupVertices = false);
   declareProperty("doAxisCorrection", m_doAxisCorr = false);
   declareProperty("usePantauAxis", m_usePantauAxis = false);
   declareProperty("isCaloOnly", m_isCaloOnly = false);
@@ -169,10 +168,7 @@ StatusCode TauCalibrateLC::execute(xAOD::TauJet& pTau) const
       }
       const xAOD::VertexContainer * vxContainer = vertexInHandle.cptr();
       for (const auto vertex : *vxContainer) {
-        if (m_countOnlyPileupVertices && vertex->vertexType() == xAOD::VxType::PileUp) {
-          ++nVertex;
-        }
-        else if (!m_countOnlyPileupVertices && vertex->nTrackParticles() >= m_minNTrackAtVertex) {
+        if (vertex->vertexType() == xAOD::VxType::PileUp) {
           ++nVertex;
         }
       } 

Reconstruction/tauRecTools/tauRecTools/TauCalibrateLC.h

@@ -51,7 +51,6 @@ class TauCalibrateLC : public TauRecToolBase {
     std::string m_calibrationFile; //!< energy calibration file
     bool m_doEnergyCorr; //!< switch for energy correction
     bool m_doPtResponse; //!< switch for pt response vs pt, if false, use E response vs E
-    bool m_countOnlyPileupVertices; //!< switch for counting vertices by nTracks or VxType::PileUp
     bool m_doAxisCorr;   //!< switch for eta correction
     bool m_usePantauAxis; //!< switch for overwriting calo (eta,phi) with Pantau (eta,phi) 
     bool m_isCaloOnly;   //!< switch for CaloOnly corrections