Switching to deltaR2

Author: lathomas

HLTrigger/Egamma/plugins/HLTPMMassFilter.cc

@@ -22,6 +22,8 @@ HLTPMMassFilter::HLTPMMassFilter(const edm::ParameterSet& iConfig) : HLTFilter(i
   upperMassCut_ = iConfig.getParameter<double>("upperMassCut");
   lowerdRCut_ = iConfig.getParameter<double>("lowerdRCut");
   upperdRCut_ = iConfig.getParameter<double>("upperdRCut");
+  lowerdR2Cut_ = lowerdRCut_ * lowerdRCut_;
+  upperdR2Cut_ = upperdRCut_ * upperdRCut_;
   nZcandcut_ = iConfig.getParameter<int>("nZcandcut");
   reqOppCharge_ = iConfig.getUntrackedParameter<bool>("reqOppCharge", false);
   isElectron1_ = iConfig.getUntrackedParameter<bool>("isElectron1", true);
@@ -161,9 +163,9 @@ bool HLTPMMassFilter::isGoodPair(TLorentzVector const& v1, TLorentzVector const&
     return false;
 
   auto const mass = (v1 + v2).M();
-  auto const dr = v1.DeltaR(v2);
+  auto const dr2 = reco::deltaR2(v1.Eta(), v1.Phi(), v2.Eta(), v2.Phi());
 
-  return (mass >= lowerMassCut_ and mass <= upperMassCut_ and dr >= lowerdRCut_ and dr <= upperdRCut_);
+  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"
@@ -54,6 +55,8 @@ class HLTPMMassFilter : public HLTFilter {
   double upperMassCut_;
   double lowerdRCut_;
   double upperdRCut_;
+  double lowerdR2Cut_;
+  double upperdR2Cut_;
   int nZcandcut_;  // number of Z candidates required
   bool reqOppCharge_;