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

Fix #28803 (GenParticles2HepMC with exotic LHE) #28856

Merged
merged 2 commits into from Feb 12, 2020
Merged

Fix #28803 (GenParticles2HepMC with exotic LHE) #28856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64bea83
Fix #28803 (GenParticles2HepMC with exotic LHE)
mseidel42 Feb 3, 2020
c1d6266
Updated Rivet MiniAOD test
mseidel42 Feb 3, 2020
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 GeneratorInterface/RivetInterface/plugins/GenParticles2HepMCConverter.cc
View file
Open in desktop
Expand Up @@ -131,7 +131,7 @@ void GenParticles2HepMCConverter::produce(edm::Event& event, const edm::EventSet

HepMC::GenVertex* vertex1 = nullptr;
HepMC::GenVertex* vertex2 = nullptr;
if ( parton1 == nullptr and parton2 == nullptr ) {
if ( parton1 == nullptr || parton2 == nullptr ) {
// Particle gun samples do not have incident partons. Put dummy incident particle and prod vertex
// Note: leave parton1 and parton2 as nullptr since it is not used anymore after creating hepmc_parton1 and 2
const reco::Candidate::LorentzVector nullP4(0,0,0,0);
Expand Down
4 changes: 2 additions & 2 deletions GeneratorInterface/RivetInterface/test/runRivetAnalyzerMiniAOD_cfg.py
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
# Input source
process.source = cms.Source("PoolSource",
fileNames = cms.untracked.vstring(
'/store/relval/CMSSW_9_1_0_pre1/RelValTTbar_13/MINIAODSIM/PU25ns_90X_mcRun2_asymptotic_v5-v1/00000/BE649FEB-C610-E711-AFD5-0CC47A4D769E.root',
'/store/relval/CMSSW_9_4_5_cand1/RelValTTbar_13/MINIAODSIM/94X_mc2017_realistic_v14_PU_RelVal_rmaod-v1/10000/84A84D5B-9E2E-E811-B103-0CC47A7C35F4.root',
),
)

Expand All @@ -22,7 +22,7 @@
process.genParticles2HepMC.genParticles = cms.InputTag("mergedGenParticles")
process.rivetAnalyzer.HepMCCollection = cms.InputTag("genParticles2HepMC:unsmeared")

process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2013_I1224539_DIJET')
process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2016_I1459051')
process.rivetAnalyzer.OutputFile = cms.string('mcfile.yoda')

process.p = cms.Path(process.mergedGenParticles*process.genParticles2HepMC*process.rivetAnalyzer)