Merge pull request #37931 from swagata87/backport_bctoe

[12_2_X backport] fix in bc->e filter
cms-sw · May 17, 2022 · a4df806 · a4df806
2 parents afc4951 + bb59ada
commit a4df806
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/Configuration/Generator/python/QCD_Pt_30_80_BCtoE_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_30_80_BCtoE_8TeV_TuneCUETP8M1_cfi.py
@@ -32,7 +32,8 @@
                                        )
 
 bctoefilter = cms.EDFilter("BCToEFilter",
-                           filterAlgoPSet = cms.PSet(eTThreshold = cms.double(1),
+                           filterAlgoPSet = cms.PSet(maxAbsEta = cms.double(2.5), 
+                                                     eTThreshold = cms.double(1),
                                                      genParSource = cms.InputTag("genParticlesForFilter")
                                                      )
                            )

diff --git a/Configuration/Generator/python/QCD_Pt_80_170_BCtoE_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_80_170_BCtoE_8TeV_TuneCUETP8M1_cfi.py
@@ -32,7 +32,8 @@
                                        )
 
 bctoefilter = cms.EDFilter("BCToEFilter",
-                           filterAlgoPSet = cms.PSet(eTThreshold = cms.double(1),
+                           filterAlgoPSet = cms.PSet(maxAbsEta = cms.double(2.5),
+                                                     eTThreshold = cms.double(1),
                                                      genParSource = cms.InputTag("genParticlesForFilter")
                                                      )
                            )

diff --git a/GeneratorInterface/GenFilters/plugins/BCToEFilterAlgo.cc b/GeneratorInterface/GenFilters/plugins/BCToEFilterAlgo.cc
@@ -10,7 +10,7 @@
 
 BCToEFilterAlgo::BCToEFilterAlgo(const edm::ParameterSet& iConfig, edm::ConsumesCollector&& iC)
     :  //set constants
-      FILTER_ETA_MAX_(2.5),
+      maxAbsEta_((float)iConfig.getParameter<double>("maxAbsEta")),
       eTThreshold_((float)iConfig.getParameter<double>("eTThreshold")),
       genParSource_(iC.consumes<reco::GenParticleCollection>(iConfig.getParameter<edm::InputTag>("genParSource"))) {}
 
@@ -27,8 +27,7 @@ bool BCToEFilterAlgo::filter(const edm::Event& iEvent) const {
 
   for (uint32_t ig = 0; ig < genPars.size(); ig++) {
     reco::GenParticle gp = genPars.at(ig);
-    if (gp.status() == 1 && std::abs(gp.pdgId()) == 11 && gp.et() > eTThreshold_ &&
-        std::fabs(gp.eta()) < FILTER_ETA_MAX_) {
+    if (gp.status() == 1 && std::abs(gp.pdgId()) == 11 && gp.et() > eTThreshold_ && std::fabs(gp.eta()) < maxAbsEta_) {
       if (hasBCAncestors(gp)) {
         result = true;
       }

diff --git a/GeneratorInterface/GenFilters/plugins/BCToEFilterAlgo.h b/GeneratorInterface/GenFilters/plugins/BCToEFilterAlgo.h
@@ -30,9 +30,8 @@ class BCToEFilterAlgo {
   bool isBCMeson(const reco::GenParticle& gp) const;
   bool isBCBaryon(const reco::GenParticle& gp) const;
 
-  //constants:
-  const float FILTER_ETA_MAX_;
   //filter parameters:
+  const float maxAbsEta_;
   const float eTThreshold_;
   const edm::EDGetTokenT<reco::GenParticleCollection> genParSource_;
 };

diff --git a/GeneratorInterface/GenFilters/python/BCToEFilter_cfi.py b/GeneratorInterface/GenFilters/python/BCToEFilter_cfi.py
@@ -2,6 +2,7 @@
 
 bctoefilter = cms.EDFilter("BCToEFilter",
     filterAlgoPSet = cms.PSet(
+        maxAbsEta = cms.double(3.05),
         eTThreshold = cms.double(10.0)
     )
 )