diff --git a/[refs] b/[refs] index 37af356497494..668b619ba9a6a 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": b12ece9efc78bf0001871e7ad87ad9676810ce1d +"refs/heads/CMSSW_7_1_X": 655c7681b9ed215693bbd2ad0be3b0f008feb1e9 diff --git a/trunk/RecoJets/Configuration/python/GenJetParticles_cff.py b/trunk/RecoJets/Configuration/python/GenJetParticles_cff.py index 1721cbeaad20a..c4063071aefcd 100644 --- a/trunk/RecoJets/Configuration/python/GenJetParticles_cff.py +++ b/trunk/RecoJets/Configuration/python/GenJetParticles_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms # -# $Id: GenJetParticles_cff.py,v 1.3 2009/10/02 19:24:22 srappocc Exp $ +# $Id: GenJetParticles_cff.py,v 1.4 2009/10/22 18:06:42 srappocc Exp $ # # ShR 27 Mar 07: move modules producing candidates for Jets from RecoGenJets.cff # @@ -26,3 +26,9 @@ hiGenParticlesForJets = genParticlesForJets.clone() hiGenParticlesForJets.src = cms.InputTag("hiGenParticles") + +genParticlesForJetsNoNu = genParticlesForJets.clone() +genParticlesForJetsNoNu.ignoreParticleIDs += cms.vuint32( 12,14,16) + +genParticlesForJetsNoMuNoNu = genParticlesForJets.clone() +genParticlesForJetsNoMuNoNu.ignoreParticleIDs += cms.vuint32( 12,13,14,16) diff --git a/trunk/RecoJets/Configuration/python/RecoGenJets_cff.py b/trunk/RecoJets/Configuration/python/RecoGenJets_cff.py index 0b4bcb3b81bfb..dd214851406a4 100644 --- a/trunk/RecoJets/Configuration/python/RecoGenJets_cff.py +++ b/trunk/RecoJets/Configuration/python/RecoGenJets_cff.py @@ -17,29 +17,29 @@ ca6GenJets = ca4GenJets.clone( rParam = 0.6 ) -sisCone5GenJetsNoNu = sisCone5GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNu") ) -sisCone7GenJetsNoNu = sisCone7GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNu") ) -kt4GenJetsNoNu = kt4GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNu") ) -kt6GenJetsNoNu = kt6GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNu") ) -iterativeCone5GenJetsNoNu = iterativeCone5GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNu") ) -ak5GenJetsNoNu = ak5GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNu") ) -ak7GenJetsNoNu = ak7GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNu") ) -gk5GenJetsNoNu = gk5GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNu") ) -gk7GenJetsNoNu = gk7GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNu") ) -ca4GenJetsNoNu = ca4GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNu") ) -ca6GenJetsNoNu = ca6GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNu") ) +sisCone5GenJetsNoNu = sisCone5GenJets.clone( src = cms.InputTag("genParticlesForJetsNoNu") ) +sisCone7GenJetsNoNu = sisCone7GenJets.clone( src = cms.InputTag("genParticlesForJetsNoNu") ) +kt4GenJetsNoNu = kt4GenJets.clone( src = cms.InputTag("genParticlesForJetsNoNu") ) +kt6GenJetsNoNu = kt6GenJets.clone( src = cms.InputTag("genParticlesForJetsNoNu") ) +iterativeCone5GenJetsNoNu = iterativeCone5GenJets.clone( src = cms.InputTag("genParticlesForJetsNoNu") ) +ak5GenJetsNoNu = ak5GenJets.clone( src = cms.InputTag("genParticlesForJetsNoNu") ) +ak7GenJetsNoNu = ak7GenJets.clone( src = cms.InputTag("genParticlesForJetsNoNu") ) +gk5GenJetsNoNu = gk5GenJets.clone( src = cms.InputTag("genParticlesForJetsNoNu") ) +gk7GenJetsNoNu = gk7GenJets.clone( src = cms.InputTag("genParticlesForJetsNoNu") ) +ca4GenJetsNoNu = ca4GenJets.clone( src = cms.InputTag("genParticlesForJetsNoNu") ) +ca6GenJetsNoNu = ca6GenJets.clone( src = cms.InputTag("genParticlesForJetsNoNu") ) -sisCone5GenJetsNoNuBSM = sisCone5GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNuBSM") ) -sisCone7GenJetsNoNuBSM = sisCone7GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNuBSM") ) -kt4GenJetsNoNuBSM = kt4GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNuBSM") ) -kt6GenJetsNoNuBSM = kt6GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNuBSM") ) -iterativeCone5GenJetsNoNuBSM = iterativeCone5GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNuBSM") ) -ak5GenJetsNoNuBSM = ak5GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNuBSM") ) -ak7GenJetsNoNuBSM = ak7GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNuBSM") ) -gk5GenJetsNoNuBSM = gk5GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNuBSM") ) -gk7GenJetsNoNuBSM = gk7GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNuBSM") ) -ca4GenJetsNoNuBSM = ca4GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNuBSM") ) -ca6GenJetsNoNuBSM = ca6GenJets.clone( src = cms.InputTag("genParticlesAllStableNoNuBSM") ) +sisCone5GenJetsNoMuNoNu = sisCone5GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") ) +sisCone7GenJetsNoMuNoNu = sisCone7GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") ) +kt4GenJetsNoMuNoNu = kt4GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") ) +kt6GenJetsNoMuNoNu = kt6GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") ) +iterativeCone5GenJetsNoMuNoNu = iterativeCone5GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") ) +ak5GenJetsNoMuNoNu = ak5GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") ) +ak7GenJetsNoMuNoNu = ak7GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") ) +gk5GenJetsNoMuNoNu = gk5GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") ) +gk7GenJetsNoMuNoNu = gk7GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") ) +ca4GenJetsNoMuNoNu = ca4GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") ) +ca6GenJetsNoMuNoNu = ca6GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") ) recoGenJets =cms.Sequence(sisCone5GenJets+sisCone7GenJets+ kt4GenJets+kt6GenJets+ @@ -60,9 +60,9 @@ gk5GenJetsNoNu+gk7GenJetsNoNu+ ca4GenJetsNoNu+ca6GenJetsNoNu) -recoAllGenJetsNoNuBSM=cms.Sequence(sisCone5GenJetsNoNuBSM+sisCone7GenJetsNoNuBSM+ - kt4GenJetsNoNuBSM+kt6GenJetsNoNuBSM+ - iterativeCone5GenJetsNoNuBSM+ - ak5GenJetsNoNuBSM+ak7GenJetsNoNuBSM+ - gk5GenJetsNoNuBSM+gk7GenJetsNoNuBSM+ - ca4GenJetsNoNuBSM+ca6GenJetsNoNuBSM) +recoAllGenJetsNoMuNoNu=cms.Sequence(sisCone5GenJetsNoMuNoNu+sisCone7GenJetsNoMuNoNu+ + kt4GenJetsNoMuNoNu+kt6GenJetsNoMuNoNu+ + iterativeCone5GenJetsNoMuNoNu+ + ak5GenJetsNoMuNoNu+ak7GenJetsNoMuNoNu+ + gk5GenJetsNoMuNoNu+gk7GenJetsNoMuNoNu+ + ca4GenJetsNoMuNoNu+ca6GenJetsNoMuNoNu)