Changes to simplify filter

Author: Michele Mormile

GeneratorInterface/GenFilters/plugins/PhotonGenFilter.cc

@@ -8,33 +8,14 @@ using namespace std;
 
 PhotonGenFilter::PhotonGenFilter(const edm::ParameterSet &iConfig)
     : token_(consumes<edm::HepMCProduct>(
-          edm::InputTag(iConfig.getUntrackedParameter("moduleLabel", std::string("generator")), "unsmeared"))),
-      betaBoost(iConfig.getUntrackedParameter("BetaBoost", 0.)) {
+          edm::InputTag(iConfig.getUntrackedParameter("moduleLabel", std::string("generator")), "unsmeared"))) {
   // Constructor implementation
-  vector<int> defpid;
-  defpid.push_back(0);
-  particleID = iConfig.getUntrackedParameter<vector<int>>("ParticleID", defpid);
-  vector<double> defptmin;
-  defptmin.push_back(0.);
-  ptMin = iConfig.getUntrackedParameter<vector<double>>("MinPt", defptmin);
+  ptMin = iConfig.getUntrackedParameter<double>("MinPt", 20.);
+  etaMin = iConfig.getUntrackedParameter<double>("MinEta", -2.4);
+  etaMax = iConfig.getUntrackedParameter<double>("MaxEta", 2.4);
+  drMin = iConfig.getUntrackedParameter<double>("drMin", 0.1);
+  ptThreshold = iConfig.getUntrackedParameter<double>("ptThreshold", 2.);
 
-  vector<double> defetamin;
-  defetamin.push_back(-10.);
-  etaMin = iConfig.getUntrackedParameter<vector<double>>("MinEta", defetamin);
-  vector<double> defetamax;
-  defetamax.push_back(10.);
-  etaMax = iConfig.getUntrackedParameter<vector<double>>("MaxEta", defetamax);
-  vector<int> defstat;
-  defstat.push_back(0);
-  status = iConfig.getUntrackedParameter<vector<int>>("Status", defstat);
-  vector<double> defdrmin;
-  defdrmin.push_back(0.);
-  drMin = iConfig.getUntrackedParameter<vector<double>>("drMin", defdrmin);
-
-  // check if beta is smaller than 1
-  if (std::abs(betaBoost) >= 1) {
-    edm::LogError("PhotonGenFilter") << "Input beta boost is >= 1 !";
-  }
 }
 
 PhotonGenFilter::~PhotonGenFilter() {
@@ -49,40 +30,34 @@ bool PhotonGenFilter::filter(edm::StreamID, edm::Event &iEvent, const edm::Event
 
   for (HepMC::GenEvent::particle_const_iterator p = myGenEvent->particles_begin(); p != myGenEvent->particles_end();
        ++p) {
-    for (unsigned int i = 0; i < particleID.size(); i++) {
-      if (particleID[i] == (*p)->pdg_id() || particleID[i] == 0) {
-        if ((*p)->momentum().perp() > ptMin[i] && ((*p)->status() == status[i] || status[i] == 0)) {
-          HepMC::FourVector mom = MCFilterZboostHelper::zboost((*p)->momentum(), betaBoost);
-          if (mom.eta() > etaMin[i] && mom.eta() < etaMax[i]) {
+      if ((*p)->pdg_id() == 22) {
+        if ((*p)->momentum().perp() > ptMin && (*p)->status() == 1 && (*p)->momentum().eta() > etaMin &&
+            (*p)->momentum().eta() < etaMax) {
             bool accepted_photon = true;
             double phi = (*p)->momentum().phi();
-            double eta = mom.eta();
-            for (HepMC::GenEvent::particle_const_iterator q = myGenEvent->particles_begin();
-                 q != myGenEvent->particles_end();
-                 ++q) {
+            double eta = (*p)->momentum().eta();
+            for (HepMC::GenEvent::particle_const_iterator q = myGenEvent->particles_begin(); q != myGenEvent->particles_end(); ++q) {
               if (&p != &q) {
-                if ((*q)->momentum().perp() > 2 && (*q)->pdg_id() != 22 &&
+                if ((*q)->momentum().perp() > ptThreshold && (*q)->pdg_id() != 22 &&
                     (*q)->status() == 1)  // && abs((*q)->charge()) > 0)
                 {
                   double phi2 = (*p)->momentum().phi();
                   double deltaphi = fabs(phi - phi2);
                   if (deltaphi > M_PI)
                     deltaphi = 2. * M_PI - deltaphi;
-                  HepMC::FourVector mom2 = MCFilterZboostHelper::zboost((*q)->momentum(), betaBoost);
-                  double eta2 = mom2.eta();
+                  double eta2 = (*p)->momentum().eta();
                   double deltaeta = fabs(eta - eta2);
                   double deltaR = sqrt(deltaeta * deltaeta + deltaphi * deltaphi);
-                  if (deltaR < 0.1)
+                  if (deltaR < drMin)
                     accepted_photon = false;
                 }
               }
             }
             if (accepted_photon)
               return true;
-          }
         }
       }
-    }
+    
   }
 
   // Implementation for event filtering
@@ -94,9 +69,8 @@ void PhotonGenFilter::fillDescriptions(edm::ConfigurationDescriptions &descripti
   desc.addUntracked<double>("MaxEta", 2.4);
   desc.addUntracked<double>("MinEta", -2.4);
   desc.addUntracked<double>("MinPt", 20.);
-  desc.addUntracked<int>("Status", 1);
-  desc.addUntracked<int>("ParticleID", 22);
   desc.addUntracked<double>("drMin", 0.1);
+  desc.addUntracked<double>("ptThreshold", 2.);
 
   descriptions.add("PhotonGenFilter", desc);
 }

GeneratorInterface/GenFilters/plugins/PhotonGenFilter.h

@@ -28,13 +28,11 @@ class PhotonGenFilter : public edm::global::EDFilter<> {
   // Private member variables and functions
 
   const edm::EDGetTokenT<edm::HepMCProduct> token_;
-  std::vector<int> particleID;
-  std::vector<double> ptMin;
-  std::vector<double> etaMin;
-  std::vector<double> etaMax;
-  std::vector<double> drMin;
-  std::vector<int> status;
-  const double betaBoost;
-};
+  double ptMin;
+  double etaMin;
+  double etaMax;
+  double drMin;
+  double ptThreshold;
+  };
 
 #endif

GeneratorInterface/GenFilters/python/PhotonGenFilter_cfi.py

@@ -1,10 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
 photonGenFilter = cms.EDFilter('PhotonGenFilter',
-                      MaxEta = cms.untracked.vdouble(2.4),    
-                      MinEta = cms.untracked.vdouble(-2.4),
-                      MinPt = cms.untracked.vdouble(20),    
-                      Status = cms.untracked.vint32(1),    
-                      ParticleID = cms.untracked.vint32(22),
-                      drMin = cms.untracked.vdouble(0.1)
+                      MaxEta = cms.untracked.double(2.4),    
+                      MinEta = cms.untracked.double(-2.4),
+                      MinPt = cms.untracked.double(20.),    
+                      drMin = cms.untracked.double(0.1),
+                      ptThreshold = cms.untracked.double(2.)
                   )