From 942a60fae3697718bfc3ab80f4c9e9402de0c7dc Mon Sep 17 00:00:00 2001 From: Salvatore Rappoccio Date: Mon, 28 Jul 2014 20:47:29 +0200 Subject: [PATCH] Changing CA and HEPTopTagInfos to ca and hepTopTagInfos to respect naming conventions --- .../PatAlgos/python/recoLayer0/bTagging_cff.py | 2 +- PhysicsTools/PatAlgos/python/tools/jetTools.py | 4 ++-- RecoJets/JetProducers/python/caTopTaggers_cff.py | 6 +++--- TopQuarkAnalysis/TopPairBSM/test/anaTrain_cfg.py | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py b/PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py index 35ff5317cae73..c8120dbd3ca13 100644 --- a/PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py +++ b/PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py @@ -17,7 +17,7 @@ , 'softPFElectronsTagInfos' , 'inclusiveSecondaryVertexFinderTagInfos' , 'inclusiveSecondaryVertexFinderFilteredTagInfos' - , 'CATopTagInfos' + , 'caTopTagInfos' ] ## dictionary with all available btag discriminators and the btagInfos that they require diff --git a/PhysicsTools/PatAlgos/python/tools/jetTools.py b/PhysicsTools/PatAlgos/python/tools/jetTools.py index fb0a6351fa1ee..ee727d3c81aff 100644 --- a/PhysicsTools/PatAlgos/python/tools/jetTools.py +++ b/PhysicsTools/PatAlgos/python/tools/jetTools.py @@ -381,8 +381,8 @@ def toolCode(self, process): process.load( 'RecoBTag.SecondaryVertex.secondaryVertex_cff' ) if not hasattr( process, 'bToCharmDecayVertexMerged' ): process.load( 'RecoBTag.SecondaryVertex.bToCharmDecayVertexMerger_cfi' ) - if 'CATopTagInfos' in acceptedTagInfos : - if not hasattr( process, 'CATopTagInfos' ): + if 'caTopTagInfos' in acceptedTagInfos : + if not hasattr( process, 'caTopTagInfos' ): process.load( 'RecoJets.JetProducers.CATopTagInfos_cff' ) else: _newPatJets.addBTagInfo = False diff --git a/RecoJets/JetProducers/python/caTopTaggers_cff.py b/RecoJets/JetProducers/python/caTopTaggers_cff.py index 96f037e692a8a..9799e9c81ae66 100644 --- a/RecoJets/JetProducers/python/caTopTaggers_cff.py +++ b/RecoJets/JetProducers/python/caTopTaggers_cff.py @@ -34,9 +34,9 @@ ) -CATopTagInfos = cms.EDProducer("CATopJetTagger", +caTopTagInfos = cms.EDProducer("CATopJetTagger", src = cms.InputTag("cmsTopTagPFJetsCHS"), - TopMass = cms.double(171), + TopMass = cms.double(173), TopMassMin = cms.double(0.), TopMassMax = cms.double(250.), WMass = cms.double(80.4), @@ -47,6 +47,6 @@ verbose = cms.bool(False) ) -HEPTopTagInfos = CATopTagInfos.clone( +hepTopTagInfos = caTopTagInfos.clone( src = cms.InputTag("hepTopTagPFJetsCHS") ) diff --git a/TopQuarkAnalysis/TopPairBSM/test/anaTrain_cfg.py b/TopQuarkAnalysis/TopPairBSM/test/anaTrain_cfg.py index 92b1d44c82260..2514a53fffab5 100644 --- a/TopQuarkAnalysis/TopPairBSM/test/anaTrain_cfg.py +++ b/TopQuarkAnalysis/TopPairBSM/test/anaTrain_cfg.py @@ -165,9 +165,9 @@ process.ca15PFJetsCHS = ca8PFJetsCHS.clone(rParam=1.5,src='pfNoPileUpJME',doAreaFastjet=False) process.hepTopTagPFJetsCHS = hepTopTagPFJetsCHS.clone(src='pfNoPileUpJME') -from RecoJets.JetProducers.caTopTaggers_cff import CATopTagInfos, HEPTopTagInfos +from RecoJets.JetProducers.caTopTaggers_cff import caTopTagInfos, hepTopTagInfos -process.CATopTagInfos = CATopTagInfos.clone() +process.caTopTagInfos = caTopTagInfos.clone() ################################################################################################ @@ -218,7 +218,7 @@ getJetMCFlavour=False, jetCorrections = ('AK7PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'None'), btagInfos = [ - 'CATopTagInfos' + 'caTopTagInfos' ] ) @@ -384,12 +384,12 @@ # Add the top-tagging info which piggy-backs on the b-tagging tag info process.patJetsCA8CMSTopTag.addTagInfos = True process.patJetsCA8CMSTopTag.tagInfoSources = cms.VInputTag( - cms.InputTag('CATopTagInfos') + cms.InputTag('caTopTagInfos') ) process.patJetsCA15HEPTopTag.addTagInfos = True process.patJetsCA15HEPTopTag.tagInfoSources = cms.VInputTag( - cms.InputTag('HEPTopTagInfos') + cms.InputTag('hepTopTagInfos') )