From f4aabea75021aa35b1968ad9f0280d54bd0409a4 Mon Sep 17 00:00:00 2001 From: Markus Seidel Date: Thu, 3 Sep 2020 18:34:49 +0200 Subject: [PATCH] Revert "Revert "CSJet update for fastjet-contrib 1.044"" This reverts commit 37f6e7c44b44589e4461ba0f0671d22802d8a1f4. --- GeneratorInterface/RivetInterface/test/rivet_cfg.py | 4 ++-- RecoJets/JetProducers/plugins/CSJetProducer.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GeneratorInterface/RivetInterface/test/rivet_cfg.py b/GeneratorInterface/RivetInterface/test/rivet_cfg.py index 6ddb997628009..a84a71d85de8a 100644 --- a/GeneratorInterface/RivetInterface/test/rivet_cfg.py +++ b/GeneratorInterface/RivetInterface/test/rivet_cfg.py @@ -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) @@ -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 \ No newline at end of file + getattr(process,path)._seq = process.generator * getattr(process,path)._seq diff --git a/RecoJets/JetProducers/plugins/CSJetProducer.cc b/RecoJets/JetProducers/plugins/CSJetProducer.cc index 352237982385e..f274206c2fdf6 100644 --- a/RecoJets/JetProducers/plugins/CSJetProducer.cc +++ b/RecoJets/JetProducers/plugins/CSJetProducer.cc @@ -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 subtracted_particles = subtractor.do_subtraction(particles, ghosts);