From 404cd26475ed91a14a0ceb6fc8ff715af04619d8 Mon Sep 17 00:00:00 2001 From: Andrea Date: Sun, 30 Jan 2022 19:43:18 +0100 Subject: [PATCH] Synchronize LHEGenericMassFilter with the latest updates merged in 10_6 --- .../GenFilters/plugins/LHEGenericMassFilter.cc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/GeneratorInterface/GenFilters/plugins/LHEGenericMassFilter.cc b/GeneratorInterface/GenFilters/plugins/LHEGenericMassFilter.cc index 52e624f11e24d..ee0d6039a9505 100644 --- a/GeneratorInterface/GenFilters/plugins/LHEGenericMassFilter.cc +++ b/GeneratorInterface/GenFilters/plugins/LHEGenericMassFilter.cc @@ -23,11 +23,10 @@ using namespace std; class LHEGenericMassFilter : public edm::global::EDFilter<> { public: explicit LHEGenericMassFilter(const edm::ParameterSet&); - ~LHEGenericMassFilter() override; + ~LHEGenericMassFilter() override = default; private: bool filter(edm::StreamID, edm::Event&, edm::EventSetup const&) const override; - void endJob() override; // ----------member data --------------------------- @@ -45,11 +44,6 @@ LHEGenericMassFilter::LHEGenericMassFilter(const edm::ParameterSet& iConfig) minMass_(iConfig.getParameter("MinMass")), maxMass_(iConfig.getParameter("MaxMass")) {} -LHEGenericMassFilter::~LHEGenericMassFilter() { - // do anything here that needs to be done at destruction time - // (e.g. close files, deallocate resources etc.) -} - // ------------ method called to skim the data ------------ bool LHEGenericMassFilter::filter(edm::StreamID iID, edm::Event& iEvent, edm::EventSetup const& iSetup) const { edm::Handle EvtHandle; @@ -82,16 +76,13 @@ bool LHEGenericMassFilter::filter(edm::StreamID iID, edm::Event& iEvent, edm::Ev // event accept/reject logic if (nFound == numRequired_) { - double Mass = std::sqrt(E * E - (Px * Px + Py * Py + Pz * Pz)); - if (Mass > minMass_ && Mass < maxMass_) { + double sqrdMass = E * E - (Px * Px + Py * Py + Pz * Pz); + if (sqrdMass > minMass_ * minMass_ && sqrdMass < maxMass_ * maxMass_) { return true; } } return false; } -// ------------ method called once each job just after ending the event loop ------------ -void LHEGenericMassFilter::endJob() {} - //define this as a plug-in DEFINE_FWK_MODULE(LHEGenericMassFilter);