From b027385eb9cf8f4ddd074bc996861a666dd8740c Mon Sep 17 00:00:00 2001 From: Mia Date: Fri, 9 Jun 2017 15:46:31 +0200 Subject: [PATCH 1/3] add possibility of using getPU_NumInteractions --- PhysicsTools/Utilities/plugins/PileUpFilter.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PhysicsTools/Utilities/plugins/PileUpFilter.cc b/PhysicsTools/Utilities/plugins/PileUpFilter.cc index a3664f0531b6d..b348991555601 100644 --- a/PhysicsTools/Utilities/plugins/PileUpFilter.cc +++ b/PhysicsTools/Utilities/plugins/PileUpFilter.cc @@ -33,6 +33,7 @@ class PileUpFilter : public edm::global::EDFilter<> { edm::EDGetTokenT> puSummaryInfoToken_; double minPU_; double maxPU_; + bool trueNumInteraction_; }; // @@ -50,8 +51,9 @@ PileUpFilter::PileUpFilter(const edm::ParameterSet& iConfig) : puSummaryInfoToken_ ( consumes>( iConfig.getParameter("pileupInfoSummaryInputTag") ) ) , minPU_ ( iConfig.getParameter("minPU") ) , maxPU_ ( iConfig.getParameter("maxPU") ) + , trueNumInteraction_ ( iConfig.getUntrackedParameter("trueNumInteraction", true) ) { - //now do what ever initialization is needed + // now do what ever initialization is needed } @@ -73,7 +75,7 @@ PileUpFilter::filter(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& i // only use the in-time pileup if (pileup.getBunchCrossing() == 0) { // use the per-event in-time pileup - double pu = pileup.getTrueNumInteractions(); + double pu = ( trueNumInteraction_ ? pileup.getTrueNumInteractions() : pileup.getPU_NumInteractions() ); if ( pu >= minPU_ and pu < maxPU_ ) pass = true; } } @@ -91,6 +93,7 @@ PileUpFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { desc.add( "pileupInfoSummaryInputTag", edm::InputTag("PileupSummaryInfo") ); desc.add("minPU", 0. ); desc.add("maxPU", 80. ); + desc.addUntracked("trueNumInteraction", true ); descriptions.add("pileupFilter", desc); } From 383fd0f2110323f8bc966d2e46dce62b65a0a2dc Mon Sep 17 00:00:00 2001 From: mia tosi Date: Tue, 5 Mar 2019 16:41:17 +0100 Subject: [PATCH 2/3] trueNumInteraction --> useTrueNumInteraction as suggested, update the name of the boolean variable into useTrueNumInteraction --- PhysicsTools/Utilities/plugins/PileUpFilter.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PhysicsTools/Utilities/plugins/PileUpFilter.cc b/PhysicsTools/Utilities/plugins/PileUpFilter.cc index b348991555601..304b197fb0afe 100644 --- a/PhysicsTools/Utilities/plugins/PileUpFilter.cc +++ b/PhysicsTools/Utilities/plugins/PileUpFilter.cc @@ -33,7 +33,7 @@ class PileUpFilter : public edm::global::EDFilter<> { edm::EDGetTokenT> puSummaryInfoToken_; double minPU_; double maxPU_; - bool trueNumInteraction_; + bool useTrueNumInteraction_; }; // @@ -51,7 +51,7 @@ PileUpFilter::PileUpFilter(const edm::ParameterSet& iConfig) : puSummaryInfoToken_ ( consumes>( iConfig.getParameter("pileupInfoSummaryInputTag") ) ) , minPU_ ( iConfig.getParameter("minPU") ) , maxPU_ ( iConfig.getParameter("maxPU") ) - , trueNumInteraction_ ( iConfig.getUntrackedParameter("trueNumInteraction", true) ) + , useTrueNumInteraction_ ( iConfig.getUntrackedParameter("useTrueNumInteraction", true) ) { // now do what ever initialization is needed @@ -75,7 +75,7 @@ PileUpFilter::filter(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& i // only use the in-time pileup if (pileup.getBunchCrossing() == 0) { // use the per-event in-time pileup - double pu = ( trueNumInteraction_ ? pileup.getTrueNumInteractions() : pileup.getPU_NumInteractions() ); + double pu = ( useTrueNumInteraction_ ? pileup.getTrueNumInteractions() : pileup.getPU_NumInteractions() ); if ( pu >= minPU_ and pu < maxPU_ ) pass = true; } } @@ -93,7 +93,7 @@ PileUpFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { desc.add( "pileupInfoSummaryInputTag", edm::InputTag("PileupSummaryInfo") ); desc.add("minPU", 0. ); desc.add("maxPU", 80. ); - desc.addUntracked("trueNumInteraction", true ); + desc.addUntracked("useTrueNumInteraction", true ); descriptions.add("pileupFilter", desc); } From 04ab095fd614e6dfe8ba4ab0d7e2521c3390d719 Mon Sep 17 00:00:00 2001 From: mia tosi Date: Tue, 5 Mar 2019 18:25:26 +0100 Subject: [PATCH 3/3] apply code style and quality https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-19166/8629/git-diff.patch --- PhysicsTools/Utilities/plugins/PileUpFilter.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PhysicsTools/Utilities/plugins/PileUpFilter.cc b/PhysicsTools/Utilities/plugins/PileUpFilter.cc index 304b197fb0afe..f6ffc7d937347 100644 --- a/PhysicsTools/Utilities/plugins/PileUpFilter.cc +++ b/PhysicsTools/Utilities/plugins/PileUpFilter.cc @@ -21,12 +21,12 @@ class PileUpFilter : public edm::global::EDFilter<> { public: explicit PileUpFilter(const edm::ParameterSet&); - ~PileUpFilter() = default; + ~PileUpFilter() override = default; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - virtual bool filter(edm::StreamID, edm::Event&, const edm::EventSetup&) const override; + bool filter(edm::StreamID, edm::Event&, const edm::EventSetup&) const override; // ----------member data --------------------------- private: