Merge pull request #47833 from lathomas/hltdiegmaxdrfilter

Adding optional deltaR cuts to HLTPMMassFilter

Author: cmsbuild

HLTrigger/Egamma/plugins/HLTPMMassFilter.cc

@@ -20,6 +20,10 @@ HLTPMMassFilter::HLTPMMassFilter(const edm::ParameterSet& iConfig) : HLTFilter(i
 
   lowerMassCut_ = iConfig.getParameter<double>("lowerMassCut");
   upperMassCut_ = iConfig.getParameter<double>("upperMassCut");
+  lowerdRCut_ = iConfig.getParameter<double>("lowerdRCut");
+  upperdRCut_ = iConfig.getParameter<double>("upperdRCut");
+  lowerdR2Cut_ = lowerdRCut_ >= 0 ? lowerdRCut_ * lowerdRCut_ : 0;
+  upperdR2Cut_ = upperdRCut_ >= 0 ? upperdRCut_ * upperdRCut_ : 99999;
   nZcandcut_ = iConfig.getParameter<int>("nZcandcut");
   reqOppCharge_ = iConfig.getUntrackedParameter<bool>("reqOppCharge", false);
   isElectron1_ = iConfig.getUntrackedParameter<bool>("isElectron1", true);
@@ -38,6 +42,8 @@ void HLTPMMassFilter::fillDescriptions(edm::ConfigurationDescriptions& descripti
   desc.add<edm::InputTag>("beamSpot", edm::InputTag("hltOfflineBeamSpot"));
   desc.add<double>("lowerMassCut", 8.0);
   desc.add<double>("upperMassCut", 11.0);
+  desc.add<double>("lowerdRCut", 0.0);
+  desc.add<double>("upperdRCut", 9999.0);
   desc.add<int>("nZcandcut", 1);
   desc.addUntracked<bool>("reqOppCharge", true);
   desc.addUntracked<bool>("isElectron1", false);
@@ -157,7 +163,9 @@ bool HLTPMMassFilter::isGoodPair(TLorentzVector const& v1, TLorentzVector const&
     return false;
 
   auto const mass = (v1 + v2).M();
-  return (mass >= lowerMassCut_ and mass <= upperMassCut_);
+  auto const dr2 = reco::deltaR2(v1.Eta(), v1.Phi(), v2.Eta(), v2.Phi());
+
+  return (mass >= lowerMassCut_ and mass <= upperMassCut_ and dr2 >= lowerdR2Cut_ and dr2 <= upperdR2Cut_);
 }
 
 TLorentzVector HLTPMMassFilter::approxMomAtVtx(const MagneticField& magField,

HLTrigger/Egamma/plugins/HLTPMMassFilter.h

@@ -15,6 +15,7 @@
 #include "DataFormats/EgammaReco/interface/SuperCluster.h"
 #include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
 #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h"
+#include "DataFormats/Math/interface/deltaR.h"
 #include "DataFormats/Math/interface/Point3D.h"
 #include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h"
 #include "DataFormats/RecoCandidate/interface/RecoEcalCandidateFwd.h"
@@ -52,6 +53,10 @@ class HLTPMMassFilter : public HLTFilter {
   edm::EDGetTokenT<reco::BeamSpot> beamSpotToken_;
   double lowerMassCut_;
   double upperMassCut_;
+  double lowerdRCut_;
+  double upperdRCut_;
+  double lowerdR2Cut_;
+  double upperdR2Cut_;
   int nZcandcut_;  // number of Z candidates required
   bool reqOppCharge_;