diff --git a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IIsolationCorrectionTool.h b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IIsolationCorrectionTool.h
index efab29e9bb76c7068bd4e48835058a26f855a2b9..60cfe58077014a272cc6da616b57e67a90d14055 100644
--- a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IIsolationCorrectionTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IIsolationCorrectionTool.h
@@ -46,7 +46,7 @@ namespace CP {
         virtual CP::SystematicCode applySystematicVariation ( const CP::SystematicSet& systConfig ) = 0;
 
         virtual float GetPtCorrectedIsolation(const xAOD::Egamma&, xAOD::Iso::IsolationType) = 0;
-        virtual float GetPtCorrection(const xAOD::Egamma&, xAOD::Iso::IsolationType) = 0;
+        virtual float GetPtCorrection(const xAOD::Egamma&, xAOD::Iso::IsolationType) const = 0;
 	virtual float GetDDCorrection(const xAOD::Egamma&, xAOD::Iso::IsolationType) = 0;
 
   };
diff --git a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrection.h b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrection.h
index 244d4d57ea589796f636682ddbe4ffd2ad105627..015e3ed4e7c4ddc38e903dd8ebfed665afa6eab7 100644
--- a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrection.h
+++ b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrection.h
@@ -38,9 +38,9 @@ class IsolationCorrection : public asg::AsgMessaging{
     void SetToolVer(CP::IsolationCorrection::Version);
 
     float GetPtCorrectedIsolation(const xAOD::Egamma&, const xAOD::Iso::IsolationType);
-    float GetPtCorrection(const xAOD::Egamma&, const xAOD::Iso::IsolationType);
-    float GetDDCorrection(const xAOD::Egamma&);
-    float GetDDCorrection_2015(const xAOD::Egamma&, const xAOD::Iso::IsolationType);
+    float GetPtCorrection(const xAOD::Egamma&, const xAOD::Iso::IsolationType) const;
+    float GetDDCorrection(const xAOD::Egamma&) const;
+    float GetDDCorrection_2015(const xAOD::Egamma&, const xAOD::Iso::IsolationType) const;
 
     float GetEtaPointing(const xAOD::Egamma*);
 
@@ -81,6 +81,10 @@ class IsolationCorrection : public asg::AsgMessaging{
 
     CP::ShowerDepthTool* m_shower;
 
+    // booleans for helping with versions
+    bool m_isv2;
+    bool m_isv3;
+
     template <class T> void FreeClear( T & cntr );
 
     // ------------------------------------------------------------
@@ -153,74 +157,74 @@ class IsolationCorrection : public asg::AsgMessaging{
 
     float GetPtCorrection (float energy, float etaS2, float etaPointing, float etaCluster,
                            float radius, bool is_mc=true,
-                           bool isConversion=false, ParticleType parttype = ELECTRON);
+                           bool isConversion=false, ParticleType parttype = ELECTRON) const;
 
     float GetPtCorrectionTopo (float energy, float etaS2, float etaPointing, float etaCluster,
                                float radius, bool is_mc=true,
                                bool isConversion=false, ParticleType parttype = ELECTRON, Version ver = REL17_2,
-			       int convFlag_int=0, int author=0, float conv_radius=0., float conv_ratio=0.);
-    int GetRadius(float radius);
-    int GetEtaBinFine(float eta);
-    int GetEtaBinCoarse(float eta);
-    int GetEtaBinDD(float eta);
+			       int convFlag_int=0, int author=0, float conv_radius=0., float conv_ratio=0.) const;
+    int GetRadius(float radius) const;
+    int GetEtaBinFine(float eta) const;
+    int GetEtaBinCoarse(float eta) const;
+    int GetEtaBinDD(float eta) const;
 
     float GetPtCorrectionFactor(float eta, std::vector<float> mc_leakage_corrections_ptr =std::vector<float>(),
-				                        std::vector<float> data_leakage_corrections_ptr= std::vector<float>());
-    float GetPtCorrectionValue(float energy, float etaPointing, float etaCluster, float scale_factor);
-    float GetPtCorrection_FromGraph(float energy,float etaS2,float etaPointing,float etaCluster,float radius,bool isConversion,ParticleType parttype);
-    float GetPtCorrection_FromGraph_2015(float energy, float etaS2, float radius, int conversion_flag, int author, float conv_radius, float conv_ratio, ParticleType parttype);
+				                        std::vector<float> data_leakage_corrections_ptr= std::vector<float>()) const;
+    float GetPtCorrectionValue(float energy, float etaPointing, float etaCluster, float scale_factor) const;
+    float GetPtCorrection_FromGraph(float energy,float etaS2,float etaPointing,float etaCluster,float radius,bool isConversion,ParticleType parttype) const;
+    float GetPtCorrection_FromGraph_2015(float energy, float etaS2, float radius, int conversion_flag, int author, float conv_radius, float conv_ratio, ParticleType parttype) const;
 
     // -------------------------------------------------------------------------------------------
     // ------------- data-driven corrections based on 2015 data ----------------------------------
     // corrections recomputed for topological isolation, 0.4/0.2 cone. special eta binning -------
     // ------------------------- -----------------------------------------------------------------
 
-    std::vector<TGraph*> graph_dd_2015_cone40_unconv_photon_shift;
-    std::vector<TGraph*> graph_dd_2015_cone40_conv_photon_shift;
-    std::vector<TGraph*> graph_dd_2015_cone20_unconv_photon_shift;
-    std::vector<TGraph*> graph_dd_2015_cone20_conv_photon_shift;
+    std::vector<TGraph*> m_graph_dd_2015_cone40_unconv_photon_shift;
+    std::vector<TGraph*> m_graph_dd_2015_cone40_conv_photon_shift;
+    std::vector<TGraph*> m_graph_dd_2015_cone20_unconv_photon_shift;
+    std::vector<TGraph*> m_graph_dd_2015_cone20_conv_photon_shift;
 
     // -------------------------------------------------------------------------------------------
     // ------------- data-driven corrections based on 2012 inclusive photon sample ---------------
     // corrections recomputed for topological isolation, 0.4 cone. special eta binning -----------
     // ------------------------- https://cds.cern.ch/record/2008664 ------------------------------
 
-    std::vector<TF1*> graph_dd_cone40_photon_shift;
-    std::vector<TF1*> graph_dd_cone40_photon_smearing;
+    std::vector<TF1*> m_graph_dd_cone40_photon_shift;
+    std::vector<TF1*> m_graph_dd_cone40_photon_smearing;
 
     // -------------------------------------------------------------------------------------------
     // ------------- full 2015 (rel 20_2) leakage corrections --------------------------------------
     // corrections recomputed for topological isolation: fine grained in eta, derived from MC15
 
     //---- Rel 20_2 pT leakage correction file : all categories
-    std::vector<TF1*> function_2015_cone40_photon_unconverted;
-    std::vector<TF1*> function_2015_cone30_photon_unconverted;
-    std::vector<TF1*> function_2015_cone20_photon_unconverted;
+    std::vector<TF1*> m_function_2015_cone40_photon_unconverted;
+    std::vector<TF1*> m_function_2015_cone30_photon_unconverted;
+    std::vector<TF1*> m_function_2015_cone20_photon_unconverted;
 
-    std::vector<TF1*> function_2015_cone40_photon_converted_ok;
-    std::vector<TF1*> function_2015_cone30_photon_converted_ok;
-    std::vector<TF1*> function_2015_cone20_photon_converted_ok;
+    std::vector<TF1*> m_function_2015_cone40_photon_converted_ok;
+    std::vector<TF1*> m_function_2015_cone30_photon_converted_ok;
+    std::vector<TF1*> m_function_2015_cone20_photon_converted_ok;
 
-    std::vector<TF1*> function_2015_cone40_photon_converted_trouble;
-    std::vector<TF1*> function_2015_cone30_photon_converted_trouble;
-    std::vector<TF1*> function_2015_cone20_photon_converted_trouble;
+    std::vector<TF1*> m_function_2015_cone40_photon_converted_trouble;
+    std::vector<TF1*> m_function_2015_cone30_photon_converted_trouble;
+    std::vector<TF1*> m_function_2015_cone20_photon_converted_trouble;
 
-    std::vector<TF1*> function_2015_cone40_author_1_electron;
-    std::vector<TF1*> function_2015_cone30_author_1_electron;
-    std::vector<TF1*> function_2015_cone20_author_1_electron;
+    std::vector<TF1*> m_function_2015_cone40_author_1_electron;
+    std::vector<TF1*> m_function_2015_cone30_author_1_electron;
+    std::vector<TF1*> m_function_2015_cone20_author_1_electron;
 
-    std::vector<TF1*> function_2015_cone40_author_16_electron;
-    std::vector<TF1*> function_2015_cone30_author_16_electron;
-    std::vector<TF1*> function_2015_cone20_author_16_electron;
+    std::vector<TF1*> m_function_2015_cone40_author_16_electron;
+    std::vector<TF1*> m_function_2015_cone30_author_16_electron;
+    std::vector<TF1*> m_function_2015_cone20_author_16_electron;
 
     //---- Rel 20_2 pT leakage correction with histogram mean file : for "trouble categories", below pT threshold
-    std::vector<TGraph*> graph_histoMean_2015_cone40_photon_converted_trouble;
-    std::vector<TGraph*> graph_histoMean_2015_cone30_photon_converted_trouble;
-    std::vector<TGraph*> graph_histoMean_2015_cone20_photon_converted_trouble;
+    std::vector<TGraph*> m_graph_histoMean_2015_cone40_photon_converted_trouble;
+    std::vector<TGraph*> m_graph_histoMean_2015_cone30_photon_converted_trouble;
+    std::vector<TGraph*> m_graph_histoMean_2015_cone20_photon_converted_trouble;
 
-    std::vector<TGraph*> graph_histoMean_2015_cone40_author_16_electron;
-    std::vector<TGraph*> graph_histoMean_2015_cone30_author_16_electron;
-    std::vector<TGraph*> graph_histoMean_2015_cone20_author_16_electron;
+    std::vector<TGraph*> m_graph_histoMean_2015_cone40_author_16_electron;
+    std::vector<TGraph*> m_graph_histoMean_2015_cone30_author_16_electron;
+    std::vector<TGraph*> m_graph_histoMean_2015_cone20_author_16_electron;
 
 
     // -------------------------------------------------------------------------------------------
@@ -228,65 +232,65 @@ class IsolationCorrection : public asg::AsgMessaging{
     // corrections recomputed for topological isolation: fine grained in eta, derived from MC12
 
     //---- Rel 17.2 pT leakage correction file
-    std::vector<TGraph*> graph_cone40_photon_unconverted;
-    std::vector<TGraph*> graph_cone30_photon_unconverted;
-    std::vector<TGraph*> graph_cone20_photon_unconverted;
+    std::vector<TGraph*> m_graph_cone40_photon_unconverted;
+    std::vector<TGraph*> m_graph_cone30_photon_unconverted;
+    std::vector<TGraph*> m_graph_cone20_photon_unconverted;
 
-    std::vector<TGraph*> graph_cone40_photon_converted;
-    std::vector<TGraph*> graph_cone30_photon_converted;
-    std::vector<TGraph*> graph_cone20_photon_converted;
+    std::vector<TGraph*> m_graph_cone40_photon_converted;
+    std::vector<TGraph*> m_graph_cone30_photon_converted;
+    std::vector<TGraph*> m_graph_cone20_photon_converted;
 
-    std::vector<TGraph*> graph_cone40_electron;
-    std::vector<TGraph*> graph_cone30_electron;
-    std::vector<TGraph*> graph_cone20_electron;
+    std::vector<TGraph*> m_graph_cone40_electron;
+    std::vector<TGraph*> m_graph_cone30_electron;
+    std::vector<TGraph*> m_graph_cone20_electron;
 
     // ---------------------------------------------------------------------------
 
     // ---------------------------------------------------------------------------
     // ------------- full 2011 (rel 17) etcone leakage corrections ---------------
     // 
-    std::vector<float> mc_rel17_leakage_correction_slopes_electron_15;
-    std::vector<float> mc_rel17_leakage_correction_slopes_electron_20;
-    std::vector<float> mc_rel17_leakage_correction_slopes_electron_25;
-    std::vector<float> mc_rel17_leakage_correction_slopes_electron_30;
-    std::vector<float> mc_rel17_leakage_correction_slopes_electron_35;
-    std::vector<float> mc_rel17_leakage_correction_slopes_electron_40;
-
-    std::vector<float> mc_rel17_leakage_correction_offsets_electron_15;
-    std::vector<float> mc_rel17_leakage_correction_offsets_electron_20;
-    std::vector<float> mc_rel17_leakage_correction_offsets_electron_25;
-    std::vector<float> mc_rel17_leakage_correction_offsets_electron_30;
-    std::vector<float> mc_rel17_leakage_correction_offsets_electron_35;
-    std::vector<float> mc_rel17_leakage_correction_offsets_electron_40;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_electron_15;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_electron_20;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_electron_25;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_electron_30;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_electron_35;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_electron_40;
+
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_electron_15;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_electron_20;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_electron_25;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_electron_30;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_electron_35;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_electron_40;
 
     // photons: last eta bin isn't used
-    std::vector<float> mc_rel17_leakage_correction_slopes_photon_converted_15;
-    std::vector<float> mc_rel17_leakage_correction_slopes_photon_converted_20;
-    std::vector<float> mc_rel17_leakage_correction_slopes_photon_converted_25;
-    std::vector<float> mc_rel17_leakage_correction_slopes_photon_converted_30;
-    std::vector<float> mc_rel17_leakage_correction_slopes_photon_converted_35;
-    std::vector<float> mc_rel17_leakage_correction_slopes_photon_converted_40;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_photon_converted_15;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_photon_converted_20;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_photon_converted_25;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_photon_converted_30;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_photon_converted_35;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_photon_converted_40;
  
-    std::vector<float> mc_rel17_leakage_correction_offsets_photon_converted_15;
-    std::vector<float> mc_rel17_leakage_correction_offsets_photon_converted_20;
-    std::vector<float> mc_rel17_leakage_correction_offsets_photon_converted_25;
-    std::vector<float> mc_rel17_leakage_correction_offsets_photon_converted_30;
-    std::vector<float> mc_rel17_leakage_correction_offsets_photon_converted_35;
-    std::vector<float> mc_rel17_leakage_correction_offsets_photon_converted_40;
-
-    std::vector<float> mc_rel17_leakage_correction_slopes_photon_unconverted_15;
-    std::vector<float> mc_rel17_leakage_correction_slopes_photon_unconverted_20;
-    std::vector<float> mc_rel17_leakage_correction_slopes_photon_unconverted_25;
-    std::vector<float> mc_rel17_leakage_correction_slopes_photon_unconverted_30;
-    std::vector<float> mc_rel17_leakage_correction_slopes_photon_unconverted_35;
-    std::vector<float> mc_rel17_leakage_correction_slopes_photon_unconverted_40;
-
-    std::vector<float> mc_rel17_leakage_correction_offsets_photon_unconverted_15;
-    std::vector<float> mc_rel17_leakage_correction_offsets_photon_unconverted_20;
-    std::vector<float> mc_rel17_leakage_correction_offsets_photon_unconverted_25;
-    std::vector<float> mc_rel17_leakage_correction_offsets_photon_unconverted_30;
-    std::vector<float> mc_rel17_leakage_correction_offsets_photon_unconverted_35;
-    std::vector<float> mc_rel17_leakage_correction_offsets_photon_unconverted_40;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_photon_converted_15;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_photon_converted_20;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_photon_converted_25;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_photon_converted_30;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_photon_converted_35;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_photon_converted_40;
+
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_photon_unconverted_15;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_photon_unconverted_20;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_photon_unconverted_25;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_photon_unconverted_30;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_photon_unconverted_35;
+    std::vector<float> m_mc_rel17_leakage_correction_slopes_photon_unconverted_40;
+
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_photon_unconverted_15;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_photon_unconverted_20;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_photon_unconverted_25;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_photon_unconverted_30;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_photon_unconverted_35;
+    std::vector<float> m_mc_rel17_leakage_correction_offsets_photon_unconverted_40;
 
 };
 
diff --git a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrectionTool.h b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrectionTool.h
index 366ce102ab0b4a6619b1e6fb855ce8644c0ee1dc..eb0809ebf2c9d05677f5c2f8243fc44591ff8f7b 100644
--- a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrectionTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrectionTool.h
@@ -19,35 +19,35 @@ class IsolationCorrectionTool  : virtual public IIsolationCorrectionTool,
 
       public:
 	IsolationCorrectionTool( const std::string& name );
-        ~IsolationCorrectionTool();
+        virtual ~IsolationCorrectionTool();
 
-        StatusCode initialize();
-        StatusCode finalize();
+        virtual StatusCode initialize() override;
+        virtual StatusCode finalize() override;
 
         // Apply correction to a modifyable Egamma object
-        virtual CP::CorrectionCode applyCorrection(xAOD::Egamma&);
+        virtual CP::CorrectionCode applyCorrection(xAOD::Egamma&) override;
 
       	// This helps to correct for the (wrong) leakage at the analysis level
-      	virtual CP::CorrectionCode CorrectLeakage(xAOD::Egamma&);
+      	virtual CP::CorrectionCode CorrectLeakage(xAOD::Egamma&) override;
 
         // Create a corrected copy from a const Egamma object
-        virtual CP::CorrectionCode correctedCopy( const xAOD::Egamma&, xAOD::Egamma*&);
+        virtual CP::CorrectionCode correctedCopy( const xAOD::Egamma&, xAOD::Egamma*&) override;
 
         //systematics
         // Which systematics have an effect on the tool's behaviour?
-        virtual CP::SystematicSet affectingSystematics() const;
+        virtual CP::SystematicSet affectingSystematics() const override;
         // Is the tool affected by a specific systematic?
-        virtual bool isAffectedBySystematic( const CP::SystematicVariation& systematic ) const;
+        virtual bool isAffectedBySystematic( const CP::SystematicVariation& systematic ) const override;
         //Systematics to be used for physics analysis
-        virtual CP::SystematicSet recommendedSystematics() const;
+        virtual CP::SystematicSet recommendedSystematics() const override;
         //Use specific systematic
-        virtual CP::SystematicCode applySystematicVariation ( const CP::SystematicSet& systConfig );
+        virtual CP::SystematicCode applySystematicVariation ( const CP::SystematicSet& systConfig ) override;
 
         float GetEtaPointing(const xAOD::Egamma* input) {return m_isol_corr->GetEtaPointing(input);};
 
-        float GetPtCorrectedIsolation(const xAOD::Egamma&, xAOD::Iso::IsolationType);
-	float GetPtCorrection(const xAOD::Egamma&, xAOD::Iso::IsolationType);
-        float GetDDCorrection(const xAOD::Egamma&, xAOD::Iso::IsolationType);
+        virtual float GetPtCorrectedIsolation(const xAOD::Egamma&, xAOD::Iso::IsolationType) override;
+	virtual float GetPtCorrection(const xAOD::Egamma&, xAOD::Iso::IsolationType) const override;
+        virtual float GetDDCorrection(const xAOD::Egamma&, xAOD::Iso::IsolationType) override;
 
     private:
 
diff --git a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/Root/IsolationCorrection.cxx b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/Root/IsolationCorrection.cxx
index a5b26d1bd9215234545c058b6c3ea8aaa525f0b0..03706ca6cea4d00f788f84d8e647bd2d94deda3b 100644
--- a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/Root/IsolationCorrection.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/Root/IsolationCorrection.cxx
@@ -34,13 +34,16 @@ namespace CP {
       m_corr_ddshift_2015_file(""),
       m_corr_ddshift_file(""),
       m_corr_ddsmearing_file(""),
+      m_nBinsfEtaDD_2015(5),
       m_is_mc(false),
       m_AFII_corr(false),
       m_set_mc(false),
       m_apply_dd(true),
       m_correct_etcone(false),
       m_trouble_categories(false),
-      m_shower(nullptr)
+      m_shower(nullptr),
+      m_isv2(false),
+      m_isv3(false)
   {
   }
 
@@ -50,6 +53,8 @@ namespace CP {
     m_corr_ddshift_2015_file = PathResolverFindCalibFile(corr_ddshift_2015_file);
     m_corr_ddshift_file = PathResolverFindCalibFile(corr_ddshift_file);
     m_corr_ddsmearing_file = PathResolverFindCalibFile(corr_ddsmearing_file);
+    if (m_corr_ddshift_2015_file.find("v2") != std::string::npos) m_isv2 = true;
+    if (m_corr_ddshift_2015_file.find("v3") != std::string::npos) m_isv3 = true;
   }
 
   StatusCode IsolationCorrection::initialize() {
@@ -82,7 +87,7 @@ namespace CP {
   }
 
 
-  float IsolationCorrection::GetPtCorrection(const xAOD::Egamma& input, const xAOD::Iso::IsolationType isol){
+  float IsolationCorrection::GetPtCorrection(const xAOD::Egamma& input, const xAOD::Iso::IsolationType isol) const {
     /*
       - nPV: number of primary vertices (corrections were derived requiring >= 2 tracks/vertex in 2011 data)
 
@@ -219,11 +224,12 @@ namespace CP {
   }
 
 
-  float IsolationCorrection::GetDDCorrection_2015(const xAOD::Egamma& input, const xAOD::Iso::IsolationType isol ){
+  float IsolationCorrection::GetDDCorrection_2015(const xAOD::Egamma& input, const xAOD::Iso::IsolationType isol ) const {
     if( m_corr_ddshift_2015_file == ""){
       ATH_MSG_WARNING("IsolationCorrection::GetDDCorrection 2015: the file(s) containing the data-driven isolation corrections is(are) not initialized.\nNo correction is applied.\n");
       return 0;
     }
+
     // corrections only for MC and photon
     if(!m_is_mc || input.type() == xAOD::Type::Electron) return 0;
 
@@ -236,22 +242,22 @@ namespace CP {
     float etaS2  = input.eta();
     int eta_bin  = 0;
 
-    if (m_corr_ddshift_2015_file.find("v2") != std::string::npos) {
+    if (m_isv2) {
       for(unsigned int i = 0; i < m_eta_bins_dd_2015.size(); i+=2){
-	if(etaS2 > m_eta_bins_dd_2015[i] && etaS2 < m_eta_bins_dd_2015[i+1]) eta_bin = i/2;
+        if(etaS2 > m_eta_bins_dd_2015[i] && etaS2 < m_eta_bins_dd_2015[i+1]) eta_bin = i/2;
       }
     } else {
       double feta = fabs(etaS2);
       for (unsigned int i = 0; i < m_nBinsfEtaDD_2015; i++) {
-	if (feta >= m_feta_bins_dd_2015[i] && feta < m_feta_bins_dd_2015[i+1])
-	  eta_bin = i;
+        if (feta >= m_feta_bins_dd_2015[i] && feta < m_feta_bins_dd_2015[i+1])
+          eta_bin = i;
       }
       if (eta_bin == 2) {
-	//ATH_MSG_WARNING("Photon in the crack ! No DD correction");
-	eta_bin = -1;
-	return 0;
+        //ATH_MSG_WARNING("Photon in the crack ! No DD correction");
+        eta_bin = -1;
+        return 0;
       } else if (eta_bin > 2)
-	eta_bin -= 1;
+      eta_bin -= 1;
     }
     if (eta_bin < 0) {
       ATH_MSG_WARNING("Strange cluster S2 eta for photon isolation DD correction ! eta = " << etaS2 << ". No correction");
@@ -264,28 +270,28 @@ namespace CP {
 		  
     float pt_gev = input.pt()*0.001;
 
-    if (m_corr_ddshift_2015_file.find("v2") != std::string::npos && pt_gev > 400.)
+    if (m_isv2 && pt_gev > 400.)
       pt_gev = 400.;
-    else if (m_corr_ddshift_2015_file.find("v3") != std::string::npos && pt_gev > 750.)
+    else if (m_isv3 && pt_gev > 750.)
       pt_gev = 750.;
       
     float isolation_ddcorrection = 0;
     if(isol==xAOD::Iso::topoetcone40){
       if(!converted)
-	isolation_ddcorrection = 1e3*graph_dd_2015_cone40_unconv_photon_shift[eta_bin]->Eval(pt_gev);
+        isolation_ddcorrection = 1e3*m_graph_dd_2015_cone40_unconv_photon_shift[eta_bin]->Eval(pt_gev);
       else
-	isolation_ddcorrection = 1e3*graph_dd_2015_cone40_conv_photon_shift[eta_bin]->Eval(pt_gev);
+        isolation_ddcorrection = 1e3*m_graph_dd_2015_cone40_conv_photon_shift[eta_bin]->Eval(pt_gev);
     }else if(isol==xAOD::Iso::topoetcone20){
       if(!converted)
-        isolation_ddcorrection = 1e3*graph_dd_2015_cone20_unconv_photon_shift[eta_bin]->Eval(pt_gev);
+        isolation_ddcorrection = 1e3*m_graph_dd_2015_cone20_unconv_photon_shift[eta_bin]->Eval(pt_gev);
       else
-        isolation_ddcorrection = 1e3*graph_dd_2015_cone20_conv_photon_shift[eta_bin]->Eval(pt_gev);
+        isolation_ddcorrection = 1e3*m_graph_dd_2015_cone20_conv_photon_shift[eta_bin]->Eval(pt_gev);
     }else isolation_ddcorrection = 0;
 
     return isolation_ddcorrection;
   }
 
-  float IsolationCorrection::GetDDCorrection(const xAOD::Egamma& input){
+  float IsolationCorrection::GetDDCorrection(const xAOD::Egamma& input) const {
     /*
       - nPV: number of primary vertices (corrections were derived requiring >= 2 tracks/vertex in 2011 data)
 
@@ -329,13 +335,13 @@ namespace CP {
     if(eta_bin_dd == -1 || eta_bin_dd>=14 ) return 0;
 
     // barrel + crack => no smearing corrections
-    if(fabs(etaS2) <= 1.56) isolation_ddcorrection = graph_dd_cone40_photon_shift.at(eta_bin_dd)->Eval(energy/GeV)*GeV;
+    if(fabs(etaS2) <= 1.56) isolation_ddcorrection = m_graph_dd_cone40_photon_shift.at(eta_bin_dd)->Eval(energy/GeV)*GeV;
     // end caps => shift + smearing corrections
     else
     {
       TRandom3 r(0); // seed guaranteed to be unique in space and time
-      isolation_ddcorrection = GeV*r.Gaus(graph_dd_cone40_photon_shift.at(eta_bin_dd)->Eval(energy/GeV),
-                                          graph_dd_cone40_photon_smearing.at(eta_bin_dd)->Eval(energy/GeV));
+      isolation_ddcorrection = GeV*r.Gaus(m_graph_dd_cone40_photon_shift.at(eta_bin_dd)->Eval(energy/GeV),
+                                          m_graph_dd_cone40_photon_smearing.at(eta_bin_dd)->Eval(energy/GeV));
 
     }
 
@@ -412,48 +418,48 @@ namespace CP {
     // -------------------------------------------------------------------------------------------
     // ------------- full 2011 (rel 17) leakage corrections --------------------------------------
     // CURRENT isolation corrections: fine grained in eta, derived from MC11
-    mc_rel17_leakage_correction_slopes_electron_15 = { 0.01466, 0.01421, 0.01427, 0.01872, 0.02008, 0.02181, 0.02141, 0.02636, 0.03285, 0.03564 };
-    mc_rel17_leakage_correction_slopes_electron_20 = { 0.01616, 0.01572, 0.01596, 0.02139, 0.02339, 0.03350, 0.02499, 0.03038, 0.03870, 0.04337 };
-    mc_rel17_leakage_correction_slopes_electron_25 = { 0.01663, 0.01616, 0.01667, 0.02223, 0.02445, 0.03852, 0.02611, 0.03174, 0.04093, 0.04692 };
-    mc_rel17_leakage_correction_slopes_electron_30 = { 0.01689, 0.01635, 0.01684, 0.02256, 0.02485, 0.04223, 0.02660, 0.03232, 0.04182, 0.04846 };
-    mc_rel17_leakage_correction_slopes_electron_35 = { 0.01695, 0.01642, 0.01693, 0.02268, 0.02501, 0.04403, 0.02685, 0.03254, 0.04223, 0.04928 };
-    mc_rel17_leakage_correction_slopes_electron_40 = { 0.01701, 0.01646, 0.01702, 0.02272, 0.02517, 0.04550, 0.02698, 0.03267, 0.04242, 0.04964 };
-
-    mc_rel17_leakage_correction_offsets_electron_15 = { 21.71, 36.00, 132.56, 191.64, 263.46, 619.58, 288.75, 121.92, 102.35, 175.02 };
-    mc_rel17_leakage_correction_offsets_electron_20 = { 76.67, 85.35, 184.90, 276.72, 384.97, 595.60, 657.99, 231.88, 170.48, 312.30 };
-    mc_rel17_leakage_correction_offsets_electron_25 = { 90.44, 105.02, 267.95, 420.38, 555.09, 1014.50, 765.83, 283.50, 224.18, 357.30 };
-    mc_rel17_leakage_correction_offsets_electron_30 = { 119.55, 127.09, 279.48, 430.96, 571.81, 846.86, 968.01, 354.46, 263.11, 455.21 };
-    mc_rel17_leakage_correction_offsets_electron_35 = { 138.79, 161.87, 371.47, 572.08, 754.17, 1249.38, 1000.44, 389.22, 295.72, 464.28 };
-    mc_rel17_leakage_correction_offsets_electron_40 = { 180.08, 187.89, 363.31, 553.46, 707.60, 1006.20, 1105.73, 434.21, 312.78, 535.90 };
+    m_mc_rel17_leakage_correction_slopes_electron_15 = { 0.01466, 0.01421, 0.01427, 0.01872, 0.02008, 0.02181, 0.02141, 0.02636, 0.03285, 0.03564 };
+    m_mc_rel17_leakage_correction_slopes_electron_20 = { 0.01616, 0.01572, 0.01596, 0.02139, 0.02339, 0.03350, 0.02499, 0.03038, 0.03870, 0.04337 };
+    m_mc_rel17_leakage_correction_slopes_electron_25 = { 0.01663, 0.01616, 0.01667, 0.02223, 0.02445, 0.03852, 0.02611, 0.03174, 0.04093, 0.04692 };
+    m_mc_rel17_leakage_correction_slopes_electron_30 = { 0.01689, 0.01635, 0.01684, 0.02256, 0.02485, 0.04223, 0.02660, 0.03232, 0.04182, 0.04846 };
+    m_mc_rel17_leakage_correction_slopes_electron_35 = { 0.01695, 0.01642, 0.01693, 0.02268, 0.02501, 0.04403, 0.02685, 0.03254, 0.04223, 0.04928 };
+    m_mc_rel17_leakage_correction_slopes_electron_40 = { 0.01701, 0.01646, 0.01702, 0.02272, 0.02517, 0.04550, 0.02698, 0.03267, 0.04242, 0.04964 };
+
+    m_mc_rel17_leakage_correction_offsets_electron_15 = { 21.71, 36.00, 132.56, 191.64, 263.46, 619.58, 288.75, 121.92, 102.35, 175.02 };
+    m_mc_rel17_leakage_correction_offsets_electron_20 = { 76.67, 85.35, 184.90, 276.72, 384.97, 595.60, 657.99, 231.88, 170.48, 312.30 };
+    m_mc_rel17_leakage_correction_offsets_electron_25 = { 90.44, 105.02, 267.95, 420.38, 555.09, 1014.50, 765.83, 283.50, 224.18, 357.30 };
+    m_mc_rel17_leakage_correction_offsets_electron_30 = { 119.55, 127.09, 279.48, 430.96, 571.81, 846.86, 968.01, 354.46, 263.11, 455.21 };
+    m_mc_rel17_leakage_correction_offsets_electron_35 = { 138.79, 161.87, 371.47, 572.08, 754.17, 1249.38, 1000.44, 389.22, 295.72, 464.28 };
+    m_mc_rel17_leakage_correction_offsets_electron_40 = { 180.08, 187.89, 363.31, 553.46, 707.60, 1006.20, 1105.73, 434.21, 312.78, 535.90 };
 
     // photons: last eta bin isn't used
-    mc_rel17_leakage_correction_slopes_photon_converted_15 = { 0.01450, 0.01410, 0.01410, 0.01860, 0.01990, 0.0, 0.02120, 0.02610, 0.03260, 0.0 };
-    mc_rel17_leakage_correction_slopes_photon_converted_20 = { 0.01600, 0.01560, 0.01580, 0.02130, 0.02320, 0.0, 0.02450, 0.03000, 0.03840, 0.0 };
-    mc_rel17_leakage_correction_slopes_photon_converted_25 = { 0.01630, 0.01600, 0.01620, 0.02210, 0.02420, 0.0, 0.02560, 0.03140, 0.04060, 0.0 };
-    mc_rel17_leakage_correction_slopes_photon_converted_30 = { 0.01630, 0.01600, 0.01630, 0.02240, 0.02460, 0.0, 0.02610, 0.03190, 0.04150, 0.0 };
-    mc_rel17_leakage_correction_slopes_photon_converted_35 = { 0.01660, 0.01600, 0.01630, 0.02240, 0.02470, 0.0, 0.02640, 0.03210, 0.04190, 0.0 };
-    mc_rel17_leakage_correction_slopes_photon_converted_40 = { 0.01610, 0.01590, 0.01620, 0.02250, 0.02480, 0.0, 0.02650, 0.03220, 0.04210, 0.0 };
-
-    mc_rel17_leakage_correction_offsets_photon_converted_15 = { 36.50, 61.80, 176.90, 206.40, 300.70, 0.0, 277.40, 91.70, 126.60, 0.0 };
-    mc_rel17_leakage_correction_offsets_photon_converted_20 = { 93.30, 101.40, 270.60, 369.10, 514.70, 0.0, 586.10, 160.80, 193.80, 0.0 };
-    mc_rel17_leakage_correction_offsets_photon_converted_25 = { 195.80, 166.20, 386.50, 472.30, 637.30, 0.0, 739.40, 207.60, 240.60, 0.0 };
-    mc_rel17_leakage_correction_offsets_photon_converted_30 = { 286.60, 241.60, 501.60, 570.70, 739.50, 0.0, 860.00, 264.50, 270.40, 0.0 };
-    mc_rel17_leakage_correction_offsets_photon_converted_35 = { 329.90, 314.70, 585.60, 655.60, 835.70, 0.0, 934.30, 291.50, 291.90, 0.0 };
-    mc_rel17_leakage_correction_offsets_photon_converted_40 = { 478.70, 383.80, 679.20, 725.70, 938.70, 0.0, 999.30, 322.80, 316.20, 0.0 };
-
-    mc_rel17_leakage_correction_slopes_photon_unconverted_15 = { 0.01480, 0.01410, 0.01400, 0.01820, 0.01950, 0.0, 0.02140, 0.02660, 0.03250, 0.0 };
-    mc_rel17_leakage_correction_slopes_photon_unconverted_20 = { 0.01630, 0.01560, 0.01560, 0.02060, 0.02240, 0.0, 0.02480, 0.03060, 0.03830, 0.0 };
-    mc_rel17_leakage_correction_slopes_photon_unconverted_25 = { 0.01670, 0.01610, 0.01620, 0.02140, 0.02330, 0.0, 0.02590, 0.03200, 0.04050, 0.0 };
-    mc_rel17_leakage_correction_slopes_photon_unconverted_30 = { 0.01690, 0.01630, 0.01640, 0.02170, 0.02360, 0.0, 0.02630, 0.03260, 0.04140, 0.0 };
-    mc_rel17_leakage_correction_slopes_photon_unconverted_35 = { 0.01700, 0.01640, 0.01650, 0.02180, 0.02380, 0.0, 0.02650, 0.03280, 0.04180, 0.0 };
-    mc_rel17_leakage_correction_slopes_photon_unconverted_40 = { 0.01710, 0.01640, 0.01650, 0.02190, 0.02390, 0.0, 0.02660, 0.03290, 0.04200, 0.0 };
-
-    mc_rel17_leakage_correction_offsets_photon_unconverted_15 = { -27.80, 3.80, 67.50, 80.90, 114.90, 0.0, 82.60, 2.10, 39.80, 0.0 };
-    mc_rel17_leakage_correction_offsets_photon_unconverted_20 = { -17.70, 12.60, 97.80, 126.50, 186.20, 0.0, 200.80, 24.00, 62.30, 0.0 };
-    mc_rel17_leakage_correction_offsets_photon_unconverted_25 = { -8.60, 20.30, 118.20, 161.80, 244.30, 0.0, 271.80, 39.80, 79.10, 0.0 };
-    mc_rel17_leakage_correction_offsets_photon_unconverted_30 = { 5.40, 33.80, 141.60, 199.50, 295.40, 0.0, 336.50, 64.80, 90.40, 0.0 };
-    mc_rel17_leakage_correction_offsets_photon_unconverted_35 = { 9.60, 47.80, 154.10, 231.10, 346.10, 0.0, 384.60, 77.80, 96.90, 0.0 };
-    mc_rel17_leakage_correction_offsets_photon_unconverted_40 = { 13.30, 62.00, 177.00, 267.10, 406.20, 0.0, 419.80, 89.40, 105.90, 0.0 };
+    m_mc_rel17_leakage_correction_slopes_photon_converted_15 = { 0.01450, 0.01410, 0.01410, 0.01860, 0.01990, 0.0, 0.02120, 0.02610, 0.03260, 0.0 };
+    m_mc_rel17_leakage_correction_slopes_photon_converted_20 = { 0.01600, 0.01560, 0.01580, 0.02130, 0.02320, 0.0, 0.02450, 0.03000, 0.03840, 0.0 };
+    m_mc_rel17_leakage_correction_slopes_photon_converted_25 = { 0.01630, 0.01600, 0.01620, 0.02210, 0.02420, 0.0, 0.02560, 0.03140, 0.04060, 0.0 };
+    m_mc_rel17_leakage_correction_slopes_photon_converted_30 = { 0.01630, 0.01600, 0.01630, 0.02240, 0.02460, 0.0, 0.02610, 0.03190, 0.04150, 0.0 };
+    m_mc_rel17_leakage_correction_slopes_photon_converted_35 = { 0.01660, 0.01600, 0.01630, 0.02240, 0.02470, 0.0, 0.02640, 0.03210, 0.04190, 0.0 };
+    m_mc_rel17_leakage_correction_slopes_photon_converted_40 = { 0.01610, 0.01590, 0.01620, 0.02250, 0.02480, 0.0, 0.02650, 0.03220, 0.04210, 0.0 };
+
+    m_mc_rel17_leakage_correction_offsets_photon_converted_15 = { 36.50, 61.80, 176.90, 206.40, 300.70, 0.0, 277.40, 91.70, 126.60, 0.0 };
+    m_mc_rel17_leakage_correction_offsets_photon_converted_20 = { 93.30, 101.40, 270.60, 369.10, 514.70, 0.0, 586.10, 160.80, 193.80, 0.0 };
+    m_mc_rel17_leakage_correction_offsets_photon_converted_25 = { 195.80, 166.20, 386.50, 472.30, 637.30, 0.0, 739.40, 207.60, 240.60, 0.0 };
+    m_mc_rel17_leakage_correction_offsets_photon_converted_30 = { 286.60, 241.60, 501.60, 570.70, 739.50, 0.0, 860.00, 264.50, 270.40, 0.0 };
+    m_mc_rel17_leakage_correction_offsets_photon_converted_35 = { 329.90, 314.70, 585.60, 655.60, 835.70, 0.0, 934.30, 291.50, 291.90, 0.0 };
+    m_mc_rel17_leakage_correction_offsets_photon_converted_40 = { 478.70, 383.80, 679.20, 725.70, 938.70, 0.0, 999.30, 322.80, 316.20, 0.0 };
+
+    m_mc_rel17_leakage_correction_slopes_photon_unconverted_15 = { 0.01480, 0.01410, 0.01400, 0.01820, 0.01950, 0.0, 0.02140, 0.02660, 0.03250, 0.0 };
+    m_mc_rel17_leakage_correction_slopes_photon_unconverted_20 = { 0.01630, 0.01560, 0.01560, 0.02060, 0.02240, 0.0, 0.02480, 0.03060, 0.03830, 0.0 };
+    m_mc_rel17_leakage_correction_slopes_photon_unconverted_25 = { 0.01670, 0.01610, 0.01620, 0.02140, 0.02330, 0.0, 0.02590, 0.03200, 0.04050, 0.0 };
+    m_mc_rel17_leakage_correction_slopes_photon_unconverted_30 = { 0.01690, 0.01630, 0.01640, 0.02170, 0.02360, 0.0, 0.02630, 0.03260, 0.04140, 0.0 };
+    m_mc_rel17_leakage_correction_slopes_photon_unconverted_35 = { 0.01700, 0.01640, 0.01650, 0.02180, 0.02380, 0.0, 0.02650, 0.03280, 0.04180, 0.0 };
+    m_mc_rel17_leakage_correction_slopes_photon_unconverted_40 = { 0.01710, 0.01640, 0.01650, 0.02190, 0.02390, 0.0, 0.02660, 0.03290, 0.04200, 0.0 };
+
+    m_mc_rel17_leakage_correction_offsets_photon_unconverted_15 = { -27.80, 3.80, 67.50, 80.90, 114.90, 0.0, 82.60, 2.10, 39.80, 0.0 };
+    m_mc_rel17_leakage_correction_offsets_photon_unconverted_20 = { -17.70, 12.60, 97.80, 126.50, 186.20, 0.0, 200.80, 24.00, 62.30, 0.0 };
+    m_mc_rel17_leakage_correction_offsets_photon_unconverted_25 = { -8.60, 20.30, 118.20, 161.80, 244.30, 0.0, 271.80, 39.80, 79.10, 0.0 };
+    m_mc_rel17_leakage_correction_offsets_photon_unconverted_30 = { 5.40, 33.80, 141.60, 199.50, 295.40, 0.0, 336.50, 64.80, 90.40, 0.0 };
+    m_mc_rel17_leakage_correction_offsets_photon_unconverted_35 = { 9.60, 47.80, 154.10, 231.10, 346.10, 0.0, 384.60, 77.80, 96.90, 0.0 };
+    m_mc_rel17_leakage_correction_offsets_photon_unconverted_40 = { 13.30, 62.00, 177.00, 267.10, 406.20, 0.0, 419.80, 89.40, 105.90, 0.0 };
   }
 
   void IsolationCorrection::setDDCorr_2015() {
@@ -471,74 +477,74 @@ namespace CP {
       ATH_MSG_WARNING("Correction file for 2015 data driven corrections not found, tool not initialized for 2015 corrections\n");
       m_corr_ddshift_2015_file = "";
     }else{
-      if (m_corr_ddshift_2015_file.find("v2") != std::string::npos) {
-	graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_-2.37_-1.52_2015"));
-	graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_-1.37_-0.6_2015"));
-	graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_-0.6_0.0_2015"));
-	graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_0.0_0.6_2015"));
-	graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_0.6_1.37_2015"));
-	graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_1.52_2.37_2015"));
+      if (m_isv2) {
+	m_graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_-2.37_-1.52_2015"));
+	m_graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_-1.37_-0.6_2015"));
+	m_graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_-0.6_0.0_2015"));
+	m_graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_0.0_0.6_2015"));
+	m_graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_0.6_1.37_2015"));
+	m_graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_1.52_2.37_2015"));
 	
-	graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_-2.37_-1.52_2015"));
-	graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_-1.37_-0.6_2015"));
-	graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_-0.6_0.0_2015"));
-	graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_0.0_0.6_2015"));
-	graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_0.6_1.37_2015"));
-	graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_1.52_2.37_2015"));
-
-	graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_-2.37_-1.52_2015"));
-	graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_-1.37_-0.6_2015"));
-	graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_-0.6_0.0_2015"));
-	graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_0.0_0.6_2015"));
-	graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_0.6_1.37_2015"));
-	graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_1.52_2.37_2015"));
+	m_graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_-2.37_-1.52_2015"));
+	m_graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_-1.37_-0.6_2015"));
+	m_graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_-0.6_0.0_2015"));
+	m_graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_0.0_0.6_2015"));
+	m_graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_0.6_1.37_2015"));
+	m_graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_1.52_2.37_2015"));
+
+	m_graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_-2.37_-1.52_2015"));
+	m_graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_-1.37_-0.6_2015"));
+	m_graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_-0.6_0.0_2015"));
+	m_graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_0.0_0.6_2015"));
+	m_graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_0.6_1.37_2015"));
+	m_graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_1.52_2.37_2015"));
 	
-	graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_-2.37_-1.52_2015"));
-	graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_-1.37_-0.6_2015"));
-	graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_-0.6_0.0_2015"));
-	graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_0.0_0.6_2015"));
-	graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_0.6_1.37_2015"));
-	graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_1.52_2.37_2015"));
+	m_graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_-2.37_-1.52_2015"));
+	m_graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_-1.37_-0.6_2015"));
+	m_graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_-0.6_0.0_2015"));
+	m_graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_0.0_0.6_2015"));
+	m_graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_0.6_1.37_2015"));
+	m_graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_1.52_2.37_2015"));
 	
       } else {
-	graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_0.0_0.6_2015"));
-	graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_0.6_1.37_2015"));
-	graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_1.52_1.81_2015"));
-	graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_1.81_2.37_2015"));
+	m_graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_0.0_0.6_2015"));
+	m_graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_0.6_1.37_2015"));
+	m_graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_1.52_1.81_2015"));
+	m_graph_dd_2015_cone40_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_unconverted_photon_eta_1.81_2.37_2015"));
 	
-	graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_0.0_0.6_2015"));
-	graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_0.6_1.37_2015"));
-	graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_1.52_1.81_2015"));
-	graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_1.81_2.37_2015"));
-
-	graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_0.0_0.6_2015"));
-	graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_0.6_1.37_2015"));
-	graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_1.52_1.81_2015"));
-	graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_1.81_2.37_2015"));
+	m_graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_0.0_0.6_2015"));
+	m_graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_0.6_1.37_2015"));
+	m_graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_1.52_1.81_2015"));
+	m_graph_dd_2015_cone40_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone40_DataDriven_converted_photon_eta_1.81_2.37_2015"));
+
+	m_graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_0.0_0.6_2015"));
+	m_graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_0.6_1.37_2015"));
+	m_graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_1.52_1.81_2015"));
+	m_graph_dd_2015_cone20_unconv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_unconverted_photon_eta_1.81_2.37_2015"));
 	
-	graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_0.0_0.6_2015"));
-	graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_0.6_1.37_2015"));
-	graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_1.52_1.81_2015"));
-	graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_1.81_2.37_2015"));
+	m_graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_0.0_0.6_2015"));
+	m_graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_0.6_1.37_2015"));
+	m_graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_1.52_1.81_2015"));
+	m_graph_dd_2015_cone20_conv_photon_shift.push_back( (TGraph*) file_ptleakagecorr->Get("topoetcone20_DataDriven_converted_photon_eta_1.81_2.37_2015"));
       }
       
 
     }
-    for (auto gr : graph_dd_2015_cone40_conv_photon_shift) {
+    for (auto gr : m_graph_dd_2015_cone40_conv_photon_shift) {
       if (gr == nullptr)
-	ATH_MSG_ERROR("Null pointeur for one of the DD correction bin (conv,40)");
+	ATH_MSG_ERROR("Null pointer for one of the DD correction bin (conv,40)");
     }
-    for (auto gr : graph_dd_2015_cone40_unconv_photon_shift) {
+    for (auto gr : m_graph_dd_2015_cone40_unconv_photon_shift) {
       if (gr == nullptr)
-	ATH_MSG_ERROR("Null pointeur for one of the DD correction bin (unconv,40)");
+	ATH_MSG_ERROR("Null pointer for one of the DD correction bin (unconv,40)");
     }
-    for (auto gr : graph_dd_2015_cone20_conv_photon_shift) {
+    for (auto gr : m_graph_dd_2015_cone20_conv_photon_shift) {
       if (gr == nullptr)
-	ATH_MSG_ERROR("Null pointeur for one of the DD correction bin (conv,20)");
+	ATH_MSG_ERROR("Null pointer for one of the DD correction bin (conv,20)");
     }
-    for (auto gr : graph_dd_2015_cone20_unconv_photon_shift) {
+    for (auto gr : m_graph_dd_2015_cone20_unconv_photon_shift) {
       if (gr == nullptr)
-	ATH_MSG_ERROR("Null pointeur for one of the DD correction bin (unconv, 20)");
+	ATH_MSG_ERROR("Null pointer for one of the DD correction bin (unconv, 20)");
     }
     
   }
@@ -558,104 +564,104 @@ namespace CP {
       m_corr_file = "";
     }else{
 
-      graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin0_extrap") );
-      graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin1_extrap") );
-      graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin2_extrap") );
-      graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin3_extrap") );
-      graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin4_extrap") );
-      graph_cone40_photon_unconverted.push_back( new TGraph() );//No corrections for photons in the crack region
-      graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin6_extrap") );
-      graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin7_extrap") );
-      graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin8_extrap") );
-      graph_cone40_photon_unconverted.push_back( new TGraph() );//No corrections for photons with |eta|>2.37
-
-      graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin0_extrap") );
-      graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin1_extrap") );
-      graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin2_extrap") );
-      graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin3_extrap") );
-      graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin4_extrap") );
-      graph_cone40_photon_converted.push_back( new TGraph() );//No corrections for photons in the crack region
-      graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin6_extrap") );
-      graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin7_extrap") );
-      graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin8_extrap") );
-      graph_cone40_photon_converted.push_back( new TGraph() );//No corrections for photons with |eta|>2.37
-
-      graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin0_extrap") );
-      graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin1_extrap") );
-      graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin2_extrap") );
-      graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin3_extrap") );
-      graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin4_extrap") );
-      graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin5_extrap") );
-      graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin6_extrap") );
-      graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin7_extrap") );
-      graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin8_extrap") );
-      graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin9_extrap") );
-
-      graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin0_extrap") );
-      graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin1_extrap") );
-      graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin2_extrap") );
-      graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin3_extrap") );
-      graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin4_extrap") );
-      graph_cone30_photon_unconverted.push_back( new TGraph() );//No corrections for photons in the crack region
-      graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin6_extrap") );
-      graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin7_extrap") );
-      graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin8_extrap") );
-      graph_cone30_photon_unconverted.push_back( new TGraph() );//No corrections for photons with |eta|>2.37
-
-      graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin0_extrap") );
-      graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin1_extrap") );
-      graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin2_extrap") );
-      graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin3_extrap") );
-      graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin4_extrap") );
-      graph_cone30_photon_converted.push_back( new TGraph() );//No corrections for photons in the crack region
-      graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin6_extrap") );
-      graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin7_extrap") );
-      graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin8_extrap") );
-      graph_cone30_photon_converted.push_back( new TGraph() );//No corrections for photons with |eta|>2.37
-
-      graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin0_extrap") );
-      graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin1_extrap") );
-      graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin2_extrap") );
-      graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin3_extrap") );
-      graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin4_extrap") );
-      graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin5_extrap") );
-      graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin6_extrap") );
-      graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin7_extrap") );
-      graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin8_extrap") );
-      graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin9_extrap") );
-
-      graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin0_extrap") );
-      graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin1_extrap") );
-      graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin2_extrap") );
-      graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin3_extrap") );
-      graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin4_extrap") );
-      graph_cone20_photon_unconverted.push_back( new TGraph() );//No corrections for photons in the crack region
-      graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin6_extrap") );
-      graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin7_extrap") );
-      graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin8_extrap") );
-      graph_cone20_photon_unconverted.push_back( new TGraph() );//No corrections for photons with |eta|>2.37
-
-      graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin0_extrap") );
-      graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin1_extrap") );
-      graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin2_extrap") );
-      graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin3_extrap") );
-      graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin4_extrap") );
-      graph_cone20_photon_converted.push_back( new TGraph() );//No corrections for photons in the crack region
-      graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin6_extrap") );
-      graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin7_extrap") );
-      graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin8_extrap") );
-      graph_cone20_photon_converted.push_back( new TGraph() );//No corrections for photons with |eta|>2.37
-
-      graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin0_extrap") );
-      graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin1_extrap") );
-      graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin2_extrap") );
-      graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin3_extrap") );
-      graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin4_extrap") );
-      graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin5_extrap") );
-      graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin6_extrap") );
-      graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin7_extrap") );
-      graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin8_extrap") );
-      graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin9_extrap") );
+      m_graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin0_extrap") );
+      m_graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin1_extrap") );
+      m_graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin2_extrap") );
+      m_graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin3_extrap") );
+      m_graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin4_extrap") );
+      m_graph_cone40_photon_unconverted.push_back( new TGraph() );//No corrections for photons in the crack region
+      m_graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin6_extrap") );
+      m_graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin7_extrap") );
+      m_graph_cone40_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_unconverted_etabin8_extrap") );
+      m_graph_cone40_photon_unconverted.push_back( new TGraph() );//No corrections for photons with |eta|>2.37
+
+      m_graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin0_extrap") );
+      m_graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin1_extrap") );
+      m_graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin2_extrap") );
+      m_graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin3_extrap") );
+      m_graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin4_extrap") );
+      m_graph_cone40_photon_converted.push_back( new TGraph() );//No corrections for photons in the crack region
+      m_graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin6_extrap") );
+      m_graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin7_extrap") );
+      m_graph_cone40_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_photon_converted_etabin8_extrap") );
+      m_graph_cone40_photon_converted.push_back( new TGraph() );//No corrections for photons with |eta|>2.37
+
+      m_graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin0_extrap") );
+      m_graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin1_extrap") );
+      m_graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin2_extrap") );
+      m_graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin3_extrap") );
+      m_graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin4_extrap") );
+      m_graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin5_extrap") );
+      m_graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin6_extrap") );
+      m_graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin7_extrap") );
+      m_graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin8_extrap") );
+      m_graph_cone40_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone40_electron_etabin9_extrap") );
+
+      m_graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin0_extrap") );
+      m_graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin1_extrap") );
+      m_graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin2_extrap") );
+      m_graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin3_extrap") );
+      m_graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin4_extrap") );
+      m_graph_cone30_photon_unconverted.push_back( new TGraph() );//No corrections for photons in the crack region
+      m_graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin6_extrap") );
+      m_graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin7_extrap") );
+      m_graph_cone30_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_unconverted_etabin8_extrap") );
+      m_graph_cone30_photon_unconverted.push_back( new TGraph() );//No corrections for photons with |eta|>2.37
+
+      m_graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin0_extrap") );
+      m_graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin1_extrap") );
+      m_graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin2_extrap") );
+      m_graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin3_extrap") );
+      m_graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin4_extrap") );
+      m_graph_cone30_photon_converted.push_back( new TGraph() );//No corrections for photons in the crack region
+      m_graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin6_extrap") );
+      m_graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin7_extrap") );
+      m_graph_cone30_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_photon_converted_etabin8_extrap") );
+      m_graph_cone30_photon_converted.push_back( new TGraph() );//No corrections for photons with |eta|>2.37
+
+      m_graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin0_extrap") );
+      m_graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin1_extrap") );
+      m_graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin2_extrap") );
+      m_graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin3_extrap") );
+      m_graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin4_extrap") );
+      m_graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin5_extrap") );
+      m_graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin6_extrap") );
+      m_graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin7_extrap") );
+      m_graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin8_extrap") );
+      m_graph_cone30_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone30_electron_etabin9_extrap") );
+
+      m_graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin0_extrap") );
+      m_graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin1_extrap") );
+      m_graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin2_extrap") );
+      m_graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin3_extrap") );
+      m_graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin4_extrap") );
+      m_graph_cone20_photon_unconverted.push_back( new TGraph() );//No corrections for photons in the crack region
+      m_graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin6_extrap") );
+      m_graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin7_extrap") );
+      m_graph_cone20_photon_unconverted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_unconverted_etabin8_extrap") );
+      m_graph_cone20_photon_unconverted.push_back( new TGraph() );//No corrections for photons with |eta|>2.37
+
+      m_graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin0_extrap") );
+      m_graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin1_extrap") );
+      m_graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin2_extrap") );
+      m_graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin3_extrap") );
+      m_graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin4_extrap") );
+      m_graph_cone20_photon_converted.push_back( new TGraph() );//No corrections for photons in the crack region
+      m_graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin6_extrap") );
+      m_graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin7_extrap") );
+      m_graph_cone20_photon_converted.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_photon_converted_etabin8_extrap") );
+      m_graph_cone20_photon_converted.push_back( new TGraph() );//No corrections for photons with |eta|>2.37
+
+      m_graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin0_extrap") );
+      m_graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin1_extrap") );
+      m_graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin2_extrap") );
+      m_graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin3_extrap") );
+      m_graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin4_extrap") );
+      m_graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin5_extrap") );
+      m_graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin6_extrap") );
+      m_graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin7_extrap") );
+      m_graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin8_extrap") );
+      m_graph_cone20_electron.push_back( (TGraph*) file_ptleakagecorr->Get("graph_cone20_electron_etabin9_extrap") );
     }
   }
 
@@ -685,180 +691,180 @@ namespace CP {
 	
         // *** photon function topoetocone40
 
-        function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.0_0.1_unconverted") );
-	function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.1_0.6_unconverted") );
-	function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.6_0.8_unconverted") );
-	function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.8_1.15_unconverted") );
-	function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.15_1.37_unconverted") );
-	function_2015_cone40_photon_unconverted.push_back(  new TF1() );
-	function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.52_1.81_unconverted") );
-	function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.81_2.01_unconverted") );
-	function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.01_2.37_unconverted") );
-	function_2015_cone40_photon_unconverted.push_back(  new TF1() );
-
-        function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.0_0.1_converted_ok") );
-        function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.1_0.6_converted_ok") );
-        function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.6_0.8_converted_ok") );
-        function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.8_1.15_converted_ok") );
-        function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.15_1.37_converted_ok") );
-        function_2015_cone40_photon_converted_ok.push_back(  new TF1() );
-        function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.52_1.81_converted_ok") );
-        function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.81_2.01_converted_ok") );
-        function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.01_2.37_converted_ok") );
-        function_2015_cone40_photon_converted_ok.push_back(  new TF1() );
-
-        function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.0_0.1_converted_trouble") );
-        function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.1_0.6_converted_trouble") );
-        function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.6_0.8_converted_trouble") );
-        function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.8_1.15_converted_trouble") );
-        function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.15_1.37_converted_trouble") );
-        function_2015_cone40_photon_converted_trouble.push_back(  new TF1() );
-        function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.52_1.81_converted_trouble") );
-        function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.81_2.01_converted_trouble") );
-        function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.01_2.37_converted_trouble") );
-        function_2015_cone40_photon_converted_trouble.push_back(  new TF1() );
+        m_function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.0_0.1_unconverted") );
+	m_function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.1_0.6_unconverted") );
+	m_function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.6_0.8_unconverted") );
+	m_function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.8_1.15_unconverted") );
+	m_function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.15_1.37_unconverted") );
+	m_function_2015_cone40_photon_unconverted.push_back(  new TF1() );
+	m_function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.52_1.81_unconverted") );
+	m_function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.81_2.01_unconverted") );
+	m_function_2015_cone40_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.01_2.37_unconverted") );
+	m_function_2015_cone40_photon_unconverted.push_back(  new TF1() );
+
+        m_function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.0_0.1_converted_ok") );
+        m_function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.1_0.6_converted_ok") );
+        m_function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.6_0.8_converted_ok") );
+        m_function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.8_1.15_converted_ok") );
+        m_function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.15_1.37_converted_ok") );
+        m_function_2015_cone40_photon_converted_ok.push_back(  new TF1() );
+        m_function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.52_1.81_converted_ok") );
+        m_function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.81_2.01_converted_ok") );
+        m_function_2015_cone40_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.01_2.37_converted_ok") );
+        m_function_2015_cone40_photon_converted_ok.push_back(  new TF1() );
+
+        m_function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.0_0.1_converted_trouble") );
+        m_function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.1_0.6_converted_trouble") );
+        m_function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.6_0.8_converted_trouble") );
+        m_function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.8_1.15_converted_trouble") );
+        m_function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.15_1.37_converted_trouble") );
+        m_function_2015_cone40_photon_converted_trouble.push_back(  new TF1() );
+        m_function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.52_1.81_converted_trouble") );
+        m_function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.81_2.01_converted_trouble") );
+        m_function_2015_cone40_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.01_2.37_converted_trouble") );
+        m_function_2015_cone40_photon_converted_trouble.push_back(  new TF1() );
 
         // *** photon function topoetocone30
 
-        function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.0_0.1_unconverted") );
-        function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.1_0.6_unconverted") );
-        function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.6_0.8_unconverted") );
-        function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.8_1.15_unconverted") );
-        function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.15_1.37_unconverted") );
-        function_2015_cone30_photon_unconverted.push_back(  new TF1() );
-        function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.52_1.81_unconverted") );
-        function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.81_2.01_unconverted") );
-        function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.01_2.37_unconverted") );
-        function_2015_cone30_photon_unconverted.push_back(  new TF1() );
-
-        function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.0_0.1_converted_ok") );
-        function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.1_0.6_converted_ok") );
-        function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.6_0.8_converted_ok") );
-        function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.8_1.15_converted_ok") );
-        function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.15_1.37_converted_ok") );
-        function_2015_cone30_photon_converted_ok.push_back(  new TF1() );
-        function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.52_1.81_converted_ok") );
-        function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.81_2.01_converted_ok") );
-        function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.01_2.37_converted_ok") );
-        function_2015_cone30_photon_converted_ok.push_back(  new TF1() );
-
-        function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.0_0.1_converted_trouble") );
-        function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.1_0.6_converted_trouble") );
-        function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.6_0.8_converted_trouble") );
-        function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.8_1.15_converted_trouble") );
-        function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.15_1.37_converted_trouble") );
-        function_2015_cone30_photon_converted_trouble.push_back(  new TF1() );
-        function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.52_1.81_converted_trouble") );
-        function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.81_2.01_converted_trouble") );
-        function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.01_2.37_converted_trouble") );
-        function_2015_cone30_photon_converted_trouble.push_back(  new TF1() );
+        m_function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.0_0.1_unconverted") );
+        m_function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.1_0.6_unconverted") );
+        m_function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.6_0.8_unconverted") );
+        m_function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.8_1.15_unconverted") );
+        m_function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.15_1.37_unconverted") );
+        m_function_2015_cone30_photon_unconverted.push_back(  new TF1() );
+        m_function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.52_1.81_unconverted") );
+        m_function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.81_2.01_unconverted") );
+        m_function_2015_cone30_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.01_2.37_unconverted") );
+        m_function_2015_cone30_photon_unconverted.push_back(  new TF1() );
+
+        m_function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.0_0.1_converted_ok") );
+        m_function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.1_0.6_converted_ok") );
+        m_function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.6_0.8_converted_ok") );
+        m_function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.8_1.15_converted_ok") );
+        m_function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.15_1.37_converted_ok") );
+        m_function_2015_cone30_photon_converted_ok.push_back(  new TF1() );
+        m_function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.52_1.81_converted_ok") );
+        m_function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.81_2.01_converted_ok") );
+        m_function_2015_cone30_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.01_2.37_converted_ok") );
+        m_function_2015_cone30_photon_converted_ok.push_back(  new TF1() );
+
+        m_function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.0_0.1_converted_trouble") );
+        m_function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.1_0.6_converted_trouble") );
+        m_function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.6_0.8_converted_trouble") );
+        m_function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.8_1.15_converted_trouble") );
+        m_function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.15_1.37_converted_trouble") );
+        m_function_2015_cone30_photon_converted_trouble.push_back(  new TF1() );
+        m_function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.52_1.81_converted_trouble") );
+        m_function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.81_2.01_converted_trouble") );
+        m_function_2015_cone30_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.01_2.37_converted_trouble") );
+        m_function_2015_cone30_photon_converted_trouble.push_back(  new TF1() );
 
         // *** photon function topoetocone20
 
-        function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.0_0.1_unconverted") );
-        function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.1_0.6_unconverted") );
-        function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.6_0.8_unconverted") );
-        function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.8_1.15_unconverted") );
-        function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.15_1.37_unconverted") );
-        function_2015_cone20_photon_unconverted.push_back(  new TF1() );
-        function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.52_1.81_unconverted") );
-        function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.81_2.01_unconverted") );
-        function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.01_2.37_unconverted") );
-        function_2015_cone20_photon_unconverted.push_back(  new TF1() );
-
-        function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.0_0.1_converted_ok") );
-        function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.1_0.6_converted_ok") );
-        function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.6_0.8_converted_ok") );
-        function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.8_1.15_converted_ok") );
-        function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.15_1.37_converted_ok") );
-        function_2015_cone20_photon_converted_ok.push_back(  new TF1() );
-        function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.52_1.81_converted_ok") );
-        function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.81_2.01_converted_ok") );
-        function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.01_2.37_converted_ok") );
-        function_2015_cone20_photon_converted_ok.push_back(  new TF1() );
-
-        function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.0_0.1_converted_trouble") );
-        function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.1_0.6_converted_trouble") );
-        function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.6_0.8_converted_trouble") );
-        function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.8_1.15_converted_trouble") );
-        function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.15_1.37_converted_trouble") );
-        function_2015_cone20_photon_converted_trouble.push_back(  new TF1() );
-        function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.52_1.81_converted_trouble") );
-        function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.81_2.01_converted_trouble") );
-        function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.01_2.37_converted_trouble") );
-        function_2015_cone20_photon_converted_trouble.push_back(  new TF1() );
+        m_function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.0_0.1_unconverted") );
+        m_function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.1_0.6_unconverted") );
+        m_function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.6_0.8_unconverted") );
+        m_function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.8_1.15_unconverted") );
+        m_function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.15_1.37_unconverted") );
+        m_function_2015_cone20_photon_unconverted.push_back(  new TF1() );
+        m_function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.52_1.81_unconverted") );
+        m_function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.81_2.01_unconverted") );
+        m_function_2015_cone20_photon_unconverted.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.01_2.37_unconverted") );
+        m_function_2015_cone20_photon_unconverted.push_back(  new TF1() );
+
+        m_function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.0_0.1_converted_ok") );
+        m_function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.1_0.6_converted_ok") );
+        m_function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.6_0.8_converted_ok") );
+        m_function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.8_1.15_converted_ok") );
+        m_function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.15_1.37_converted_ok") );
+        m_function_2015_cone20_photon_converted_ok.push_back(  new TF1() );
+        m_function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.52_1.81_converted_ok") );
+        m_function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.81_2.01_converted_ok") );
+        m_function_2015_cone20_photon_converted_ok.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.01_2.37_converted_ok") );
+        m_function_2015_cone20_photon_converted_ok.push_back(  new TF1() );
+
+        m_function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.0_0.1_converted_trouble") );
+        m_function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.1_0.6_converted_trouble") );
+        m_function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.6_0.8_converted_trouble") );
+        m_function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.8_1.15_converted_trouble") );
+        m_function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.15_1.37_converted_trouble") );
+        m_function_2015_cone20_photon_converted_trouble.push_back(  new TF1() );
+        m_function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.52_1.81_converted_trouble") );
+        m_function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.81_2.01_converted_trouble") );
+        m_function_2015_cone20_photon_converted_trouble.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.01_2.37_converted_trouble") );
+        m_function_2015_cone20_photon_converted_trouble.push_back(  new TF1() );
 
         // *** electron function topoetocone40
 
-        function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.0_0.1_author_1_electron") );
-        function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.1_0.6_author_1_electron") );
-        function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.6_0.8_author_1_electron") );
-        function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.8_1.15_author_1_electron") );
-        function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.15_1.37_author_1_electron") );
-        function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.37_1.52_author_1_electron") );
-        function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.52_1.81_author_1_electron") );
-        function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.81_2.01_author_1_electron") );
-        function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.01_2.37_author_1_electron") );
-        function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.37_2.47_author_1_electron") );
-
-        function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.0_0.1_author_16_electron") );
-        function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.1_0.6_author_16_electron") );
-        function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.6_0.8_author_16_electron") );
-        function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.8_1.15_author_16_electron") );
-        function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.15_1.37_author_16_electron") );
-        function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.37_1.52_author_16_electron") );
-        function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.52_1.81_author_16_electron") );
-        function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.81_2.01_author_16_electron") );
-        function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.01_2.37_author_16_electron") );
-        function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.37_2.47_author_16_electron") );
+        m_function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.0_0.1_author_1_electron") );
+        m_function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.1_0.6_author_1_electron") );
+        m_function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.6_0.8_author_1_electron") );
+        m_function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.8_1.15_author_1_electron") );
+        m_function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.15_1.37_author_1_electron") );
+        m_function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.37_1.52_author_1_electron") );
+        m_function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.52_1.81_author_1_electron") );
+        m_function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.81_2.01_author_1_electron") );
+        m_function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.01_2.37_author_1_electron") );
+        m_function_2015_cone40_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.37_2.47_author_1_electron") );
+
+        m_function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.0_0.1_author_16_electron") );
+        m_function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.1_0.6_author_16_electron") );
+        m_function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.6_0.8_author_16_electron") );
+        m_function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_0.8_1.15_author_16_electron") );
+        m_function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.15_1.37_author_16_electron") );
+        m_function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.37_1.52_author_16_electron") );
+        m_function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.52_1.81_author_16_electron") );
+        m_function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_1.81_2.01_author_16_electron") );
+        m_function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.01_2.37_author_16_electron") );
+        m_function_2015_cone40_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone40_eta_2.37_2.47_author_16_electron") );
 
         // *** electron function topoetocone30
 
-        function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.0_0.1_author_1_electron") );
-        function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.1_0.6_author_1_electron") );
-        function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.6_0.8_author_1_electron") );
-        function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.8_1.15_author_1_electron") );
-        function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.15_1.37_author_1_electron") );
-        function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.37_1.52_author_1_electron") );
-        function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.52_1.81_author_1_electron") );
-        function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.81_2.01_author_1_electron") );
-        function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.01_2.37_author_1_electron") );
-        function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.37_2.47_author_1_electron") );
-
-        function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.0_0.1_author_16_electron") );
-        function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.1_0.6_author_16_electron") );
-        function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.6_0.8_author_16_electron") );
-        function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.8_1.15_author_16_electron") );
-        function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.15_1.37_author_16_electron") );
-        function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.37_1.52_author_16_electron") );
-        function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.52_1.81_author_16_electron") );
-        function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.81_2.01_author_16_electron") );
-        function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.01_2.37_author_16_electron") );
-        function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.37_2.47_author_16_electron") );
+        m_function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.0_0.1_author_1_electron") );
+        m_function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.1_0.6_author_1_electron") );
+        m_function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.6_0.8_author_1_electron") );
+        m_function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.8_1.15_author_1_electron") );
+        m_function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.15_1.37_author_1_electron") );
+        m_function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.37_1.52_author_1_electron") );
+        m_function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.52_1.81_author_1_electron") );
+        m_function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.81_2.01_author_1_electron") );
+        m_function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.01_2.37_author_1_electron") );
+        m_function_2015_cone30_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.37_2.47_author_1_electron") );
+
+        m_function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.0_0.1_author_16_electron") );
+        m_function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.1_0.6_author_16_electron") );
+        m_function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.6_0.8_author_16_electron") );
+        m_function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_0.8_1.15_author_16_electron") );
+        m_function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.15_1.37_author_16_electron") );
+        m_function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.37_1.52_author_16_electron") );
+        m_function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.52_1.81_author_16_electron") );
+        m_function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_1.81_2.01_author_16_electron") );
+        m_function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.01_2.37_author_16_electron") );
+        m_function_2015_cone30_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone30_eta_2.37_2.47_author_16_electron") );
 
         // *** electron function topoetocone20
 
-        function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.0_0.1_author_1_electron") );
-        function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.1_0.6_author_1_electron") );
-        function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.6_0.8_author_1_electron") );
-        function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.8_1.15_author_1_electron") );
-        function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.15_1.37_author_1_electron") );
-        function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.37_1.52_author_1_electron") );
-        function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.52_1.81_author_1_electron") );
-        function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.81_2.01_author_1_electron") );
-        function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.01_2.37_author_1_electron") );
-        function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.37_2.47_author_1_electron") );
-
-        function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.0_0.1_author_16_electron") );
-        function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.1_0.6_author_16_electron") );
-        function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.6_0.8_author_16_electron") );
-        function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.8_1.15_author_16_electron") );
-        function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.15_1.37_author_16_electron") );
-        function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.37_1.52_author_16_electron") );
-        function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.52_1.81_author_16_electron") );
-        function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.81_2.01_author_16_electron") );
-        function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.01_2.37_author_16_electron") );
-        function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.37_2.47_author_16_electron") );
+        m_function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.0_0.1_author_1_electron") );
+        m_function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.1_0.6_author_1_electron") );
+        m_function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.6_0.8_author_1_electron") );
+        m_function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.8_1.15_author_1_electron") );
+        m_function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.15_1.37_author_1_electron") );
+        m_function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.37_1.52_author_1_electron") );
+        m_function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.52_1.81_author_1_electron") );
+        m_function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.81_2.01_author_1_electron") );
+        m_function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.01_2.37_author_1_electron") );
+        m_function_2015_cone20_author_1_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.37_2.47_author_1_electron") );
+
+        m_function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.0_0.1_author_16_electron") );
+        m_function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.1_0.6_author_16_electron") );
+        m_function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.6_0.8_author_16_electron") );
+        m_function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_0.8_1.15_author_16_electron") );
+        m_function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.15_1.37_author_16_electron") );
+        m_function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.37_1.52_author_16_electron") );
+        m_function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.52_1.81_author_16_electron") );
+        m_function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_1.81_2.01_author_16_electron") );
+        m_function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.01_2.37_author_16_electron") );
+        m_function_2015_cone20_author_16_electron.push_back( (TF1*) file_ptleakagecorr->Get("mean_f_topoetcone20_eta_2.37_2.47_author_16_electron") );
 
 
         // ******************************
@@ -867,81 +873,81 @@ namespace CP {
 
         // *** photon graph_histoMean topoetocone40
 
-        graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.0_0.1_converted_trouble") );
-        graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.1_0.6_converted_trouble") );
-        graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.6_0.8_converted_trouble") );
-        graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.8_1.15_converted_trouble") );
-        graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.15_1.37_converted_trouble") );
-        graph_histoMean_2015_cone40_photon_converted_trouble.push_back(  new TGraph() );
-        graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.52_1.81_converted_trouble") );
-        graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.81_2.01_converted_trouble") );
-        graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_2.01_2.37_converted_trouble") );
-        graph_histoMean_2015_cone40_photon_converted_trouble.push_back(  new TGraph() );
+        m_graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.0_0.1_converted_trouble") );
+        m_graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.1_0.6_converted_trouble") );
+        m_graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.6_0.8_converted_trouble") );
+        m_graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.8_1.15_converted_trouble") );
+        m_graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.15_1.37_converted_trouble") );
+        m_graph_histoMean_2015_cone40_photon_converted_trouble.push_back(  new TGraph() );
+        m_graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.52_1.81_converted_trouble") );
+        m_graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.81_2.01_converted_trouble") );
+        m_graph_histoMean_2015_cone40_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_2.01_2.37_converted_trouble") );
+        m_graph_histoMean_2015_cone40_photon_converted_trouble.push_back(  new TGraph() );
 
         // *** photon graph_histoMean topoetocone30
 
-        graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.0_0.1_converted_trouble") );
-        graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.1_0.6_converted_trouble") );
-        graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.6_0.8_converted_trouble") );
-        graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.8_1.15_converted_trouble") );
-        graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.15_1.37_converted_trouble") );
-        graph_histoMean_2015_cone30_photon_converted_trouble.push_back(  new TGraph() );
-        graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.52_1.81_converted_trouble") );
-        graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.81_2.01_converted_trouble") );
-        graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_2.01_2.37_converted_trouble") );
-        graph_histoMean_2015_cone30_photon_converted_trouble.push_back(  new TGraph() );
+        m_graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.0_0.1_converted_trouble") );
+        m_graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.1_0.6_converted_trouble") );
+        m_graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.6_0.8_converted_trouble") );
+        m_graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.8_1.15_converted_trouble") );
+        m_graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.15_1.37_converted_trouble") );
+        m_graph_histoMean_2015_cone30_photon_converted_trouble.push_back(  new TGraph() );
+        m_graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.52_1.81_converted_trouble") );
+        m_graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.81_2.01_converted_trouble") );
+        m_graph_histoMean_2015_cone30_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_2.01_2.37_converted_trouble") );
+        m_graph_histoMean_2015_cone30_photon_converted_trouble.push_back(  new TGraph() );
 
         // *** photon graph_histoMean topoetocone20
 
-        graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.0_0.1_converted_trouble") );
-        graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.1_0.6_converted_trouble") );
-        graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.6_0.8_converted_trouble") );
-        graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.8_1.15_converted_trouble") );
-        graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.15_1.37_converted_trouble") );
-        graph_histoMean_2015_cone20_photon_converted_trouble.push_back(  new TGraph() );
-        graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.52_1.81_converted_trouble") );
-        graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.81_2.01_converted_trouble") );
-        graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_2.01_2.37_converted_trouble") );
-        graph_histoMean_2015_cone20_photon_converted_trouble.push_back(  new TGraph() );
+        m_graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.0_0.1_converted_trouble") );
+        m_graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.1_0.6_converted_trouble") );
+        m_graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.6_0.8_converted_trouble") );
+        m_graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.8_1.15_converted_trouble") );
+        m_graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.15_1.37_converted_trouble") );
+        m_graph_histoMean_2015_cone20_photon_converted_trouble.push_back(  new TGraph() );
+        m_graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.52_1.81_converted_trouble") );
+        m_graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.81_2.01_converted_trouble") );
+        m_graph_histoMean_2015_cone20_photon_converted_trouble.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_2.01_2.37_converted_trouble") );
+        m_graph_histoMean_2015_cone20_photon_converted_trouble.push_back(  new TGraph() );
 
         // *** electron graph_histoMean topoetocone40
 
-        graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.0_0.1_author_16_electron") );
-        graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.1_0.6_author_16_electron") );
-        graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.6_0.8_author_16_electron") );
-        graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.8_1.15_author_16_electron") );
-        graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.15_1.37_author_16_electron") );
-        graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.37_1.52_author_16_electron") );
-        graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.52_1.81_author_16_electron") );
-        graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.81_2.01_author_16_electron") );
-        graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_2.01_2.37_author_16_electron") );
-        graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_2.37_2.47_author_16_electron") );
+        m_graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.0_0.1_author_16_electron") );
+        m_graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.1_0.6_author_16_electron") );
+        m_graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.6_0.8_author_16_electron") );
+        m_graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_0.8_1.15_author_16_electron") );
+        m_graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.15_1.37_author_16_electron") );
+        m_graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.37_1.52_author_16_electron") );
+        m_graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.52_1.81_author_16_electron") );
+        m_graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_1.81_2.01_author_16_electron") );
+        m_graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_2.01_2.37_author_16_electron") );
+        m_graph_histoMean_2015_cone40_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone40_eta_2.37_2.47_author_16_electron") );
 
         // *** electron graph_histoMean topoetocone30
 
-        graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.0_0.1_author_16_electron") );
-        graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.1_0.6_author_16_electron") );
-        graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.6_0.8_author_16_electron") );
-        graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.8_1.15_author_16_electron") );
-        graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.15_1.37_author_16_electron") );
-        graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.37_1.52_author_16_electron") );
-        graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.52_1.81_author_16_electron") );
-        graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.81_2.01_author_16_electron") );
-        graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_2.01_2.37_author_16_electron") );
-        graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_2.37_2.47_author_16_electron") );
+        m_graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.0_0.1_author_16_electron") );
+        m_graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.1_0.6_author_16_electron") );
+        m_graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.6_0.8_author_16_electron") );
+        m_graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_0.8_1.15_author_16_electron") );
+        m_graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.15_1.37_author_16_electron") );
+        m_graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.37_1.52_author_16_electron") );
+        m_graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.52_1.81_author_16_electron") );
+        m_graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_1.81_2.01_author_16_electron") );
+        m_graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_2.01_2.37_author_16_electron") );
+        m_graph_histoMean_2015_cone30_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone30_eta_2.37_2.47_author_16_electron") );
 
         // *** electron graph_histoMean topoetocone20
 
-        graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.0_0.1_author_16_electron") );
-        graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.1_0.6_author_16_electron") );
-        graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.6_0.8_author_16_electron") );
-        graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.8_1.15_author_16_electron") );
-        graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.15_1.37_author_16_electron") );
-        graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.37_1.52_author_16_electron") );
-        graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.52_1.81_author_16_electron") );
-        graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.81_2.01_author_16_electron") );
-        graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_2.01_2.37_author_16_electron") );
-        graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_2.37_2.47_author_16_electron") );
+        m_graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.0_0.1_author_16_electron") );
+        m_graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.1_0.6_author_16_electron") );
+        m_graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.6_0.8_author_16_electron") );
+        m_graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_0.8_1.15_author_16_electron") );
+        m_graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.15_1.37_author_16_electron") );
+        m_graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.37_1.52_author_16_electron") );
+        m_graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.52_1.81_author_16_electron") );
+        m_graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_1.81_2.01_author_16_electron") );
+        m_graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_2.01_2.37_author_16_electron") );
+        m_graph_histoMean_2015_cone20_author_16_electron.push_back( (TGraph*) file_ptleakagecorr->Get("mean_g_histo_topoetcone20_eta_2.37_2.47_author_16_electron") );
 
       }
     }
@@ -989,20 +995,20 @@ namespace CP {
           graph_shift.push_back( (TGraphAsymmErrors*) file_ddshiftcorr->Get("graph_12") );
           graph_shift.push_back( (TGraphAsymmErrors*) file_ddshiftcorr->Get("graph_13") );
 
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(0)->GetFunction("f") );
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(1)->GetFunction("f") );
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(2)->GetFunction("f") );
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(3)->GetFunction("f") );
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(4)->GetFunction("f") );
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(5)->GetFunction("f") );
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(6)->GetFunction("f") );
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(7)->GetFunction("f") );
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(8)->GetFunction("f_2") );
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(9)->GetFunction("f_2") );
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(10)->GetFunction("f_2") );
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(11)->GetFunction("f_2") );
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(12)->GetFunction("f_2") );
-          graph_dd_cone40_photon_shift.push_back( graph_shift.at(13)->GetFunction("f_2") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(0)->GetFunction("f") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(1)->GetFunction("f") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(2)->GetFunction("f") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(3)->GetFunction("f") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(4)->GetFunction("f") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(5)->GetFunction("f") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(6)->GetFunction("f") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(7)->GetFunction("f") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(8)->GetFunction("f_2") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(9)->GetFunction("f_2") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(10)->GetFunction("f_2") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(11)->GetFunction("f_2") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(12)->GetFunction("f_2") );
+          m_graph_dd_cone40_photon_shift.push_back( graph_shift.at(13)->GetFunction("f_2") );
 
 	  // Photon smearing corrections (to be applied in end caps only)
 	  std::vector<TGraphAsymmErrors*> graph_smearing;
@@ -1021,20 +1027,20 @@ namespace CP {
           graph_smearing.push_back( (TGraphAsymmErrors*) file_ddsmearingcorr->Get("graph_12") );
           graph_smearing.push_back( (TGraphAsymmErrors*) file_ddsmearingcorr->Get("graph_13") );
 
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(0)->GetFunction("f_3") );
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(1)->GetFunction("f_3") );
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(2)->GetFunction("f_3") );
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(3)->GetFunction("f_3") );
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(4)->GetFunction("f_3") );
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(5)->GetFunction("f_3") );
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(6)->GetFunction("f_3") );
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(7)->GetFunction("f_3") );
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(8)->GetFunction("f_3") );
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(9)->GetFunction("f_3") );
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(10)->GetFunction("f_3") );
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(11)->GetFunction("f_3") );
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(12)->GetFunction("f_3") );
-          graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(13)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(0)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(1)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(2)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(3)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(4)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(5)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(6)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(7)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(8)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(9)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(10)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(11)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(12)->GetFunction("f_3") );
+          m_graph_dd_cone40_photon_smearing.push_back( graph_smearing.at(13)->GetFunction("f_3") );
 
     }
   }
@@ -1054,107 +1060,107 @@ namespace CP {
     m_eta_bins_coarse.clear();
 
     if (m_tool_ver == REL17_2) {
-      FreeClear( graph_cone40_photon_unconverted );
-      FreeClear( graph_cone30_photon_unconverted );
-      FreeClear( graph_cone20_photon_unconverted );
+      FreeClear( m_graph_cone40_photon_unconverted );
+      FreeClear( m_graph_cone30_photon_unconverted );
+      FreeClear( m_graph_cone20_photon_unconverted );
 
-      FreeClear( graph_cone40_photon_converted );
-      FreeClear( graph_cone30_photon_converted );
-      FreeClear( graph_cone20_photon_converted );
+      FreeClear( m_graph_cone40_photon_converted );
+      FreeClear( m_graph_cone30_photon_converted );
+      FreeClear( m_graph_cone20_photon_converted );
 
-      FreeClear( graph_cone40_electron );
-      FreeClear( graph_cone30_electron );
-      FreeClear( graph_cone20_electron );
+      FreeClear( m_graph_cone40_electron );
+      FreeClear( m_graph_cone30_electron );
+      FreeClear( m_graph_cone20_electron );
 
-      FreeClear( graph_dd_cone40_photon_shift );
-      FreeClear( graph_dd_cone40_photon_smearing );
+      FreeClear( m_graph_dd_cone40_photon_shift );
+      FreeClear( m_graph_dd_cone40_photon_smearing );
 
     } else if (m_tool_ver == REL20_2) {
 
       //---- Rel 20_2 pT leakage correction file
-      FreeClear( function_2015_cone40_photon_unconverted );
-      FreeClear( function_2015_cone30_photon_unconverted );
-      FreeClear( function_2015_cone20_photon_unconverted );
+      FreeClear( m_function_2015_cone40_photon_unconverted );
+      FreeClear( m_function_2015_cone30_photon_unconverted );
+      FreeClear( m_function_2015_cone20_photon_unconverted );
 
-      FreeClear( function_2015_cone40_photon_converted_ok );
-      FreeClear( function_2015_cone30_photon_converted_ok );
-      FreeClear( function_2015_cone20_photon_converted_ok );
+      FreeClear( m_function_2015_cone40_photon_converted_ok );
+      FreeClear( m_function_2015_cone30_photon_converted_ok );
+      FreeClear( m_function_2015_cone20_photon_converted_ok );
 
-      FreeClear( function_2015_cone40_photon_converted_trouble );
-      FreeClear( function_2015_cone30_photon_converted_trouble );
-      FreeClear( function_2015_cone20_photon_converted_trouble );
+      FreeClear( m_function_2015_cone40_photon_converted_trouble );
+      FreeClear( m_function_2015_cone30_photon_converted_trouble );
+      FreeClear( m_function_2015_cone20_photon_converted_trouble );
 
-      FreeClear( function_2015_cone40_author_1_electron );
-      FreeClear( function_2015_cone30_author_1_electron );
-      FreeClear( function_2015_cone20_author_1_electron );
+      FreeClear( m_function_2015_cone40_author_1_electron );
+      FreeClear( m_function_2015_cone30_author_1_electron );
+      FreeClear( m_function_2015_cone20_author_1_electron );
 
-      FreeClear( function_2015_cone40_author_16_electron );
-      FreeClear( function_2015_cone30_author_16_electron );
-      FreeClear( function_2015_cone20_author_16_electron );
+      FreeClear( m_function_2015_cone40_author_16_electron );
+      FreeClear( m_function_2015_cone30_author_16_electron );
+      FreeClear( m_function_2015_cone20_author_16_electron );
 
 
       //---- Rel 20_2 pT leakage correction with histogram mean file
 
-      FreeClear( graph_histoMean_2015_cone40_photon_converted_trouble );
-      FreeClear( graph_histoMean_2015_cone30_photon_converted_trouble );
-      FreeClear( graph_histoMean_2015_cone20_photon_converted_trouble );
+      FreeClear( m_graph_histoMean_2015_cone40_photon_converted_trouble );
+      FreeClear( m_graph_histoMean_2015_cone30_photon_converted_trouble );
+      FreeClear( m_graph_histoMean_2015_cone20_photon_converted_trouble );
 
-      FreeClear( graph_histoMean_2015_cone40_author_16_electron );
-      FreeClear( graph_histoMean_2015_cone30_author_16_electron );
-      FreeClear( graph_histoMean_2015_cone20_author_16_electron );
+      FreeClear( m_graph_histoMean_2015_cone40_author_16_electron );
+      FreeClear( m_graph_histoMean_2015_cone30_author_16_electron );
+      FreeClear( m_graph_histoMean_2015_cone20_author_16_electron );
 
     }
 
     if (m_corr_ddshift_2015_file != "") {
-      FreeClear(graph_dd_2015_cone40_unconv_photon_shift);
-      FreeClear(graph_dd_2015_cone40_conv_photon_shift);
-      FreeClear(graph_dd_2015_cone20_unconv_photon_shift);
-      FreeClear(graph_dd_2015_cone20_conv_photon_shift);
+      FreeClear(m_graph_dd_2015_cone40_unconv_photon_shift);
+      FreeClear(m_graph_dd_2015_cone40_conv_photon_shift);
+      FreeClear(m_graph_dd_2015_cone20_unconv_photon_shift);
+      FreeClear(m_graph_dd_2015_cone20_conv_photon_shift);
     }
 
     // For etcone, we only have very old corrections...
-    mc_rel17_leakage_correction_slopes_electron_15.clear();
-    mc_rel17_leakage_correction_slopes_electron_20.clear();
-    mc_rel17_leakage_correction_slopes_electron_25.clear();
-    mc_rel17_leakage_correction_slopes_electron_30.clear();
-    mc_rel17_leakage_correction_slopes_electron_35.clear();
-    mc_rel17_leakage_correction_slopes_electron_40.clear();
-
-    mc_rel17_leakage_correction_offsets_electron_15.clear();
-    mc_rel17_leakage_correction_offsets_electron_20.clear();
-    mc_rel17_leakage_correction_offsets_electron_25.clear();
-    mc_rel17_leakage_correction_offsets_electron_30.clear();
-    mc_rel17_leakage_correction_offsets_electron_35.clear();
-    mc_rel17_leakage_correction_offsets_electron_40.clear();
+    m_mc_rel17_leakage_correction_slopes_electron_15.clear();
+    m_mc_rel17_leakage_correction_slopes_electron_20.clear();
+    m_mc_rel17_leakage_correction_slopes_electron_25.clear();
+    m_mc_rel17_leakage_correction_slopes_electron_30.clear();
+    m_mc_rel17_leakage_correction_slopes_electron_35.clear();
+    m_mc_rel17_leakage_correction_slopes_electron_40.clear();
+
+    m_mc_rel17_leakage_correction_offsets_electron_15.clear();
+    m_mc_rel17_leakage_correction_offsets_electron_20.clear();
+    m_mc_rel17_leakage_correction_offsets_electron_25.clear();
+    m_mc_rel17_leakage_correction_offsets_electron_30.clear();
+    m_mc_rel17_leakage_correction_offsets_electron_35.clear();
+    m_mc_rel17_leakage_correction_offsets_electron_40.clear();
 
     // photons: last eta bin isn't used
-    mc_rel17_leakage_correction_slopes_photon_converted_15.clear();
-    mc_rel17_leakage_correction_slopes_photon_converted_20.clear();
-    mc_rel17_leakage_correction_slopes_photon_converted_25.clear();
-    mc_rel17_leakage_correction_slopes_photon_converted_30.clear();
-    mc_rel17_leakage_correction_slopes_photon_converted_35.clear();
-    mc_rel17_leakage_correction_slopes_photon_converted_40.clear();
-
-    mc_rel17_leakage_correction_offsets_photon_converted_15.clear();
-    mc_rel17_leakage_correction_offsets_photon_converted_20.clear();
-    mc_rel17_leakage_correction_offsets_photon_converted_25.clear();
-    mc_rel17_leakage_correction_offsets_photon_converted_30.clear();
-    mc_rel17_leakage_correction_offsets_photon_converted_35.clear();
-    mc_rel17_leakage_correction_offsets_photon_converted_40.clear();
-
-    mc_rel17_leakage_correction_slopes_photon_unconverted_15.clear();
-    mc_rel17_leakage_correction_slopes_photon_unconverted_20.clear();
-    mc_rel17_leakage_correction_slopes_photon_unconverted_25.clear();
-    mc_rel17_leakage_correction_slopes_photon_unconverted_30.clear();
-    mc_rel17_leakage_correction_slopes_photon_unconverted_35.clear();
-    mc_rel17_leakage_correction_slopes_photon_unconverted_40.clear();
-
-    mc_rel17_leakage_correction_offsets_photon_unconverted_15.clear();
-    mc_rel17_leakage_correction_offsets_photon_unconverted_20.clear();
-    mc_rel17_leakage_correction_offsets_photon_unconverted_25.clear();
-    mc_rel17_leakage_correction_offsets_photon_unconverted_30.clear();
-    mc_rel17_leakage_correction_offsets_photon_unconverted_35.clear();
-    mc_rel17_leakage_correction_offsets_photon_unconverted_40.clear();
+    m_mc_rel17_leakage_correction_slopes_photon_converted_15.clear();
+    m_mc_rel17_leakage_correction_slopes_photon_converted_20.clear();
+    m_mc_rel17_leakage_correction_slopes_photon_converted_25.clear();
+    m_mc_rel17_leakage_correction_slopes_photon_converted_30.clear();
+    m_mc_rel17_leakage_correction_slopes_photon_converted_35.clear();
+    m_mc_rel17_leakage_correction_slopes_photon_converted_40.clear();
+
+    m_mc_rel17_leakage_correction_offsets_photon_converted_15.clear();
+    m_mc_rel17_leakage_correction_offsets_photon_converted_20.clear();
+    m_mc_rel17_leakage_correction_offsets_photon_converted_25.clear();
+    m_mc_rel17_leakage_correction_offsets_photon_converted_30.clear();
+    m_mc_rel17_leakage_correction_offsets_photon_converted_35.clear();
+    m_mc_rel17_leakage_correction_offsets_photon_converted_40.clear();
+
+    m_mc_rel17_leakage_correction_slopes_photon_unconverted_15.clear();
+    m_mc_rel17_leakage_correction_slopes_photon_unconverted_20.clear();
+    m_mc_rel17_leakage_correction_slopes_photon_unconverted_25.clear();
+    m_mc_rel17_leakage_correction_slopes_photon_unconverted_30.clear();
+    m_mc_rel17_leakage_correction_slopes_photon_unconverted_35.clear();
+    m_mc_rel17_leakage_correction_slopes_photon_unconverted_40.clear();
+
+    m_mc_rel17_leakage_correction_offsets_photon_unconverted_15.clear();
+    m_mc_rel17_leakage_correction_offsets_photon_unconverted_20.clear();
+    m_mc_rel17_leakage_correction_offsets_photon_unconverted_25.clear();
+    m_mc_rel17_leakage_correction_offsets_photon_unconverted_30.clear();
+    m_mc_rel17_leakage_correction_offsets_photon_unconverted_35.clear();
+    m_mc_rel17_leakage_correction_offsets_photon_unconverted_40.clear();
 
     // -------------------------------------------------------------------------------------------
     //Delete m_shower instance
@@ -1216,7 +1222,7 @@ namespace CP {
 					       float etaS2, float etaPointing, float etaCluster,
 					       float radius,
 					       bool is_mc,
-					       bool isConversion, ParticleType parttype){
+					       bool isConversion, ParticleType parttype) const {
 
     int newrad = GetRadius(radius);
     std::vector<float> mc_correction_slopes_ptr;
@@ -1231,17 +1237,17 @@ namespace CP {
 	// photons
 	if(isConversion) {
 	  // converted
-	  mc_correction_slopes_ptr = mc_rel17_leakage_correction_slopes_photon_converted_20;
-	  mc_correction_offsets_ptr = mc_rel17_leakage_correction_offsets_photon_converted_20;
+	  mc_correction_slopes_ptr = m_mc_rel17_leakage_correction_slopes_photon_converted_20;
+	  mc_correction_offsets_ptr = m_mc_rel17_leakage_correction_offsets_photon_converted_20;
 	} else {
 	  // unconverted
-	  mc_correction_slopes_ptr = mc_rel17_leakage_correction_slopes_photon_unconverted_20;
-	  mc_correction_offsets_ptr = mc_rel17_leakage_correction_offsets_photon_unconverted_20;
+	  mc_correction_slopes_ptr = m_mc_rel17_leakage_correction_slopes_photon_unconverted_20;
+	  mc_correction_offsets_ptr = m_mc_rel17_leakage_correction_offsets_photon_unconverted_20;
 	}
       } else {
 	// electrons
-	mc_correction_slopes_ptr = mc_rel17_leakage_correction_slopes_electron_20;
-	mc_correction_offsets_ptr = mc_rel17_leakage_correction_offsets_electron_20;
+	mc_correction_slopes_ptr = m_mc_rel17_leakage_correction_slopes_electron_20;
+	mc_correction_offsets_ptr = m_mc_rel17_leakage_correction_offsets_electron_20;
       }
       break;
     case 30:
@@ -1249,17 +1255,17 @@ namespace CP {
 	// photons
 	if(isConversion) {
 	  // converted
-	  mc_correction_slopes_ptr = mc_rel17_leakage_correction_slopes_photon_converted_30;
-	  mc_correction_offsets_ptr = mc_rel17_leakage_correction_offsets_photon_converted_30;
+	  mc_correction_slopes_ptr = m_mc_rel17_leakage_correction_slopes_photon_converted_30;
+	  mc_correction_offsets_ptr = m_mc_rel17_leakage_correction_offsets_photon_converted_30;
 	} else {
 	  // unconverted
-	  mc_correction_slopes_ptr = mc_rel17_leakage_correction_slopes_photon_unconverted_30;
-	  mc_correction_offsets_ptr = mc_rel17_leakage_correction_offsets_photon_unconverted_30;
+	  mc_correction_slopes_ptr = m_mc_rel17_leakage_correction_slopes_photon_unconverted_30;
+	  mc_correction_offsets_ptr = m_mc_rel17_leakage_correction_offsets_photon_unconverted_30;
 	}
       } else {
 	// electrons
-	mc_correction_slopes_ptr = mc_rel17_leakage_correction_slopes_electron_30;
-	mc_correction_offsets_ptr = mc_rel17_leakage_correction_offsets_electron_30;
+	mc_correction_slopes_ptr = m_mc_rel17_leakage_correction_slopes_electron_30;
+	mc_correction_offsets_ptr = m_mc_rel17_leakage_correction_offsets_electron_30;
       }
       break;
     case 40:
@@ -1267,17 +1273,17 @@ namespace CP {
 	// photons
 	if(isConversion) {
 	  // converted
-	  mc_correction_slopes_ptr = mc_rel17_leakage_correction_slopes_photon_converted_40;
-	  mc_correction_offsets_ptr = mc_rel17_leakage_correction_offsets_photon_converted_40;
+	  mc_correction_slopes_ptr = m_mc_rel17_leakage_correction_slopes_photon_converted_40;
+	  mc_correction_offsets_ptr = m_mc_rel17_leakage_correction_offsets_photon_converted_40;
 	} else {
 	  // unconverted
-	  mc_correction_slopes_ptr = mc_rel17_leakage_correction_slopes_photon_unconverted_40;
-	  mc_correction_offsets_ptr = mc_rel17_leakage_correction_offsets_photon_unconverted_40;
+	  mc_correction_slopes_ptr = m_mc_rel17_leakage_correction_slopes_photon_unconverted_40;
+	  mc_correction_offsets_ptr = m_mc_rel17_leakage_correction_offsets_photon_unconverted_40;
 	}
       } else {
 	// electrons
-	mc_correction_slopes_ptr = mc_rel17_leakage_correction_slopes_electron_40;
-	mc_correction_offsets_ptr = mc_rel17_leakage_correction_offsets_electron_40;
+	mc_correction_slopes_ptr = m_mc_rel17_leakage_correction_slopes_electron_40;
+	mc_correction_offsets_ptr = m_mc_rel17_leakage_correction_offsets_electron_40;
       }
       break;
     default:
@@ -1303,9 +1309,9 @@ namespace CP {
   float IsolationCorrection::GetPtCorrectionTopo(float energy,
 						 float etaS2, float etaPointing, float etaCluster,
 						 float radius,
-						 bool is_mc,
+						 bool /*is_mc*/,
 						 bool isConversion, ParticleType parttype, Version ver,
-						 int convFlag_int, int author, float conv_radius, float conv_ratio){
+						 int convFlag_int, int author, float conv_radius, float conv_ratio) const {
     double correction_value = 0.;
     if (ver== REL17_2) {
       correction_value = GetPtCorrection_FromGraph(energy,etaS2,etaPointing,etaCluster,radius,isConversion,parttype);
@@ -1321,7 +1327,7 @@ namespace CP {
   //-----------------------------------------------------------------------
   // Internal function
   // Used to retrieve the correct radius
-  int IsolationCorrection::GetRadius(float radius){
+  int IsolationCorrection::GetRadius(float radius) const {
     int newrad = 0;
     // avoid roundoff errors by adding 0.1
     if(radius < 1)    newrad = (int)(radius * 100 + 0.1);
@@ -1335,7 +1341,7 @@ namespace CP {
   // Internal function
   // Used to retrieve the correct (fine) eta bin number
   //
-  int IsolationCorrection::GetEtaBinFine(float eta){
+  int IsolationCorrection::GetEtaBinFine(float eta) const {
     int eta_bin=-1;
     float fabs_eta = fabs(eta);
     for (unsigned int i=0; i < m_nBinsEtaFine; ++i) {
@@ -1353,7 +1359,7 @@ namespace CP {
   // Internal function
   // Used to retrieve the correct (coarse) eta bin number
   //
-  int IsolationCorrection::GetEtaBinCoarse(float eta){
+  int IsolationCorrection::GetEtaBinCoarse(float eta) const {
     int eta_bin=-1;
     float fabs_eta = fabs(eta);
     for (unsigned int i=0; i < m_nBinsEtaCoarse; ++i) {
@@ -1371,7 +1377,7 @@ namespace CP {
   // Internal function
   // Used to retrieve the correct (dd) eta bin number
   //
-  int IsolationCorrection::GetEtaBinDD(float eta){
+  int IsolationCorrection::GetEtaBinDD(float eta) const {
     int eta_bin=-1;
     float fabs_eta = fabs(eta);
     for (unsigned int i=0; i < m_nBinsEtaDD; ++i) {
@@ -1391,7 +1397,7 @@ namespace CP {
   //
   float IsolationCorrection::GetPtCorrectionFactor(float eta,
 						   std::vector<float> mc_leakage_corrections_ptr,
-						   std::vector<float> data_leakage_corrections_ptr){
+						   std::vector<float> data_leakage_corrections_ptr) const {
     if(mc_leakage_corrections_ptr.empty() && data_leakage_corrections_ptr.empty())
       return 0.;
 
@@ -1409,7 +1415,7 @@ namespace CP {
   //-----------------------------------------------------------------------
   // Internal function
   // Does the final pt scaling
-  float IsolationCorrection::GetPtCorrectionValue(float energy, float etaPointing, float etaCluster, float scale_factor){
+  float IsolationCorrection::GetPtCorrectionValue(float energy, float etaPointing, float etaCluster, float scale_factor) const {
     // apply the correction to et
     double etaForPt = ((fabs(etaPointing - etaCluster) < 0.15) ? etaPointing : etaCluster);
     double et = (fabs(etaForPt)<99.) ? energy/cosh(etaForPt) : 0.;
@@ -1423,7 +1429,7 @@ namespace CP {
   // Internal function
   // Does the correction for REL17_2 from TGraph stored into isolation_leakage_corrections.root file
   // Returns the correction value in MeV
-  float IsolationCorrection::GetPtCorrection_FromGraph(float energy,float etaS2,float etaPointing,float etaCluster,float radius,bool isConversion,ParticleType parttype)
+  float IsolationCorrection::GetPtCorrection_FromGraph(float energy,float etaS2,float etaPointing,float etaCluster,float radius,bool isConversion,ParticleType parttype) const
   {
     int newrad = GetRadius(radius);
     double etaForPt = ((fabs(etaPointing - etaCluster) < 0.15) ? etaPointing : etaCluster);
@@ -1443,24 +1449,24 @@ namespace CP {
     switch(newrad){
     case 20:
       if(parttype == ELECTRON)
-	correction_value_mev = GeV*graph_cone20_electron[etabin]->Eval(et/GeV);
+	correction_value_mev = GeV*m_graph_cone20_electron[etabin]->Eval(et/GeV);
       else
-	if(isConversion) correction_value_mev = GeV*graph_cone20_photon_converted[etabin]->Eval(et/GeV);
-	else correction_value_mev = GeV*graph_cone20_photon_unconverted[etabin]->Eval(et/GeV);
+	if(isConversion) correction_value_mev = GeV*m_graph_cone20_photon_converted[etabin]->Eval(et/GeV);
+	else correction_value_mev = GeV*m_graph_cone20_photon_unconverted[etabin]->Eval(et/GeV);
       break;
     case 30:
       if(parttype == ELECTRON)
-	correction_value_mev = GeV*graph_cone30_electron[etabin]->Eval(et/GeV);
+	correction_value_mev = GeV*m_graph_cone30_electron[etabin]->Eval(et/GeV);
       else
-	if(isConversion) correction_value_mev = GeV*graph_cone30_photon_converted[etabin]->Eval(et/GeV);
-	else correction_value_mev = GeV*graph_cone30_photon_unconverted[etabin]->Eval(et/GeV);
+	if(isConversion) correction_value_mev = GeV*m_graph_cone30_photon_converted[etabin]->Eval(et/GeV);
+	else correction_value_mev = GeV*m_graph_cone30_photon_unconverted[etabin]->Eval(et/GeV);
       break;
     case 40:
       if(parttype == ELECTRON)
-	correction_value_mev = GeV*graph_cone40_electron[etabin]->Eval(et/GeV);
+	correction_value_mev = GeV*m_graph_cone40_electron[etabin]->Eval(et/GeV);
       else
-	if(isConversion) correction_value_mev = GeV*graph_cone40_photon_converted[etabin]->Eval(et/GeV);
-	else correction_value_mev = GeV*graph_cone40_photon_unconverted[etabin]->Eval(et/GeV);
+	if(isConversion) correction_value_mev = GeV*m_graph_cone40_photon_converted[etabin]->Eval(et/GeV);
+	else correction_value_mev = GeV*m_graph_cone40_photon_unconverted[etabin]->Eval(et/GeV);
       break;
     default:
     	ATH_MSG_WARNING("Unable to retrieve leakage correction for topoIso cone with radius = " << radius << ".\n--- Radii must be one of {.20, .30, .40} OR {20, 30, 40}.\n");
@@ -1485,7 +1491,7 @@ namespace CP {
     return 0;
   }
 
-  float IsolationCorrection::GetPtCorrection_FromGraph_2015(float energy, float etaS2, float radius, int conversion_flag, int author, float conv_radius, float conv_ratio, ParticleType parttype){
+  float IsolationCorrection::GetPtCorrection_FromGraph_2015(float energy, float etaS2, float radius, int conversion_flag, int author, float conv_radius, float conv_ratio, ParticleType parttype) const {
     int newrad = GetRadius(radius);
     double etaForPt = etaS2; //((fabs(etaPointing - etaCluster) < 0.15) ? etaPointing : etaCluster);
     double et = energy/cosh(etaForPt); //(fabs(etaForPt)<99.) ? energy/cosh(etaForPt) : 0.;
@@ -1512,49 +1518,49 @@ namespace CP {
     switch(newrad){
       case 20:
         if(parttype == ELECTRON){
-          if(author == 1) correction_value_mev = function_2015_cone20_author_1_electron[etabin]->Eval(et);
+          if(author == 1) correction_value_mev = m_function_2015_cone20_author_1_electron[etabin]->Eval(et);
           if(author == 16){
-            if(m_trouble_categories && et < pt_threshold) correction_value_mev = graph_histoMean_2015_cone20_author_16_electron[etabin]->Eval(et);
-            else correction_value_mev = function_2015_cone20_author_16_electron[etabin]->Eval(et);
+            if(m_trouble_categories && et < pt_threshold) correction_value_mev = m_graph_histoMean_2015_cone20_author_16_electron[etabin]->Eval(et);
+            else correction_value_mev = m_function_2015_cone20_author_16_electron[etabin]->Eval(et);
           }
         }else{
-          if(conversion_type == 0) correction_value_mev = function_2015_cone20_photon_unconverted[etabin]->Eval(et);
-          if(conversion_type == 1) correction_value_mev = function_2015_cone20_photon_converted_ok[etabin]->Eval(et);
+          if(conversion_type == 0) correction_value_mev = m_function_2015_cone20_photon_unconverted[etabin]->Eval(et);
+          if(conversion_type == 1) correction_value_mev = m_function_2015_cone20_photon_converted_ok[etabin]->Eval(et);
           if(conversion_type == 2){
-            if(m_trouble_categories && et < pt_threshold) correction_value_mev = graph_histoMean_2015_cone20_photon_converted_trouble[etabin]->Eval(et);
-            else correction_value_mev = function_2015_cone20_photon_converted_trouble[etabin]->Eval(et);
+            if(m_trouble_categories && et < pt_threshold) correction_value_mev = m_graph_histoMean_2015_cone20_photon_converted_trouble[etabin]->Eval(et);
+            else correction_value_mev = m_function_2015_cone20_photon_converted_trouble[etabin]->Eval(et);
           }
         }
         break;
       case 30:
         if(parttype == ELECTRON){
-          if(author == 1) correction_value_mev = function_2015_cone30_author_1_electron[etabin]->Eval(et);
+          if(author == 1) correction_value_mev = m_function_2015_cone30_author_1_electron[etabin]->Eval(et);
           if(author == 16) {
-            if(m_trouble_categories && et < pt_threshold) correction_value_mev = graph_histoMean_2015_cone30_author_16_electron[etabin]->Eval(et);
-            else correction_value_mev = function_2015_cone30_author_16_electron[etabin]->Eval(et);
+            if(m_trouble_categories && et < pt_threshold) correction_value_mev = m_graph_histoMean_2015_cone30_author_16_electron[etabin]->Eval(et);
+            else correction_value_mev = m_function_2015_cone30_author_16_electron[etabin]->Eval(et);
           }
         }else{
-          if(conversion_type == 0) correction_value_mev = function_2015_cone30_photon_unconverted[etabin]->Eval(et);
-          if(conversion_type == 1) correction_value_mev = function_2015_cone30_photon_converted_ok[etabin]->Eval(et);
+          if(conversion_type == 0) correction_value_mev = m_function_2015_cone30_photon_unconverted[etabin]->Eval(et);
+          if(conversion_type == 1) correction_value_mev = m_function_2015_cone30_photon_converted_ok[etabin]->Eval(et);
           if(conversion_type == 2){
-            if(m_trouble_categories && et < pt_threshold) correction_value_mev = graph_histoMean_2015_cone30_photon_converted_trouble[etabin]->Eval(et);
-            else correction_value_mev = function_2015_cone30_photon_converted_trouble[etabin]->Eval(et);
+            if(m_trouble_categories && et < pt_threshold) correction_value_mev = m_graph_histoMean_2015_cone30_photon_converted_trouble[etabin]->Eval(et);
+            else correction_value_mev = m_function_2015_cone30_photon_converted_trouble[etabin]->Eval(et);
           }
         }
         break;
       case 40:
         if(parttype == ELECTRON){
-          if(author == 1) correction_value_mev = function_2015_cone40_author_1_electron[etabin]->Eval(et);
+          if(author == 1) correction_value_mev = m_function_2015_cone40_author_1_electron[etabin]->Eval(et);
           if(author == 16){
-            if(m_trouble_categories && et < pt_threshold) correction_value_mev = graph_histoMean_2015_cone40_author_16_electron[etabin]->Eval(et);
-            else correction_value_mev = function_2015_cone40_author_16_electron[etabin]->Eval(et);
+            if(m_trouble_categories && et < pt_threshold) correction_value_mev = m_graph_histoMean_2015_cone40_author_16_electron[etabin]->Eval(et);
+            else correction_value_mev = m_function_2015_cone40_author_16_electron[etabin]->Eval(et);
           }
         }else{
-          if(conversion_type == 0) correction_value_mev = function_2015_cone40_photon_unconverted[etabin]->Eval(et);
-          if(conversion_type == 1) correction_value_mev = function_2015_cone40_photon_converted_ok[etabin]->Eval(et);
+          if(conversion_type == 0) correction_value_mev = m_function_2015_cone40_photon_unconverted[etabin]->Eval(et);
+          if(conversion_type == 1) correction_value_mev = m_function_2015_cone40_photon_converted_ok[etabin]->Eval(et);
           if(conversion_type == 2){
-            if(m_trouble_categories && et < pt_threshold) correction_value_mev = graph_histoMean_2015_cone40_photon_converted_trouble[etabin]->Eval(et);
-            else correction_value_mev = function_2015_cone40_photon_converted_trouble[etabin]->Eval(et);
+            if(m_trouble_categories && et < pt_threshold) correction_value_mev = m_graph_histoMean_2015_cone40_photon_converted_trouble[etabin]->Eval(et);
+            else correction_value_mev = m_function_2015_cone40_photon_converted_trouble[etabin]->Eval(et);
           }
         }
         break;
diff --git a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/Root/IsolationCorrectionTool.cxx b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/Root/IsolationCorrectionTool.cxx
index 32c7704a3532cac3c4e62b0407b335ade5b79b93..aaf00f997b792c20a557d6c976e0618210b894e7 100644
--- a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/Root/IsolationCorrectionTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/Root/IsolationCorrectionTool.cxx
@@ -121,7 +121,7 @@ namespace CP {
     static SG::AuxElement::Decorator<float> decDDcor20("topoetcone20_DDcorr");
     static SG::AuxElement::Decorator<float> decDDcor40("topoetcone40_DDcorr");
 	
-    std::vector<xAOD::Iso::IsolationType> topoisolation_types = {xAOD::Iso::topoetcone20,
+    static const std::vector<xAOD::Iso::IsolationType> topoisolation_types = {xAOD::Iso::topoetcone20,
 								 xAOD::Iso::topoetcone30,
 								 xAOD::Iso::topoetcone40};
     for (auto type : topoisolation_types) {
@@ -131,20 +131,20 @@ namespace CP {
       bool gotIso   = eg.isolationValue(oldiso,type);
       if (!gotIso) continue;
       if (eg.pt() > 25e3) 
-	ATH_MSG_DEBUG("pt = " << eg.pt() << " eta = " << eg.eta() << ", def Iso " << xAOD::Iso::toString(type) << " = " << oldiso
+        ATH_MSG_DEBUG("pt = " << eg.pt() << " eta = " << eg.eta() << ", def Iso " << xAOD::Iso::toString(type) << " = " << oldiso
 		      << " old leak = " << oldleak << " new leak = " << newleak);
       float iso     = oldiso + (oldleak-newleak);
       float ddcorr  = 0;
       if (m_is_mc && m_apply_dd && type != xAOD::Iso::topoetcone30) {
-	ddcorr = this->GetDDCorrection(eg,type);
-	if (type == xAOD::Iso::topoetcone20)
-	  decDDcor20(eg) = ddcorr;
-	else if (type == xAOD::Iso::topoetcone40)
-	  decDDcor40(eg) = ddcorr;
-	iso += ddcorr;
+        ddcorr = this->GetDDCorrection(eg,type);
+        if (type == xAOD::Iso::topoetcone20)
+          decDDcor20(eg) = ddcorr;
+        else if (type == xAOD::Iso::topoetcone40)
+          decDDcor40(eg) = ddcorr;
+        iso += ddcorr;
       }
       if (eg.pt() > 25e3) 
-	ATH_MSG_DEBUG("ddcor = " << ddcorr << " new Iso = " << iso << "\n");
+        ATH_MSG_DEBUG("ddcor = " << ddcorr << " new Iso = " << iso << "\n");
       bool setIso = eg.setIsolationValue(iso,type);
       setIso = (setIso && eg.setIsolationCaloCorrection(newleak-ddcorr,type,xAOD::Iso::ptCorrection));
       if (!setIso) {
@@ -158,7 +158,7 @@ namespace CP {
   float IsolationCorrectionTool::GetPtCorrectedIsolation(const xAOD::Egamma& input, xAOD::Iso::IsolationType isol){
     return m_isol_corr->GetPtCorrectedIsolation(input, isol);
   }
-  float IsolationCorrectionTool::GetPtCorrection(const xAOD::Egamma& input, xAOD::Iso::IsolationType isol){
+  float IsolationCorrectionTool::GetPtCorrection(const xAOD::Egamma& input, xAOD::Iso::IsolationType isol) const {
     return m_isol_corr->GetPtCorrection(input, isol);
   }
   
diff --git a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/Root/ShowerDepthTool.cxx b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/Root/ShowerDepthTool.cxx
index c8a22b326c5f89448149ad48b17375eb05249979..fbb4e5f25713533d61e5929efabcd9ff9279d4c4 100644
--- a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/Root/ShowerDepthTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/Root/ShowerDepthTool.cxx
@@ -15,10 +15,11 @@
 
 #include <map>
 #include <memory>
-using std::make_pair;
 
 #include "PathResolver/PathResolver.h"
 
+using std::make_pair;
+
 namespace CP{
 
   ShowerDepthTool::ShowerDepthTool() :