From 714ec8b429ed4118c696e308870169bdc7934a77 Mon Sep 17 00:00:00 2001 From: Xiaozhong Huang Date: Fri, 24 Jan 2020 01:20:57 +0800 Subject: [PATCH] tauRecTools: remove unused properties The property of container name are replaced by ReadHandleKey, thus not used any more. They are now removed. We use three diferent property ( "CellCorrection", "AxisCorrection", and "VertexCorrection") to decide whether to perform the same operation, e.g. tau vertex correction of the cell. Now, only "VertexCorrection" is used. --- .../tauRec/python/TauAlgorithmsHolder.py | 16 ++------ .../tauRecTools/Root/TauCommonCalcVars.cxx | 6 --- .../Root/TauPi0ScoreCalculator.cxx | 2 - .../Root/TauSubstructureVariables.cxx | 1 - .../tauRecTools/Root/TauTrackFilter.cxx | 3 -- .../Root/TauTrackRNNClassifier.cxx | 1 - .../tauRecTools/src/JetSeedBuilder.cxx | 19 +-------- .../tauRecTools/src/JetSeedBuilder.h | 5 --- .../tauRecTools/src/TauAxisSetter.cxx | 8 ++-- .../tauRecTools/src/TauAxisSetter.h | 3 +- .../tauRecTools/src/TauCellVariables.cxx | 16 +++----- .../tauRecTools/src/TauCellVariables.h | 4 +- .../src/TauElectronVetoVariables.cxx | 12 +++--- .../src/TauElectronVetoVariables.h | 2 +- .../tauRecTools/src/TauTrackFinder.cxx | 23 ----------- .../tauRecTools/src/TauTrackFinder.h | 11 +----- .../tauRecTools/TauPi0ScoreCalculator.h | 2 - .../tauRecTools/TauSubstructureVariables.h | 1 - .../tauRecTools/tauRecTools/TauTrackFilter.h | 5 --- .../tauRecTools/TauTrackRNNClassifier.h | 3 +- .../python/TrigTauAlgorithmsHolder.py | 39 ++++--------------- .../TrigTauRec/python/TrigTauRecConfig.py | 4 -- 22 files changed, 34 insertions(+), 152 deletions(-) diff --git a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py index e5cd017ef76..ada9fb37e0b 100644 --- a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py +++ b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py @@ -61,11 +61,7 @@ def getJetSeedBuilder(seed_collection_name): return cached_instances[_name] from tauRecTools.tauRecToolsConf import JetSeedBuilder - JetSeedBuilder = JetSeedBuilder(name = _name, - JetCollection = seed_collection_name, - maxDist = 0.2, - minPt = 10.*GeV, - SwitchJetsEmScale = False) + JetSeedBuilder = JetSeedBuilder(name = _name) cached_instances[_name] = JetSeedBuilder return JetSeedBuilder @@ -81,7 +77,7 @@ def getTauAxis(): from tauRecTools.tauRecToolsConf import TauAxisSetter TauAxisSetter = TauAxisSetter( name = _name, ClusterCone = 0.2, - CellCorrection = True) + VertexCorrection = True) cached_instances[_name] = TauAxisSetter return TauAxisSetter @@ -124,10 +120,8 @@ def getCellVariables(cellConeSize=0.2, prefix=''): TauCellVariables = TauCellVariables(name = _name, CellEthreshold = 0.2*GeV, StripEthreshold = 0.2*GeV, - EMSumThreshold = 0.5*GeV, - EMSumRadius = 0.2, CellCone = cellConeSize, - CellCorrection = True) + VertexCorrection = True) cached_instances[_name] = TauCellVariables return TauCellVariables @@ -336,7 +330,7 @@ def getElectronVetoVars(): from tauRecTools.tauRecToolsConf import TauElectronVetoVariables TauElectronVetoVariables = TauElectronVetoVariables(name = _name, - CellCorrection = True, + VertexCorrection = True, ParticleCaloExtensionTool = getParticleCaloExtensionTool(), tauEVParticleCache = getParticleCache() ) @@ -426,7 +420,6 @@ def getPi0ScoreCalculator(): from tauRecTools.tauRecToolsConf import TauPi0ScoreCalculator TauPi0ScoreCalculator = TauPi0ScoreCalculator(name = _name, - ReaderOption = 'Silent:!Color', BDTWeightFile = 'TauPi0BDTWeights.root', ) @@ -480,7 +473,6 @@ def getTauShotFinder(): from tauRecTools.tauRecToolsConf import TauShotFinder TauShotFinder = TauShotFinder(name = _name, CaloWeightTool = getCellWeightTool(), - #ReaderOption = "Silent:!Color", #BDTWeightFile_barrel = "TauShotsBDTWeights.xml", #BDTWeightFile_endcap1 = "TauShotsBDTWeights.xml", #BDTWeightFile_endcap2 = "TauShotsBDTWeights.xml", diff --git a/Reconstruction/tauRecTools/Root/TauCommonCalcVars.cxx b/Reconstruction/tauRecTools/Root/TauCommonCalcVars.cxx index 605ab391656..8027d96b5d0 100644 --- a/Reconstruction/tauRecTools/Root/TauCommonCalcVars.cxx +++ b/Reconstruction/tauRecTools/Root/TauCommonCalcVars.cxx @@ -14,11 +14,6 @@ // 16/05/2011: (FF) fix if primaryVertexContainer==NULL (coverity 21734) // Dez 2011: (FF) switch to full LC calibrated tau 4-vector for some variables //----------------------------------------------------------------------------- -//TODO: rename - -//#include -//#include - #include "tauRecTools/TauEventData.h" #include "tauRecTools/TauCommonCalcVars.h" @@ -30,7 +25,6 @@ TauCommonCalcVars::TauCommonCalcVars(const std::string &name) : TauRecToolBase(name) { - declareProperty("ConfigPath", m_configPath); //if TauTrackClassifier is not run, wide&passTrkSelector==classifiedIsolation==modifiedIsolationTrack declareProperty("isolationTrackType", m_isolationTrackType=xAOD::TauJetParameters::modifiedIsolationTrack); } diff --git a/Reconstruction/tauRecTools/Root/TauPi0ScoreCalculator.cxx b/Reconstruction/tauRecTools/Root/TauPi0ScoreCalculator.cxx index d559059911d..6084d994fed 100644 --- a/Reconstruction/tauRecTools/Root/TauPi0ScoreCalculator.cxx +++ b/Reconstruction/tauRecTools/Root/TauPi0ScoreCalculator.cxx @@ -27,7 +27,6 @@ using std::string; TauPi0ScoreCalculator::TauPi0ScoreCalculator( const string& name ) : TauRecToolBase(name), - m_readerOption("Silent:!Color"), m_mvaBDT(0), m_Abs_FIRST_ETA(0), m_SECOND_R(0), @@ -53,7 +52,6 @@ TauPi0ScoreCalculator::TauPi0ScoreCalculator( const string& name ) : m_energy_EM1(0), m_energy_EM2(0) { - declareProperty("ReaderOption", m_readerOption); declareProperty("BDTWeightFile", m_weightfile); } diff --git a/Reconstruction/tauRecTools/Root/TauSubstructureVariables.cxx b/Reconstruction/tauRecTools/Root/TauSubstructureVariables.cxx index 333fc0f1595..9d50ef8633e 100644 --- a/Reconstruction/tauRecTools/Root/TauSubstructureVariables.cxx +++ b/Reconstruction/tauRecTools/Root/TauSubstructureVariables.cxx @@ -51,7 +51,6 @@ TauSubstructureVariables::TauSubstructureVariables( const std::string& name ) : declareProperty("pileUpAlpha", m_pileUpAlpha); declareProperty("VertexCorrection", m_doVertexCorrection); declareProperty("inAODmode", m_inAODmode); - declareProperty("ConfigPath", m_configPath); } diff --git a/Reconstruction/tauRecTools/Root/TauTrackFilter.cxx b/Reconstruction/tauRecTools/Root/TauTrackFilter.cxx index 405eaa623f3..4115411582d 100644 --- a/Reconstruction/tauRecTools/Root/TauTrackFilter.cxx +++ b/Reconstruction/tauRecTools/Root/TauTrackFilter.cxx @@ -43,9 +43,6 @@ TauTrackFilter::TauTrackFilter(const std::string &name ) : m_nProng(0), m_flag(0) { - declareProperty("ConfigPath", m_configPath); - declareProperty("TrackContainerName", m_trackContainerName = "InDetTrackParticles"); - declareProperty("TauTrackContainerName", m_tauTrackConName = "TauTracks"); } //----------------------------------------------------------------------------- diff --git a/Reconstruction/tauRecTools/Root/TauTrackRNNClassifier.cxx b/Reconstruction/tauRecTools/Root/TauTrackRNNClassifier.cxx index 83ec2217210..d831391fcec 100644 --- a/Reconstruction/tauRecTools/Root/TauTrackRNNClassifier.cxx +++ b/Reconstruction/tauRecTools/Root/TauTrackRNNClassifier.cxx @@ -28,7 +28,6 @@ TauTrackRNNClassifier::TauTrackRNNClassifier(const std::string& sName) { declareProperty("Classifiers", m_vClassifier ); declareProperty("ClassifierNames", m_vClassifierNames ); - declareProperty("TauTrackContainerName", m_tauTrackConName="TauTracks"); } //______________________________________________________________________________ diff --git a/Reconstruction/tauRecTools/src/JetSeedBuilder.cxx b/Reconstruction/tauRecTools/src/JetSeedBuilder.cxx index 2bf26604289..73adf088361 100644 --- a/Reconstruction/tauRecTools/src/JetSeedBuilder.cxx +++ b/Reconstruction/tauRecTools/src/JetSeedBuilder.cxx @@ -31,15 +31,7 @@ CREATED: Nov 27 2007 //------------------------------------------------------------------------- JetSeedBuilder::JetSeedBuilder(const std::string& name) : - TauRecToolBase(name), - m_jetCollectionName("AntiKt4LCTopoJets"), - m_maxJetdist(0.1), - m_minJetPt(10000.0), - m_switch_jets_em_scale(false) { - declareProperty("JetCollection", m_jetCollectionName); - declareProperty("maxDist", m_maxJetdist); - declareProperty("minPt", m_minJetPt); - declareProperty("SwitchJetsEmScale", m_switch_jets_em_scale); + TauRecToolBase(name) { } //------------------------------------------------------------------------- @@ -75,12 +67,11 @@ StatusCode JetSeedBuilder::execute(xAOD::TauJet& pTau) { const xAOD::Jet* pJetSeed = nullptr; if (pTau.jetLink().isValid()) pJetSeed = * pTau.jetLink(); - if (!pJetSeed) { + else { ATH_MSG_DEBUG("seed is not a jet -> tau will not be reconstructed"); return StatusCode::FAILURE; } - ATH_MSG_DEBUG("Seed extracted"); ATH_MSG_DEBUG("seed is Jet with" << " pt=" << pJetSeed->pt() << " eta=" << pJetSeed->eta() @@ -107,12 +98,6 @@ StatusCode JetSeedBuilder::execute(xAOD::TauJet& pTau) { pTau.setP4(pJetSeed->pt(),pTau.eta(),pTau.phi(),0.0); } else { - if (m_switch_jets_em_scale) { - ATH_MSG_INFO("trying to set seed jet signal state to EMSCALE, but this code has not been migrated to xAOD::Jet yet"); - //XXX still need to look up how signal states are handled for the xAOD jets - // SignalStateHelper sigstateH(P4SignalState::JETEMSCALE); - // sigstateH.controlObject(pJetSeed); - } if ( pJetSeed->pt() > 1e-7) pTau.setP4(static_cast( pJetSeed->pt() ) ,static_cast( pJetSeed->eta() ) ,static_cast( pJetSeed->phi() ) ,0.0 ); diff --git a/Reconstruction/tauRecTools/src/JetSeedBuilder.h b/Reconstruction/tauRecTools/src/JetSeedBuilder.h index aca3f21aba8..97ac8dbfcf5 100644 --- a/Reconstruction/tauRecTools/src/JetSeedBuilder.h +++ b/Reconstruction/tauRecTools/src/JetSeedBuilder.h @@ -31,11 +31,6 @@ public: virtual StatusCode execute(xAOD::TauJet& pTau) override; virtual StatusCode finalize() override; -private: - std::string m_jetCollectionName; - float m_maxJetdist; - float m_minJetPt; - bool m_switch_jets_em_scale; }; #endif /* JETSEEDBUILDER_H */ diff --git a/Reconstruction/tauRecTools/src/TauAxisSetter.cxx b/Reconstruction/tauRecTools/src/TauAxisSetter.cxx index 9f15198313e..6486d6e63b2 100644 --- a/Reconstruction/tauRecTools/src/TauAxisSetter.cxx +++ b/Reconstruction/tauRecTools/src/TauAxisSetter.cxx @@ -17,12 +17,10 @@ TauAxisSetter::TauAxisSetter(const std::string& name) : TauRecToolBase(name), m_clusterCone(0.2), -m_doCellCorrection(false), -m_doAxisCorrection(true) +m_doVertexCorrection(true) { declareProperty("ClusterCone", m_clusterCone); - declareProperty("CellCorrection", m_doCellCorrection); - declareProperty("AxisCorrection", m_doAxisCorrection = true); + declareProperty("VertexCorrection", m_doVertexCorrection = true); } /********************************************************************/ @@ -100,7 +98,7 @@ StatusCode TauAxisSetter::execute(xAOD::TauJet& pTau) /////////////////////////////////////////////////////////////////////////// // calculate tau intermediate axis (corrected for tau vertex) // not needed at trigger level - if(m_doAxisCorrection) + if(m_doVertexCorrection) { TLorentzVector tauInterAxis; diff --git a/Reconstruction/tauRecTools/src/TauAxisSetter.h b/Reconstruction/tauRecTools/src/TauAxisSetter.h index 214ce4a50ff..615c1a0d1f0 100644 --- a/Reconstruction/tauRecTools/src/TauAxisSetter.h +++ b/Reconstruction/tauRecTools/src/TauAxisSetter.h @@ -38,8 +38,7 @@ private: * enable cell origin correction * eta and phi of the cells are corrected wrt to the origin of the tau vertex */ - bool m_doCellCorrection; - bool m_doAxisCorrection; + bool m_doVertexCorrection; }; #endif diff --git a/Reconstruction/tauRecTools/src/TauCellVariables.cxx b/Reconstruction/tauRecTools/src/TauCellVariables.cxx index a90cae2b71c..83a477d53d2 100644 --- a/Reconstruction/tauRecTools/src/TauCellVariables.cxx +++ b/Reconstruction/tauRecTools/src/TauCellVariables.cxx @@ -56,17 +56,13 @@ TauCellVariables::TauCellVariables(const std::string& name) : TauRecToolBase(name), m_cellEthr(0.2 * GeV), m_stripEthr(0.2 * GeV), -m_EMSumThr(0.5 * GeV), -m_EMSumR(0.2), m_cellCone(0.2), -m_doCellCorrection(false) //FF: don't do cell correction by default +m_doVertexCorrection(false) //FF: don't do cell correction by default { declareProperty("CellEthreshold", m_cellEthr); declareProperty("StripEthreshold", m_stripEthr); - declareProperty("EMSumThreshold", m_EMSumThr); - declareProperty("EMSumRadius", m_EMSumR); declareProperty("CellCone", m_cellCone); - declareProperty("CellCorrection", m_doCellCorrection); + declareProperty("VertexCorrection", m_doVertexCorrection); } TauCellVariables::~TauCellVariables() { @@ -119,9 +115,9 @@ StatusCode TauCellVariables::execute(xAOD::TauJet& pTau) { ATH_MSG_VERBOSE("position is eta=" << pTau.eta() << " phi=" << pTau.phi() ); //use tau vertex to correct cell position - bool applyCellCorrection = false; - if (m_doCellCorrection && pTau.vertexLink()) { - applyCellCorrection = true; + bool applyVertexCorrection = false; + if (m_doVertexCorrection && pTau.vertexLink()) { + applyVertexCorrection = true; } /////////////////////////////////////////////////////////////////////// @@ -171,7 +167,7 @@ StatusCode TauCellVariables::execute(xAOD::TauJet& pTau) { // ATH_MSG_VERBOSE( "in loop over clusters and cells : phi= " << cell->phi() << ", eta= " << cell->eta()<< ", energy= " << cell->energy() << ", et= " <et() ); // correct cell for tau vertex - if (applyCellCorrection) { + if (applyVertexCorrection) { //ATH_MSG_INFO( "before cell correction: phi= " << cell->phi() << ", eta= " << cell->eta()<< ", energy= " << cell->energy() << ", et= " <et() ); CaloVertexedCell vxCell (*cell, (*pTau.vertexLink())->position()); cellPhi = vxCell.phi(); diff --git a/Reconstruction/tauRecTools/src/TauCellVariables.h b/Reconstruction/tauRecTools/src/TauCellVariables.h index 886997b56ee..7c87595a1cd 100644 --- a/Reconstruction/tauRecTools/src/TauCellVariables.h +++ b/Reconstruction/tauRecTools/src/TauCellVariables.h @@ -34,15 +34,13 @@ public: private: double m_cellEthr; //!< EM cell E threshold double m_stripEthr; //!< cell E threshold for strips - double m_EMSumThr; //!< threshold for 4-vector EM sum - double m_EMSumR; //!< radius for 4-vector EM sum double m_cellCone; //!< outer cone for cells used in calculations /** * enable cell origin correction * eta and phi of the cells are corrected wrt to the origin of the tau vertex */ - bool m_doCellCorrection; + bool m_doVertexCorrection; }; #endif /* TAUREC_TAUCELLVARIABLES_H */ diff --git a/Reconstruction/tauRecTools/src/TauElectronVetoVariables.cxx b/Reconstruction/tauRecTools/src/TauElectronVetoVariables.cxx index 44673d6695e..57be0a19b23 100644 --- a/Reconstruction/tauRecTools/src/TauElectronVetoVariables.cxx +++ b/Reconstruction/tauRecTools/src/TauElectronVetoVariables.cxx @@ -49,10 +49,10 @@ using Gaudi::Units::GeV; //------------------------------------------------------------------------- TauElectronVetoVariables::TauElectronVetoVariables(const std::string &name) : TauRecToolBase(name), -m_doCellCorrection(false), //FF: don't do cell correction by default +m_doVertexCorrection(false), //FF: don't do cell correction by default m_caloExtensionTool("Trk::ParticleCaloExtensionTool/ParticleCaloExtensionTool") { - declareProperty("CellCorrection", m_doCellCorrection); + declareProperty("VertexCorrection", m_doVertexCorrection); declareProperty("ParticleCaloExtensionTool", m_caloExtensionTool ); } @@ -142,9 +142,9 @@ StatusCode TauElectronVetoVariables::execute(xAOD::TauJet& pTau) int trackIndex = -1; //use tau vertex to correct cell position - bool applyCellCorrection = false; - if (m_doCellCorrection && pTau.vertexLink()) { - applyCellCorrection = true; + bool applyVertexCorrection = false; + if (m_doVertexCorrection && pTau.vertexLink()) { + applyVertexCorrection = true; } //--------------------------------------------------------------------- @@ -253,7 +253,7 @@ StatusCode TauElectronVetoVariables::execute(xAOD::TauJet& pTau) } - if (applyCellCorrection) { + if (applyVertexCorrection) { //ATH_MSG_INFO( "before cell correction: phi= " << cell->phi() << ", eta= " << cell->eta()<< ", energy= " << cell->energy() << ", et= " <et() ); CaloVertexedCell vxCell (*pCell, (*pTau.vertexLink())->position()); cellPhi = vxCell.phi(); diff --git a/Reconstruction/tauRecTools/src/TauElectronVetoVariables.h b/Reconstruction/tauRecTools/src/TauElectronVetoVariables.h index 9c42590e026..9adbcbb070d 100644 --- a/Reconstruction/tauRecTools/src/TauElectronVetoVariables.h +++ b/Reconstruction/tauRecTools/src/TauElectronVetoVariables.h @@ -34,7 +34,7 @@ public: virtual StatusCode finalize() override; private: - bool m_doCellCorrection; //!< enable cell origin correction + bool m_doVertexCorrection; //!< enable cell origin correction ToolHandle< Trk::IParticleCaloExtensionTool > m_caloExtensionTool; Gaudi::Property m_useOldCalo{this,"useOldCalo",false,"If true, it uses the CaloExtensionTool for calculating track extrapolation. Otherwise, it allows the code to read from the cache created by CaloExtensionBuilderalg."}; diff --git a/Reconstruction/tauRecTools/src/TauTrackFinder.cxx b/Reconstruction/tauRecTools/src/TauTrackFinder.cxx index ab16d5b6588..1c0cd44a0b1 100644 --- a/Reconstruction/tauRecTools/src/TauTrackFinder.cxx +++ b/Reconstruction/tauRecTools/src/TauTrackFinder.cxx @@ -116,7 +116,6 @@ StatusCode TauTrackFinder::execute(xAOD::TauJet& pTau) { // as a vertex is used: tau origin / PV / beamspot / 0,0,0 (in this order, depending on availability) getTauTracksFromPV(pTau, *trackParticleCont, pVertex, tauTracks, wideTracks, otherTracks); - this->resetDeltaZ0Cache(); // remove core and wide tracks outside a maximal delta z0 wrt lead core track if (m_applyZ0cut) { this->removeOffsideTracksWrtLeadTrk(tauTracks, wideTracks, otherTracks, pVertex, m_z0maxDelta); @@ -425,7 +424,6 @@ void TauTrackFinder::removeOffsideTracksWrtLeadTrk(std::vectorresetDeltaZ0Cache(); // need at least one core track to have a leading trk to compare with if (tauTracks.size()<1) return; @@ -453,9 +451,7 @@ void TauTrackFinder::removeOffsideTracksWrtLeadTrk(std::vector m_TrkPass; int m_nProng; int m_flag; - SG::ReadHandleKey m_trackParticleInputContainer{this,"Key_trackParticleInputContainer","InDetTrackParticles","track key"}; - }; #endif diff --git a/Reconstruction/tauRecTools/tauRecTools/TauTrackRNNClassifier.h b/Reconstruction/tauRecTools/tauRecTools/TauTrackRNNClassifier.h index 84a59a7f846..13108be6cd8 100644 --- a/Reconstruction/tauRecTools/tauRecTools/TauTrackRNNClassifier.h +++ b/Reconstruction/tauRecTools/tauRecTools/TauTrackRNNClassifier.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ #ifndef TAUREC_TAUTRACKRNNCLASSIFIER_H @@ -57,7 +57,6 @@ public: private: ToolHandleArray m_vClassifier; - std::string m_tauTrackConName; std::vector m_vClassifierNames;//optional }; // class TauTrackRNNClassifier diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauAlgorithmsHolder.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauAlgorithmsHolder.py index 93354af3964..3d48ac0f07e 100644 --- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauAlgorithmsHolder.py +++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauAlgorithmsHolder.py @@ -15,7 +15,7 @@ cached_instances = {} sPrefix = 'TrigTau_' bAODmode = False -doCellCorrection = False +doVertexCorrection = False # standard container names _DefaultVertexContainer = "PrimaryVertices" #???? @@ -60,33 +60,11 @@ def getJetSeedBuilder(): return cached_instances[_name] from tauRecTools.tauRecToolsConf import JetSeedBuilder - JetSeedBuilder = JetSeedBuilder(name = _name, - #JetCollection = seed_collection_name, - maxDist = 0.2, - minPt = 10.*GeV, - SwitchJetsEmScale = False) + JetSeedBuilder = JetSeedBuilder(name = _name) cached_instances[_name] = JetSeedBuilder return JetSeedBuilder -######################################################################## -# Tau energy calibration and tau axis direction -def getPileUpCorrection(): - _name = sPrefix + 'IDPileUp' - - if _name in cached_instances: - return cached_instances[_name] - - from tauRecTools.tauRecToolsConf import TauIDPileupCorrection - TauPileUp = TauIDPileupCorrection( name = _name, - averageEstimator = 20., - calibrationFile1Prong = "fitted.pileup_1prong_hlt_2015.root", - calibrationFile3Prong = "fitted.pileup_multiprongs_hlt_2015.root", - useMu = True) - - cached_instances[_name] = TauPileUp - return TauPileUp - ######################################################################## # Tau energy calibration and tau axis direction def getTauAxis(): @@ -98,8 +76,8 @@ def getTauAxis(): from tauRecTools.tauRecToolsConf import TauAxisSetter TauAxisSetter = TauAxisSetter( name = _name, ClusterCone = 0.2, - CellCorrection = doCellCorrection, - AxisCorrection = False) + VertexCorrection = doVertexCorrection + ) # No Axis correction at trigger level cached_instances[_name] = TauAxisSetter @@ -184,10 +162,8 @@ def getCellVariables(cellConeSize=0.2): TauCellVariables = TauCellVariables(name = _name, CellEthreshold = 0.2*GeV, StripEthreshold = 0.2*GeV, - EMSumThreshold = 0.5*GeV, - EMSumRadius = 0.2, CellCone = cellConeSize, - CellCorrection = doCellCorrection) + VertexCorrection = doVertexCorrection) cached_instances[_name] = TauCellVariables return TauCellVariables @@ -388,7 +364,7 @@ def getTauSubstructure(): # parameters for CaloIsoCorrected variable maxPileUpCorrection = 4000., #MeV pileUpAlpha = 1.0, - VertexCorrection = doCellCorrection, + VertexCorrection = doVertexCorrection, inAODmode = bAODmode) cached_instances[_name] = TauSubstructureVariables @@ -404,7 +380,7 @@ def getElectronVetoVars(): from tauRecTools.tauRecToolsConf import TauElectronVetoVariables TauElectronVetoVariables = TauElectronVetoVariables(name = _name, - CellCorrection = doCellCorrection) + VertexCorrection = doVertexCorrection) cached_instances[_name] = TauElectronVetoVariables return TauElectronVetoVariables @@ -534,7 +510,6 @@ def getTauShotFinder(): from tauRecTools.tauRecToolsConf import TauShotFinder TauShotFinder = TauShotFinder(name = _name, CaloWeightTool = getCellWeightTool(), - ReaderOption = "Silent:!Color", BDTWeightFile_barrel = "TauShotsBDTWeights.xml", BDTWeightFile_endcap1 = "TauShotsBDTWeights.xml", BDTWeightFile_endcap2 = "TauShotsBDTWeights.xml", diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py index 5596cc33d96..5e167771c31 100644 --- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py +++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py @@ -153,7 +153,6 @@ class TrigTauRecMerged_TauPreselection (TrigTauRecMerged) : # Cluster-based sub-structure, with dRMax also tools.append(taualgs.getTauSubstructure()) # tools.append(taualgs.getEnergyCalibrationLC(correctEnergy=False, correctAxis=True, postfix='_onlyAxis')) - #tools.append(taualgs.getPileUpCorrection()) for tool in tools: @@ -216,7 +215,6 @@ class TrigTauRecMerged_TauFTK (TrigTauRecMerged) : # Cluster-based sub-structure, with dRMax also tools.append(taualgs.getTauSubstructure()) # tools.append(taualgs.getEnergyCalibrationLC(correctEnergy=False, correctAxis=True, postfix='_onlyAxis')) - #tools.append(taualgs.getPileUpCorrection()) for tool in tools: @@ -370,7 +368,6 @@ class TrigTauRecMerged_TauPrecision (TrigTauRecMerged) : # Cluster-based sub-structure, with dRMax also tools.append(taualgs.getTauSubstructure()) # tools.append(taualgs.getEnergyCalibrationLC(correctEnergy=False, correctAxis=True, postfix='_onlyAxis')) - #tools.append(taualgs.getPileUpCorrection()) tools.append(taualgs.getTauIDVarCalculator()) tools.append(taualgs.getTauJetBDTEvaluator(suffix="JetBDTEvaluator_1p", weightsFile="vars2016_pt_gamma_1p_isofix.root", @@ -461,7 +458,6 @@ class TrigTauRecMerged_TauPrecisionMVA (TrigTauRecMerged) : # Cluster-based sub-structure, with dRMax also tools.append(taualgs.getTauSubstructure()) # tools.append(taualgs.getEnergyCalibrationLC(correctEnergy=False, correctAxis=True, postfix='_onlyAxis')) - #tools.append(taualgs.getPileUpCorrection()) # tracktwoEF if not doMVATES: -- GitLab