Merge branch 'egammaValidation_dup_headers' into 'master'

ATLASRECTS-5798 : egamma Validation remove duplicate header includes

See merge request atlas/athena!38648

Reconstruction/egamma/egammaValidation/src/ClusterHistograms.h

@@ -7,8 +7,6 @@
 
 #include <utility>
 
-#include <utility>
-
 #include "GaudiKernel/ITHistSvc.h"
 #include "xAODEgamma/Egamma.h"
 #include "xAODEgamma/EgammaxAODHelpers.h"

Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx

@@ -8,7 +8,6 @@
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "Gaudi/Property.h"
-#include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ITHistSvc.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "AsgTools/AnaToolHandle.h"

Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h

@@ -27,7 +27,6 @@
 #include "GaudiKernel/ToolHandle.h"
 #include "Gaudi/Property.h"
 #include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/ITHistSvc.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "AsgTools/AnaToolHandle.h"

Reconstruction/egamma/egammaValidation/src/ParticleHistograms.cxx

@@ -7,7 +7,6 @@
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "Gaudi/Property.h"
-#include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ITHistSvc.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "AsgTools/AnaToolHandle.h"
@@ -18,10 +17,10 @@ namespace egammaMonitoring {
     histoMap["pT"]   = new TH1D(Form("%s_%s",m_name.c_str(),"pT")  , ";p_{T} [GeV]; Track p_{T} Events",  40,            0,         200);
     histoMap["eta"]  = new TH1D(Form("%s_%s",m_name.c_str(),"eta") , ";#eta; Track #eta Events"        ,  40,           -3,           3);
     histoMap["phi"]  = new TH1D(Form("%s_%s",m_name.c_str(),"phi") , ";#phi; Track #phi Events"        ,  20, -TMath::Pi(), TMath::Pi());
-    
+
     histoMap["pT_15GeV"]   = new TH1D(Form("%s_%s",m_name.c_str(),"pT_15GeV")  , ";p_{T} [GeV]; Track p_{T} Events",  40,            0,         200);
     histoMap["eta_15GeV"]  = new TH1D(Form("%s_%s",m_name.c_str(),"eta_15GeV") , ";#eta; Track #eta Events"        ,  40,           -3,           3);
-    histoMap["phi_15GeV"]  = new TH1D(Form("%s_%s",m_name.c_str(),"phi_15GeV") , ";#phi; Track #phi Events"        ,  20, -TMath::Pi(), TMath::Pi());  
+    histoMap["phi_15GeV"]  = new TH1D(Form("%s_%s",m_name.c_str(),"phi_15GeV") , ";#phi; Track #phi Events"        ,  20, -TMath::Pi(), TMath::Pi());
 
     ATH_CHECK(m_rootHistSvc->regHist(m_folder+"pT", histoMap["pT"]));
     ATH_CHECK(m_rootHistSvc->regHist(m_folder+"eta", histoMap["eta"]));
@@ -32,9 +31,9 @@ namespace egammaMonitoring {
     ATH_CHECK(m_rootHistSvc->regHist(m_folder+"phi_15GeV", histoMap["phi_15GeV"]));
     return StatusCode::SUCCESS;
   }
-  
+
   void ParticleHistograms::fill(const xAOD::IParticle& egamma) {
-    
+
     if((egamma.pt())/1000. > 0) histoMap["pT"]->Fill((egamma.pt())/1000.);
     histoMap["eta"]->Fill(egamma.eta());
     histoMap["phi"]->Fill(egamma.phi());
@@ -46,5 +45,5 @@ namespace egammaMonitoring {
     }
 
   }
-  
+
 }

Reconstruction/egamma/egammaValidation/src/ShowerShapesHistograms.h

@@ -6,9 +6,6 @@
 #define EGAMMAVALIDATION_SHOWERSHAPESHISTOGRAMS_H
 
 #include <utility>
-
-#include <utility>
-
 #include "GaudiKernel/ITHistSvc.h"
 #include "xAODEgamma/Egamma.h"
 #include "xAODEgamma/EgammaxAODHelpers.h"

Reconstruction/egamma/egammaValidation/src/WidthPlot.cxx

@@ -6,7 +6,6 @@
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "Gaudi/Property.h"
-#include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ITHistSvc.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "AsgTools/AnaToolHandle.h"

Reconstruction/egamma/egammaValidation/src/widthestimators.h

@@ -6,9 +6,6 @@
  * 
  * Example:
  * 
- *     #include <iostream>
- *     #include "widthestimators.h"
- * 
  *     using widthestimators;
  * 
  *     int main()
@@ -104,4 +101,4 @@ namespace widthestimators
         double s90(const T &histo) { return smallest_interval(histo, 0.90); }
 
     } // namespace binned
-}     // namespace widthestimators
\ No newline at end of file
+}     // namespace widthestimators