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

Revert "Revert "CSJet update for fastjet-contrib 1.044"" #31355

Merged
merged 1 commit into from
Sep 7, 2020
Merged

Revert "Revert "CSJet update for fastjet-contrib 1.044"" #31355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions GeneratorInterface/RivetInterface/test/rivet_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
)

process.load("GeneratorInterface.RivetInterface.rivetAnalyzer_cfi")
process.rivetAnalyzer.AnalysisNames = cms.vstring('MC_GENERIC', 'CMS_2013_I1224539_DIJET', 'CMS_2014_I1305624')
process.rivetAnalyzer.AnalysisNames = cms.vstring('MC_GENERIC', 'CMS_2014_I1305624')

# Path and EndPath definitions
process.generation_step = cms.Path(process.pgen*process.rivetAnalyzer)
Expand All @@ -95,4 +95,4 @@
process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.endjob_step,process.RAWSIMoutput_step)
# filter all path with the production filter sequence
for path in process.paths:
getattr(process,path)._seq = process.generator * getattr(process,path)._seq
getattr(process,path)._seq = process.generator * getattr(process,path)._seq
2 changes: 1 addition & 1 deletion RecoJets/JetProducers/plugins/CSJetProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ void CSJetProducer::runAlgorithm(edm::Event& iEvent, edm::EventSetup const& iSet
csRParam_); // free parameter for the maximal allowed distance between particle i and ghost k
subtractor.set_alpha(
csAlpha_); // free parameter for the distance measure (the exponent of particle pt). Note that in older versions of the package alpha was multiplied by two but in newer versions this is not the case anymore
subtractor.set_do_mass_subtraction(true);
subtractor.set_do_mass_subtraction();
subtractor.set_remove_all_zero_pt_particles(true);

std::vector<fastjet::PseudoJet> subtracted_particles = subtractor.do_subtraction(particles, ghosts);
Expand Down