Merge pull request #31355 from intrepid42/fastjet_contrib_update

Revert "Revert "CSJet update for fastjet-contrib 1.044""
cms-sw · Sep 7, 2020 · 2d41a27 · 2d41a27
2 parents f1721c0 + f4aabea
commit 2d41a27
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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 
+	getattr(process,path)._seq = process.generator * getattr(process,path)._seq 
diff --git 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<fastjet::PseudoJet> subtracted_particles = subtractor.do_subtraction(particles, ghosts);