---

yaml --- r: 32749 b: "refs/heads/CMSSW_7_1_X" c: 0b15da2 h: "refs/heads/CMSSW_7_1_X" i: 32747: 2e1f1f7 v: v3
cms-sw · Oct 24, 2007 · 1b479e0 · 1b479e0
1 parent 2ff655c
commit 1b479e0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": b717757471af7ac81717d02a19ca2ae586dd5b22
+"refs/heads/CMSSW_7_1_X": 0b15da25dd226496086d2e091e48331725f9fe84
diff --git a/trunk/RecoEgamma/EgammaElectronAlgos/interface/PixelMatchElectronAlgo.h b/trunk/RecoEgamma/EgammaElectronAlgos/interface/PixelMatchElectronAlgo.h
@@ -41,7 +41,7 @@ class PixelMatchElectronAlgo {
                          double maxEOverPBarrel, double maxEOverPEndcaps, 
                          double minEOverPBarrel, double minEOverPEndcaps,
                          double hOverEConeSize, double maxHOverE, 
-                         double maxDeltaEta, double maxDeltaPhi, double ptCut,
+                         double maxDeltaEta, double maxDeltaPhi, double EtCut,
 			 bool highPtPresel, double highPtMin);
 
   ~PixelMatchElectronAlgo();
@@ -109,7 +109,7 @@ class PixelMatchElectronAlgo {
   double maxDeltaPhi_;
 
   // min pT
-  double ptCut_;
+  double EtCut_;
 
   // high pt preselection parameters
   bool highPtPreselection_;

diff --git a/trunk/RecoEgamma/EgammaElectronAlgos/src/PixelMatchElectronAlgo.cc b/trunk/RecoEgamma/EgammaElectronAlgos/src/PixelMatchElectronAlgo.cc
@@ -12,7 +12,7 @@
 //
 // Original Author:  Ursula Berthon, Claude Charlot
 //         Created:  Thu july 6 13:22:06 CEST 2006
-// $Id: PixelMatchElectronAlgo.cc,v 1.54 2007/10/23 11:25:24 uberthon Exp $
+// $Id: PixelMatchElectronAlgo.cc,v 1.55 2007/10/23 12:37:09 uberthon Exp $
 //
 //
 
@@ -84,12 +84,12 @@ PixelMatchElectronAlgo::PixelMatchElectronAlgo(const edm::ParameterSet& conf,
                                                double maxEOverPBarrel, double maxEOverPEndcaps, 
                                                double minEOverPBarrel, double minEOverPEndcaps,
                                                double hOverEConeSize, double maxHOverE, 
-                                               double maxDeltaEta, double maxDeltaPhi, double ptcut,
+                                               double maxDeltaEta, double maxDeltaPhi, double Etcut,
 					       bool highPtPresel, double highPtMin):  
   maxEOverPBarrel_(maxEOverPBarrel), maxEOverPEndcaps_(maxEOverPEndcaps), 
   minEOverPBarrel_(minEOverPBarrel), minEOverPEndcaps_(minEOverPEndcaps), 
   hOverEConeSize_(hOverEConeSize), maxHOverE_(maxHOverE), 
-  maxDeltaEta_(maxDeltaEta), maxDeltaPhi_(maxDeltaPhi), ptCut_(ptcut),
+  maxDeltaEta_(maxDeltaEta), maxDeltaPhi_(maxDeltaPhi), EtCut_(Etcut),
   highPtPreselection_(highPtPresel), highPtMin_(highPtMin)
 {   
  // this is the new version allowing to configurate the algo
@@ -245,16 +245,19 @@ bool PixelMatchElectronAlgo::preSelection(const SuperCluster& clus)
 
   LogDebug("")<< "========== preSelection ==========";
 
+  double rt2 = clus.x()*clus.x() + clus.y()*clus.y();
+  double r2 = rt2 + clus.z()*clus.z();
+  double Et =clus.energy()*sqrt(rt2/r2);
+
   // pt min
   LogDebug("") << "pT : " << vtxMom_.perp();
-  if (vtxMom_.perp() < ptCut_)   return false;
+  if (Et< EtCut_)   return false;
 
   // E/p cut
   LogDebug("") << "E/p : " << clus.energy()/vtxMom_.mag();
-  double rt2 = clus.x()*clus.x() + clus.y()*clus.y();
-  double r2 = rt2 + clus.z()*clus.z();
+
   // no E/p preselection for high pT electrons
-  if (!highPtPreselection_ || clus.energy()*sqrt(rt2/r2) <= highPtMin_) {
+  if (!highPtPreselection_ || Et <= highPtMin_) {
     if ((subdet_==EcalBarrel) && (clus.energy()/vtxMom_.mag() > maxEOverPBarrel_)) return false;
     if ((subdet_==EcalEndcap) && (clus.energy()/vtxMom_.mag() > maxEOverPEndcaps_)) return false;
     if ((subdet_==EcalBarrel) && (clus.energy()/vtxMom_.mag() < minEOverPBarrel_)) return false;