Changed Energy cut to Pt cut for eta-phi distributions of electrons and...

Changed Energy cut to Pt cut for eta-phi distributions of electrons and photons (egammaPerformance-00-03-32)


Former-commit-id: 42d455ba9e2f398aff5cba7d750b2213e3e3eb1f

Reconstruction/egamma/egammaPerformance/egammaPerformance/electronMonTool.h

@@ -50,8 +50,8 @@ class electronHist
   TH1 *m_hEta;              // Histogram for electron eta
   TH1 *m_hPhi;              // Histogram for electron phi
   TH2 *m_hEtaPhi;           // Histogram for electron eta,phi
-  TH2 *m_hEtaPhi4GeV;       // Histogram for electron eta,phi (only candidates with an energy greater than 4 GeV)
-  TH2 *m_hEtaPhi20GeV;      // Histogram for electron eta,phi (only candidates with an energy greater than 20 GeV)
+  TH2 *m_hEtaPhi4GeV;       // Histogram for electron eta,phi (only candidates with a pt greater than 4 GeV)
+  TH2 *m_hEtaPhi20GeV;      // Histogram for electron eta,phi (only candidates with a pt greater than 20 GeV)
   TH1 *m_hTopoEtCone40;     // Histogram for electron isolation energy TopoEtcone40 
   TH1 *m_hPtCone20;         // Histogram for electron isolation energy PtCone20 
   TH1 *m_hTime;             // Histogram for electron cluster time

Reconstruction/egamma/egammaPerformance/src/electronMonTool.cxx

@@ -153,16 +153,16 @@ StatusCode electronMonTool::bookHistogramsForOneElectronType(electronHist& myHis
   hlongname =  std::string("Electron transverse energy [MeV]") + std::string (" (") + myHist.m_nameOfElectronType + std::string (")");
   bookTH1F(myHist.m_hEt, *m_electronGroup, hname, hlongname, 100, -1000.0, 250000.0);
 
-  hname = std::string("electronEtaPhi") + myHist.m_nameOfElectronType;
-  hlongname =  std::string("Electron #eta,#phi map  (candidates with E>2.5GeV)") + std::string (" (") + myHist.m_nameOfElectronType + std::string (")");
+  hname = std::string("electronEtaPhiPtgt2.5GeV") + myHist.m_nameOfElectronType;
+  hlongname =  std::string("Electron #eta,#phi map  (candidates with Pt>2.5GeV)") + std::string (" (") + myHist.m_nameOfElectronType + std::string (")");
   bookTH2F(myHist.m_hEtaPhi, *m_electronGroup, hname, hlongname, 64, -3.2, 3.2, 64, -3.2, 3.2);
 
-  hname = std::string("electronEtaPhiEgt4GeV") + myHist.m_nameOfElectronType;
-  hlongname =  std::string("Electron #eta,#phi map (candidates with E>4GeV)") + std::string (" (") + myHist.m_nameOfElectronType + std::string (")");
+  hname = std::string("electronEtaPhiPtgt4GeV") + myHist.m_nameOfElectronType;
+  hlongname =  std::string("Electron #eta,#phi map (candidates with Pt>4GeV)") + std::string (" (") + myHist.m_nameOfElectronType + std::string (")");
   bookTH2F(myHist.m_hEtaPhi4GeV, *m_electronGroup, hname, hlongname, 64, -3.2, 3.2, 64, -3.2, 3.2);
 
-  hname = std::string("electronEtaPhiEgt20GeV") + myHist.m_nameOfElectronType;
-  hlongname =  std::string("Electron #eta,#phi map (candidates with E>20GeV)") + std::string (" (") + myHist.m_nameOfElectronType + std::string (")");
+  hname = std::string("electronEtaPhiPtgt20GeV") + myHist.m_nameOfElectronType;
+  hlongname =  std::string("Electron #eta,#phi map (candidates with Pt>20GeV)") + std::string (" (") + myHist.m_nameOfElectronType + std::string (")");
   bookTH2F(myHist.m_hEtaPhi20GeV, *m_electronGroup, hname, hlongname, 64, -3.2, 3.2, 64, -3.2, 3.2);
 
   hname = std::string("electronEta") + myHist.m_nameOfElectronType;
@@ -361,7 +361,6 @@ StatusCode electronMonTool::fillHistogramsForOneElectron(xAOD::ElectronContainer
 
     // Basic kinematics
     
-    float energy = (*e_iter)->e();
     float et  = (*e_iter)->pt();
     float eta = (*e_iter)->eta();
     float phi = (*e_iter)->phi();      
@@ -376,8 +375,8 @@ StatusCode electronMonTool::fillHistogramsForOneElectron(xAOD::ElectronContainer
 
     if(myHist.m_hEt)     myHist.m_hEt->Fill(et);
     if(myHist.m_hEtaPhi) myHist.m_hEtaPhi->Fill(eta,phi);
-    if(myHist.m_hEtaPhi4GeV&&energy>4000) myHist.m_hEtaPhi4GeV->Fill(eta,phi);
-    if(myHist.m_hEtaPhi20GeV&&energy>20000) myHist.m_hEtaPhi20GeV->Fill(eta,phi);
+    if(myHist.m_hEtaPhi4GeV&&et>4000) myHist.m_hEtaPhi4GeV->Fill(eta,phi);
+    if(myHist.m_hEtaPhi20GeV&&et>20000) myHist.m_hEtaPhi20GeV->Fill(eta,phi);
     if(myHist.m_hEta)    myHist.m_hEta->Fill(eta);
     if(myHist.m_hPhi)    myHist.m_hPhi->Fill(phi);
 

Reconstruction/egamma/egammaPerformance/src/photonMonTool.cxx

@@ -136,17 +136,17 @@ StatusCode photonMonTool::bookHistogramsForOnePhotonType(photonHist& myHist)
   bookTH1F(myHist.m_hEt, *m_photonGroup, hname, hlongname, 100, -1000.0, 250000.0);
 
   // EtaPhi
-  hname = std::string("photonEtaPhi") + myHist.m_nameOfPhotonType;
+  hname = std::string("photonEtaPhiPt2.5GeV") + myHist.m_nameOfPhotonType;
   hlongname =  std::string("Photon #eta,#phi map") + std::string (" (") + myHist.m_nameOfPhotonType + std::string (")");
   bookTH2F(myHist.m_hEtaPhi, *m_photonGroup, hname, hlongname, 64, -3.2, 3.2, 64, -3.2, 3.2);
 
   // EtaPhi4GeV
-  hname = std::string("photonEtaPhiEgt4GeV") + myHist.m_nameOfPhotonType;
+  hname = std::string("photonEtaPhiPtgt4GeV") + myHist.m_nameOfPhotonType;
   hlongname =  std::string("Photon #eta,#phi map (candidates with E>4 GeV)") + std::string (" (") + myHist.m_nameOfPhotonType + std::string (")");
   bookTH2F(myHist.m_hEtaPhi4GeV, *m_photonGroup, hname, hlongname, 64, -3.2, 3.2, 64, -3.2, 3.2);
 
   // EtaPhi20GeV
-  hname = std::string("photonEtaPhiEgt20GeV") + myHist.m_nameOfPhotonType;
+  hname = std::string("photonEtaPhiPtgt20GeV") + myHist.m_nameOfPhotonType;
   hlongname =  std::string("Photon #eta,#phi map (candidates with E>20 GeV)") + std::string (" (") + myHist.m_nameOfPhotonType + std::string (")");
   bookTH2F(myHist.m_hEtaPhi20GeV, *m_photonGroup, hname, hlongname, 64, -3.2, 3.2, 64, -3.2, 3.2);
 
@@ -412,7 +412,6 @@ StatusCode photonMonTool::fillHistogramsForOnePhoton(xAOD::PhotonContainer::cons
 
   ATH_MSG_DEBUG("photonMonTool::fillHistogramsforOnePhoton()");
 
-  float energy = (*g_iter)->e();
   float et=(*g_iter)->pt();
   float eta = (*g_iter)->eta();
   float phi = (*g_iter)->phi();      
@@ -447,8 +446,8 @@ StatusCode photonMonTool::fillHistogramsForOnePhoton(xAOD::PhotonContainer::cons
 
   if(myHist.m_hEt)     myHist.m_hEt->Fill(et);
   if(myHist.m_hEtaPhi) myHist.m_hEtaPhi->Fill(eta,phi);
-  if(myHist.m_hEtaPhi4GeV&&energy>4000) myHist.m_hEtaPhi4GeV->Fill(eta,phi);  
-  if(myHist.m_hEtaPhi20GeV&&energy>20000) myHist.m_hEtaPhi20GeV->Fill(eta,phi);
+  if(myHist.m_hEtaPhi4GeV&&et>4000) myHist.m_hEtaPhi4GeV->Fill(eta,phi);  
+  if(myHist.m_hEtaPhi20GeV&&et>20000) myHist.m_hEtaPhi20GeV->Fill(eta,phi);
   if(myHist.m_hEta)    myHist.m_hEta->Fill(eta);
   if(myHist.m_hPhi)    myHist.m_hPhi->Fill(phi);