Skip to content

Commit

Permalink
Changing CA and HEPTopTagInfos to ca and hepTopTagInfos to respect na…
Browse files Browse the repository at this point in the history
…ming conventions
  • Loading branch information
rappoccio committed Jul 28, 2014
1 parent 2541d55 commit 942a60f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
, 'softPFElectronsTagInfos'
, 'inclusiveSecondaryVertexFinderTagInfos'
, 'inclusiveSecondaryVertexFinderFilteredTagInfos'
, 'CATopTagInfos'
, 'caTopTagInfos'
]

## dictionary with all available btag discriminators and the btagInfos that they require
Expand Down
4 changes: 2 additions & 2 deletions PhysicsTools/PatAlgos/python/tools/jetTools.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions RecoJets/JetProducers/python/caTopTaggers_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -47,6 +47,6 @@
verbose = cms.bool(False)
)

HEPTopTagInfos = CATopTagInfos.clone(
hepTopTagInfos = caTopTagInfos.clone(
src = cms.InputTag("hepTopTagPFJetsCHS")
)
10 changes: 5 additions & 5 deletions TopQuarkAnalysis/TopPairBSM/test/anaTrain_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()


################################################################################################
Expand Down Expand Up @@ -218,7 +218,7 @@
getJetMCFlavour=False,
jetCorrections = ('AK7PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'None'),
btagInfos = [
'CATopTagInfos'
'caTopTagInfos'
]
)

Expand Down Expand Up @@ -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')
)


Expand Down

0 comments on commit 942a60f

Please sign in to comment.