Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove iterativeConeGenJets from CMSSW, Add GenJetsNoNu to RECO/AOD #6884

Merged
merged 16 commits into from Dec 27, 2014
Merged

Remove iterativeConeGenJets from CMSSW, Add GenJetsNoNu to RECO/AOD #6884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0a34ebf
remove iterativeCone5GenJets and switch to ak4GenJetsNoNu
ahinzmann Dec 8, 2014
4c67ef1
revert PAT changes, remove ic5GenMET, fix gen jet sequence
ahinzmann Dec 8, 2014
f3ec215
revert pat changes, let tau validation produce own genjet collection
ahinzmann Dec 8, 2014
0b6a053
let tau validation produce own genjet collection
ahinzmann Dec 8, 2014
6df3c46
let tau validation produce own genjet collection
ahinzmann Dec 8, 2014
aed0969
adapt event content
ahinzmann Dec 8, 2014
c5ae9e5
keep ak4GenJets for a pre-release until new relvals for PAT are avail…
ahinzmann Dec 9, 2014
ef7ae4d
keep ak4GenJets for a pre-release until new relvals for PAT are avail…
ahinzmann Dec 9, 2014
e0e4fa3
keep ak4GenJets for a pre-release until new relvals for PAT are avail…
ahinzmann Dec 9, 2014
a7a36b5
remove genMetCaloAndNonPrompt from reco
ahinzmann Dec 11, 2014
9b5623d
Merged CMSSW_7_4_X from repository cms-sw
ahinzmann Dec 11, 2014
e8b82b5
Merged refs/pull/6884/head from repository cms-sw
ahinzmann Dec 11, 2014
3061452
revert nonu switch
ahinzmann Dec 11, 2014
0a75e4a
revert nonu part2
ahinzmann Dec 11, 2014
1bd4ea2
switch tau validation gen jets to ak4GenJets
ahinzmann Dec 15, 2014
7c5a638
replace IC5CaloJets as well
ahinzmann Dec 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion FastSimulation/HighLevelTrigger/python/HLTAnalyser_cfi.py
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
hltresults = cms.InputTag("TriggerResults"),

### Reconstructed objects
genjets = cms.InputTag("iterativeCone5GenJets"),
genjets = cms.InputTag("ak4GenJets"),
genmet = cms.InputTag("genMet"),
recjets = cms.InputTag("hltIterativeCone5CaloJets"),
recmet = cms.InputTag("hltMet"),
Expand Down
2 changes: 1 addition & 1 deletion FastSimulation/Validation/test/JetComparison.cc
View file
Open in desktop
Expand Up @@ -120,7 +120,7 @@ void JetComparison::analyze(edm::Event const& event, edm::EventSetup const& c) {


Handle<GenJetCollection> jetsgen;
event.getByLabel("iterativeCone5GenJets", jetsgen);
event.getByLabel("ak4GenJets", jetsgen);
for(unsigned int igen =0; igen < jetsgen->size();igen++)
{
// cout << " GENS energy = " << (*jetsgen)[igen].et() <<endl;
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/HLTanalyzers/python/HLTAnalyser_cfi.py
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@
HLTProcessName = cms.string("HLT"),

### reconstructed objects
genjets = cms.InputTag("iterativeCone5GenJets"),
genjets = cms.InputTag("ak4GenJets"),
genmet = cms.InputTag("genMet"),
hltjets = cms.InputTag("hltAntiKT5CaloJets"),
hltcorjets = cms.InputTag("hltCaloJetCorrected"),
Expand Down
2 changes: 1 addition & 1 deletion HLTriggerOffline/Higgs/python/hltHiggsValidator_cfi.py
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
genParticleLabel = cms.string("genParticles"),

# -- The instance name of the reco::GenJets collection
genJetLabel = cms.string("ak5GenJets"),
genJetLabel = cms.string("ak4GenJets"),

# -- The instance name of the reco::PFJetCollection collection
recoHtJetLabel = cms.untracked.string("ak4PFJetsCHS"),
Expand Down
4 changes: 2 additions & 2 deletions HLTriggerOffline/JetMET/run/jetmet_cfg.py
View file
Open in desktop
Expand Up @@ -36,8 +36,8 @@
process.SingleJetAnalyser = cms.EDFilter("JetMETHLTAnalyzer",
Debug = cms.bool(True),
Progress = cms.int32(1),
CaloJets = cms.string('iterativeCone5CaloJets'),
GenJets = cms.string('iterativeCone5GenJets'),
CaloJets = cms.string('ak4CaloJets'),
GenJets = cms.string('ak4GenJets'),
HLTriggerResults = cms.InputTag("TriggerResults::HLT"),
l1extramc = cms.string('l1extraParticles')
)
Expand Down
24 changes: 12 additions & 12 deletions HLTriggerOffline/SUSYBSM/python/SUSYBSM_triggerValidation_cff.py
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@
cms.PSet(
name = cms.string("RA1"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA1.mc_nJet,
mc_nPhot = mcSel_RA1.mc_nPhot,
Expand All @@ -78,7 +78,7 @@
cms.PSet(
name = cms.string("RA2"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA2.mc_nJet,
mc_nPhot = mcSel_RA2.mc_nPhot,
Expand All @@ -99,7 +99,7 @@
cms.PSet(
name = cms.string("RA3"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA3.mc_nJet,
mc_nPhot = mcSel_RA3.mc_nPhot,
Expand All @@ -120,7 +120,7 @@
cms.PSet(
name = cms.string("RA4_e"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA4_e.mc_nJet,
mc_nPhot = mcSel_RA4_e.mc_nPhot,
Expand All @@ -141,7 +141,7 @@
cms.PSet(
name = cms.string("RA4_m"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA4_m.mc_nJet,
mc_nPhot = mcSel_RA4_m.mc_nPhot,
Expand All @@ -162,7 +162,7 @@
cms.PSet(
name = cms.string("RA5RA6_1e1m"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA5RA6_1e1m.mc_nJet,
mc_nPhot = mcSel_RA5RA6_1e1m.mc_nPhot,
Expand All @@ -183,7 +183,7 @@
cms.PSet(
name = cms.string("RA5RA6_2e"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA5RA6_2e.mc_nJet,
mc_nPhot = mcSel_RA5RA6_2e.mc_nPhot,
Expand All @@ -204,7 +204,7 @@
cms.PSet(
name = cms.string("RA5RA6_2m"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA5RA6_2m.mc_nJet,
mc_nPhot = mcSel_RA5RA6_2m.mc_nPhot,
Expand All @@ -225,7 +225,7 @@
cms.PSet(
name = cms.string("RA7_1e2m"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA7_1e2m.mc_nJet,
mc_nPhot = mcSel_RA7_1e2m.mc_nPhot,
Expand All @@ -246,7 +246,7 @@
cms.PSet(
name = cms.string("RA7_2e1m"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA7_2e1m.mc_nJet,
mc_nPhot = mcSel_RA7_2e1m.mc_nPhot,
Expand All @@ -267,7 +267,7 @@
cms.PSet(
name = cms.string("RA7_3e"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA7_3e.mc_nJet,
mc_nPhot = mcSel_RA7_3e.mc_nPhot,
Expand All @@ -288,7 +288,7 @@
cms.PSet(
name = cms.string("RA7_3m"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA7_3m.mc_nJet,
mc_nPhot = mcSel_RA7_3m.mc_nPhot,
Expand Down
24 changes: 12 additions & 12 deletions HLTriggerOffline/SUSYBSM/python/SUSYBSM_triggerValidation_fastSim_cff.py
View file
Open in desktop
Expand Up @@ -56,7 +56,7 @@
cms.PSet(
name = cms.string("RA1"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA1.mc_nJet,
mc_nPhot = mcSel_RA1.mc_nPhot,
Expand All @@ -77,7 +77,7 @@
cms.PSet(
name = cms.string("RA2"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA2.mc_nJet,
mc_nPhot = mcSel_RA2.mc_nPhot,
Expand All @@ -98,7 +98,7 @@
cms.PSet(
name = cms.string("RA3"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA3.mc_nJet,
mc_nPhot = mcSel_RA3.mc_nPhot,
Expand All @@ -119,7 +119,7 @@
cms.PSet(
name = cms.string("RA4_e"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA4_e.mc_nJet,
mc_nPhot = mcSel_RA4_e.mc_nPhot,
Expand All @@ -140,7 +140,7 @@
cms.PSet(
name = cms.string("RA4_m"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA4_m.mc_nJet,
mc_nPhot = mcSel_RA4_m.mc_nPhot,
Expand All @@ -161,7 +161,7 @@
cms.PSet(
name = cms.string("RA5RA6_1e1m"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA5RA6_1e1m.mc_nJet,
mc_nPhot = mcSel_RA5RA6_1e1m.mc_nPhot,
Expand All @@ -182,7 +182,7 @@
cms.PSet(
name = cms.string("RA5RA6_2e"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA5RA6_2e.mc_nJet,
mc_nPhot = mcSel_RA5RA6_2e.mc_nPhot,
Expand All @@ -203,7 +203,7 @@
cms.PSet(
name = cms.string("RA5RA6_2m"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA5RA6_2m.mc_nJet,
mc_nPhot = mcSel_RA5RA6_2m.mc_nPhot,
Expand All @@ -224,7 +224,7 @@
cms.PSet(
name = cms.string("RA7_1e2m"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA7_1e2m.mc_nJet,
mc_nPhot = mcSel_RA7_1e2m.mc_nPhot,
Expand All @@ -245,7 +245,7 @@
cms.PSet(
name = cms.string("RA7_2e1m"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA7_2e1m.mc_nJet,
mc_nPhot = mcSel_RA7_2e1m.mc_nPhot,
Expand All @@ -266,7 +266,7 @@
cms.PSet(
name = cms.string("RA7_3e"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA7_3e.mc_nJet,
mc_nPhot = mcSel_RA7_3e.mc_nPhot,
Expand All @@ -287,7 +287,7 @@
cms.PSet(
name = cms.string("RA7_3m"),
genMet = cms.string('genMetTrue'),
genJets = cms.string('iterativeCone5GenJets'),
genJets = cms.string('ak4GenJets'),
mcparticles = cms.string('genParticles'),
mc_nJet = mcSel_RA7_3m.mc_nJet,
mc_nPhot = mcSel_RA7_3m.mc_nPhot,
Expand Down
12 changes: 6 additions & 6 deletions JetMETCorrections/MCJet/test/testMCTruthTree_cfg.py
View file
Open in desktop
Expand Up @@ -13,15 +13,15 @@
#)
############# CaloJets ############################
process.caloMctruthTree = cms.EDAnalyzer("CaloMCTruthTreeProducer",
jets = cms.string('ak5CaloJets'),
genjets = cms.string('ak5GenJets'),
histogramFile = cms.string('ak5CaloMctruthTree.root')
jets = cms.string('ak4CaloJets'),
genjets = cms.string('ak4GenJets'),
histogramFile = cms.string('ak4CaloMctruthTree.root')
)
############# PFJets ############################
process.pfMctruthTree = cms.EDAnalyzer("PFMCTruthTreeProducer",
jets = cms.string('ak5PFJets'),
genjets = cms.string('ak5GenJets'),
histogramFile = cms.string('ak5PFMctruthTree.root')
jets = cms.string('ak4PFJets'),
genjets = cms.string('ak4GenJets'),
histogramFile = cms.string('ak4PFMctruthTree.root')
)
############# Path ###########################
process.p = cms.Path(process.caloMctruthTree * process.pfMctruthTree)
Expand Down
2 changes: 1 addition & 1 deletion RecoEgamma/Examples/plugins/GsfElectronMCFakeAnalyzer.cc
View file
Open in desktop
Expand Up @@ -126,7 +126,7 @@ void GsfElectronMCFakeAnalyzer::beginJob(){


// matching object
std::string::size_type locJet = matchingObjectCollection_.label().find("iterativeCone5GenJets",0) ;
std::string::size_type locJet = matchingObjectCollection_.label().find("ak4GenJets",0) ;
std::string type_;
if ( locJet != std::string::npos ) {
std::cout << "Matching objects are GenJets " << std::endl;
Expand Down
4 changes: 2 additions & 2 deletions RecoJets/Configuration/python/GenJetParticles_cff.py
View file
Open in desktop
Expand Up @@ -21,8 +21,6 @@
tausAsJets = cms.bool(False)
)

genJetParticles = cms.Sequence(genParticlesForJets)

hiGenParticlesForJets = genParticlesForJets.clone()
hiGenParticlesForJets.src = cms.InputTag("hiGenParticles")

Expand All @@ -31,3 +29,5 @@

genParticlesForJetsNoMuNoNu = genParticlesForJets.clone()
genParticlesForJetsNoMuNoNu.ignoreParticleIDs += cms.vuint32( 12,13,14,16)

genJetParticles = cms.Sequence(genParticlesForJets+genParticlesForJetsNoNu)
5 changes: 3 additions & 2 deletions RecoJets/Configuration/python/RecoGenJets_cff.py
View file
Open in desktop
Expand Up @@ -44,9 +44,10 @@
ca4GenJetsNoMuNoNu = ca4GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") )
ca8GenJetsNoMuNoNu = ca8GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") )

recoGenJets =cms.Sequence(kt4GenJets+kt6GenJets+iterativeCone5GenJets+
recoGenJets = cms.Sequence(kt4GenJets+kt6GenJets+
ak4GenJets+
ak5GenJets+ak8GenJets)
ak5GenJets+ak8GenJets+
ak4GenJetsNoNu+ak8GenJetsNoNu)

recoAllGenJets=cms.Sequence(kt4GenJets+kt6GenJets+
ak4GenJets+
Expand Down
7 changes: 5 additions & 2 deletions RecoJets/Configuration/python/RecoJets_EventContent_cff.py
View file
Open in desktop
Expand Up @@ -107,7 +107,9 @@
'keep *_ak4GenJets_*_*',
'keep *_ak5GenJets_*_*',
'keep *_ak7GenJets_*_*',
'keep *_iterativeCone5GenJets_*_*',
'keep *_ak8GenJets_*_*',
'keep *_ak4GenJetsNoNu_*_*',
'keep *_ak8GenJetsNoNu_*_*',
'keep *_genParticle_*_*')
)
#AOD content
Expand Down Expand Up @@ -175,7 +177,8 @@
'keep *_ak4GenJets_*_*',
'keep *_ak5GenJets_*_*',
'keep *_ak8GenJets_*_*',
# 'keep *_iterativeCone5GenJets_*_*',
'keep *_ak4GenJetsNoNu_*_*',
'keep *_ak8GenJetsNoNu_*_*',
'keep *_genParticle_*_*'
)
)
2 changes: 1 addition & 1 deletion RecoMET/Configuration/python/RecoGenMET_cff.py
View file
Open in desktop
Expand Up @@ -11,5 +11,5 @@
from RecoMET.METProducers.genMetFromGenJets_cfi import *
#

recoGenMET = cms.Sequence(genMetCalo+genMetCaloAndNonPrompt+genMetTrue*genMetIC5GenJets)
recoGenMET = cms.Sequence(genMetCalo+genMetTrue)

4 changes: 1 addition & 3 deletions RecoMET/METProducers/test/recoMET_genMet_cfg.py
View file
Open in desktop
Expand Up @@ -39,9 +39,7 @@
process.genJetParticles*
process.genMETParticles *
process.genMetCalo *
process.genMetCaloAndNonPrompt *
process.genMetTrue *
process.genMetIC5GenJets
process.genMetTrue
)

process.e1 = cms.EndPath(
Expand Down
4 changes: 2 additions & 2 deletions RecoTauTag/TauTagTools/python/TruthTauDecayModeProducer_cfi.py
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@

makeMCQCDTauDecayModes = makeMCTauDecayModes.clone(
totalEtaCut = cms.double(2.5),
inputTag = cms.InputTag("iterativeCone5GenJets"),
inputTag = cms.InputTag("ak4GenJets"),
leadTrackEtaCut = cms.double(2.5),
leadTrackPtCut = cms.double(-1.0),
totalPtCut = cms.double(5.0),
Expand All @@ -34,5 +34,5 @@

makeMC = cms.Sequence(mcDecayedTaus*makeMCTauDecayModes)

makeMCQCD = cms.Sequence(iterativeCone5GenJets*makeMCQCDTauDecayModes)
makeMCQCD = cms.Sequence(makeMCQCDTauDecayModes)

2 changes: 1 addition & 1 deletion Validation/RecoEgamma/plugins/PhotonValidator.cc
View file
Open in desktop
Expand Up @@ -150,7 +150,7 @@ PhotonValidator::PhotonValidator( const edm::ParameterSet& pset )
edm::InputTag("famosSimHits"));
hepMC_Token_ = consumes<edm::HepMCProduct>(edm::InputTag("generator"));
genjets_Token_ = consumes<reco::GenJetCollection>(
edm::InputTag("iterativeCone5GenJets"));
edm::InputTag("ak4GenJets"));


nEvt_=0;
Expand Down
2 changes: 1 addition & 1 deletion Validation/RecoEgamma/plugins/TkConvValidator.cc
View file
Open in desktop
Expand Up @@ -148,7 +148,7 @@ TkConvValidator::TkConvValidator( const edm::ParameterSet& pset )
edm::InputTag("tpSelecForFakeRate"));
hepMC_Token_ = consumes<edm::HepMCProduct>(edm::InputTag("generator"));
genjets_Token_ = consumes<reco::GenJetCollection>(
edm::InputTag("iterativeCone5GenJets"));
edm::InputTag("ak4GenJets"));
}


Expand Down