Merge CMSSW_10_6_X into CMSSW_10_6_DEVEL_X.

cms-sw · Mar 6, 2019 · 20c7218 · 20c7218
2 parents 163eff7 + 07aa62e
commit 20c7218
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/PhysicsTools/Utilities/plugins/PileUpFilter.cc b/PhysicsTools/Utilities/plugins/PileUpFilter.cc
@@ -21,18 +21,19 @@
 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:
       edm::EDGetTokenT<std::vector<PileupSummaryInfo>>  puSummaryInfoToken_;
       double minPU_;
       double maxPU_;
+      bool   useTrueNumInteraction_;
 };
 
 //
@@ -50,8 +51,9 @@ PileUpFilter::PileUpFilter(const edm::ParameterSet& iConfig)
   : puSummaryInfoToken_ ( consumes<std::vector<PileupSummaryInfo>>( iConfig.getParameter<edm::InputTag>("pileupInfoSummaryInputTag") ) )
   , minPU_ ( iConfig.getParameter<double>("minPU") )
   , maxPU_ ( iConfig.getParameter<double>("maxPU") )
+  , useTrueNumInteraction_ ( iConfig.getUntrackedParameter<bool>("useTrueNumInteraction", 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 = ( useTrueNumInteraction_ ? pileup.getTrueNumInteractions() : pileup.getPU_NumInteractions() );
 	if ( pu >= minPU_ and pu < maxPU_ ) pass = true;
       }
     }
@@ -91,6 +93,7 @@ PileUpFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   desc.add<edm::InputTag>( "pileupInfoSummaryInputTag", edm::InputTag("PileupSummaryInfo") );
   desc.add<double>("minPU",  0. );
   desc.add<double>("maxPU", 80. );
+  desc.addUntracked<bool>("useTrueNumInteraction", true );
 
   descriptions.add("pileupFilter", desc);
 }