From e19bd66975c736c728b14e85a3ee5e6fa5170fef Mon Sep 17 00:00:00 2001
From: Patrick Gartung <gartung@fnal.gov>
Date: Tue, 13 Dec 2016 21:01:21 -0600
Subject: [PATCH 1/2] PhysicsTools/IsolationUtils: fix clang warning hides
 overloaded virtual function by changing paramenters to match base class
 function.

---
 PhysicsTools/IsolationUtils/interface/ConeAreaFunction.h        | 2 +-
 PhysicsTools/IsolationUtils/interface/IntegralOverPhiFunction.h | 2 +-
 PhysicsTools/IsolationUtils/interface/IntegrandThetaFunction.h  | 2 +-
 PhysicsTools/IsolationUtils/src/ConeAreaFunction.cc             | 2 +-
 PhysicsTools/IsolationUtils/src/IntegralOverPhiFunction.cc      | 2 +-
 PhysicsTools/IsolationUtils/src/IntegrandThetaFunction.cc       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/PhysicsTools/IsolationUtils/interface/ConeAreaFunction.h b/PhysicsTools/IsolationUtils/interface/ConeAreaFunction.h
index fd1ea7bcd300c..72ca5ad449faf 100644
--- a/PhysicsTools/IsolationUtils/interface/ConeAreaFunction.h
+++ b/PhysicsTools/IsolationUtils/interface/ConeAreaFunction.h
@@ -47,7 +47,7 @@ class ConeAreaFunction : public ROOT::Math::ParamFunction<ROOT::Math::IParametri
   virtual ROOT::Math::IGenFunction* Clone () const { return new ConeAreaFunction(*this); }
 
  protected:
-  void SetParameters(double* param);
+  void SetParameters(double const* param);
   virtual double DoEvalPar(double , const double *) const;
   double DoEval(double x) const;
   double DoDerivative(double x) const;
diff --git a/PhysicsTools/IsolationUtils/interface/IntegralOverPhiFunction.h b/PhysicsTools/IsolationUtils/interface/IntegralOverPhiFunction.h
index cd9d3f5acca7e..272d333fac6e6 100644
--- a/PhysicsTools/IsolationUtils/interface/IntegralOverPhiFunction.h
+++ b/PhysicsTools/IsolationUtils/interface/IntegralOverPhiFunction.h
@@ -40,7 +40,7 @@ class IntegralOverPhiFunction : public ROOT::Math::ParamFunction<ROOT::Math::IPa
   virtual ROOT::Math::IGenFunction* Clone () const { return new IntegralOverPhiFunction(*this); }
 
  private:
-  void SetParameters(double* param);
+  void SetParameters(double const * param);
 
   double DoEval(double x) const;
   virtual double DoEvalPar(double x, const double* param) const;
diff --git a/PhysicsTools/IsolationUtils/interface/IntegrandThetaFunction.h b/PhysicsTools/IsolationUtils/interface/IntegrandThetaFunction.h
index 26093f624fdad..879c1734b64b1 100644
--- a/PhysicsTools/IsolationUtils/interface/IntegrandThetaFunction.h
+++ b/PhysicsTools/IsolationUtils/interface/IntegrandThetaFunction.h
@@ -46,7 +46,7 @@ class IntegrandThetaFunction : public ROOT::Math::ParamFunction<ROOT::Math::IPar
   virtual ROOT::Math::IGenFunction* Clone () const { return new IntegrandThetaFunction(*this); }
 
  private:
-  void SetParameters(double* param);
+  void SetParameters(double const * param);
 
   double DoEval(double x) const;
   virtual double DoEvalPar(double, const double*) const;
diff --git a/PhysicsTools/IsolationUtils/src/ConeAreaFunction.cc b/PhysicsTools/IsolationUtils/src/ConeAreaFunction.cc
index f0bfdf1b33ae3..8ae037262c458 100644
--- a/PhysicsTools/IsolationUtils/src/ConeAreaFunction.cc
+++ b/PhysicsTools/IsolationUtils/src/ConeAreaFunction.cc
@@ -97,7 +97,7 @@ void ConeAreaFunction::SetParameterPhi0(double phi0)
   phi0_ = normalizedPhi(phi0); // map azimuth angle into interval [-pi,+pi]
 }
 
-void ConeAreaFunction::SetParameters(double* param)
+void ConeAreaFunction::SetParameters(const double* param)
 {
   if ( debugLevel_ > 0 ) {
     edm::LogVerbatim("") << "<ConeAreaFunction::SetParameters>:" << std::endl
diff --git a/PhysicsTools/IsolationUtils/src/IntegralOverPhiFunction.cc b/PhysicsTools/IsolationUtils/src/IntegralOverPhiFunction.cc
index bf39a275be50f..2ff80aad13a3a 100644
--- a/PhysicsTools/IsolationUtils/src/IntegralOverPhiFunction.cc
+++ b/PhysicsTools/IsolationUtils/src/IntegralOverPhiFunction.cc
@@ -97,7 +97,7 @@ void IntegralOverPhiFunction::SetParameterAlpha(double alpha)
   alpha_ = alpha;
 }
 
-void IntegralOverPhiFunction::SetParameters(double* param)
+void IntegralOverPhiFunction::SetParameters(const double* param)
 {
   theta0_ = param[0];
   phi0_ = param[1];
diff --git a/PhysicsTools/IsolationUtils/src/IntegrandThetaFunction.cc b/PhysicsTools/IsolationUtils/src/IntegrandThetaFunction.cc
index 3fdce92094991..7e6e3d5540f60 100644
--- a/PhysicsTools/IsolationUtils/src/IntegrandThetaFunction.cc
+++ b/PhysicsTools/IsolationUtils/src/IntegrandThetaFunction.cc
@@ -95,7 +95,7 @@ void IntegrandThetaFunction::SetParameterAlpha(double alpha)
   alpha_ = alpha;
 }
 
-void IntegrandThetaFunction::SetParameters(double* param)
+void IntegrandThetaFunction::SetParameters(const double* param)
 {
   theta0_ = param[0];
   phi0_ = param[1];

From d8854718c6ed1fb94edbaf3ad95599f66196f669 Mon Sep 17 00:00:00 2001
From: Patrick Gartung <gartung@fnal.gov>
Date: Mon, 19 Dec 2016 11:11:25 -0600
Subject: [PATCH 2/2] add override keyword where needed

---
 .../IsolationUtils/interface/ConeAreaFunction.h        | 10 +++++-----
 .../IsolationUtils/interface/ConeAreaRootFunction.h    |  6 +++---
 .../IsolationUtils/interface/IntegralOverPhiFunction.h | 10 +++++-----
 .../IsolationUtils/interface/IntegrandThetaFunction.h  | 10 +++++-----
 .../IsolationUtils/src/ConeAreaRootFunction.cc         |  2 +-
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/PhysicsTools/IsolationUtils/interface/ConeAreaFunction.h b/PhysicsTools/IsolationUtils/interface/ConeAreaFunction.h
index 72ca5ad449faf..1894a48409140 100644
--- a/PhysicsTools/IsolationUtils/interface/ConeAreaFunction.h
+++ b/PhysicsTools/IsolationUtils/interface/ConeAreaFunction.h
@@ -44,15 +44,15 @@ class ConeAreaFunction : public ROOT::Math::ParamFunction<ROOT::Math::IParametri
 
   void SetAcceptanceLimit(double etaMax);
 
-  virtual ROOT::Math::IGenFunction* Clone () const { return new ConeAreaFunction(*this); }
+  virtual ROOT::Math::IGenFunction* Clone () const override { return new ConeAreaFunction(*this); }
 
  protected:
-  void SetParameters(double const* param);
-  virtual double DoEvalPar(double , const double *) const;
-  double DoEval(double x) const;
+  void SetParameters(double const* param) override;
+  virtual double DoEvalPar(double , const double *) const override;
+  double DoEval(double x) const override;
   double DoDerivative(double x) const;
   void DoParameterGradient(double x, double* paramGradient) const;
-  virtual double DoParameterDerivative(double, const double*, unsigned int) const;
+  virtual double DoParameterDerivative(double, const double*, unsigned int) const override;
 
 // !!! ONLY FOR TESTING
 mutable double theta0_; // polar angle of cone axis
diff --git a/PhysicsTools/IsolationUtils/interface/ConeAreaRootFunction.h b/PhysicsTools/IsolationUtils/interface/ConeAreaRootFunction.h
index fdf976de11049..a24169332a3ac 100644
--- a/PhysicsTools/IsolationUtils/interface/ConeAreaRootFunction.h
+++ b/PhysicsTools/IsolationUtils/interface/ConeAreaRootFunction.h
@@ -37,12 +37,12 @@ class ConeAreaRootFunction : public ConeAreaFunction
 
   void SetParameterConeArea(double coneArea);
 
-  ROOT::Math::IGenFunction* Clone () const { return new ConeAreaRootFunction(*this); }
+  ROOT::Math::IGenFunction* Clone () const override { return new ConeAreaRootFunction(*this); }
 
  private:
-  void SetParameters(double* param);
+  void SetParameters(const double* param) override;
 
-  double DoEval(double x) const;
+  double DoEval(double x) const override;
 
   double coneArea_; // area covered by cone
 
diff --git a/PhysicsTools/IsolationUtils/interface/IntegralOverPhiFunction.h b/PhysicsTools/IsolationUtils/interface/IntegralOverPhiFunction.h
index 272d333fac6e6..3e1e76f465e1b 100644
--- a/PhysicsTools/IsolationUtils/interface/IntegralOverPhiFunction.h
+++ b/PhysicsTools/IsolationUtils/interface/IntegralOverPhiFunction.h
@@ -37,15 +37,15 @@ class IntegralOverPhiFunction : public ROOT::Math::ParamFunction<ROOT::Math::IPa
   void SetParameterPhi0(double phi0);
   void SetParameterAlpha(double alpha);
 
-  virtual ROOT::Math::IGenFunction* Clone () const { return new IntegralOverPhiFunction(*this); }
+  virtual ROOT::Math::IGenFunction* Clone () const override { return new IntegralOverPhiFunction(*this); }
 
  private:
-  void SetParameters(double const * param);
+  void SetParameters(double const * param) override;
 
-  double DoEval(double x) const;
-  virtual double DoEvalPar(double x, const double* param) const;
+  double DoEval(double x) const override;
+  virtual double DoEvalPar(double x, const double* param) const override;
   double DoDerivative(double x) const;
-  virtual double DoParameterDerivative(double, const double*, unsigned int) const;
+  virtual double DoParameterDerivative(double, const double*, unsigned int) const override;
   void DoParameterGradient(double x, double* paramGradient) const;
 
   mutable double theta0_; // polar angle of cone axis
diff --git a/PhysicsTools/IsolationUtils/interface/IntegrandThetaFunction.h b/PhysicsTools/IsolationUtils/interface/IntegrandThetaFunction.h
index 879c1734b64b1..11be3af4704b3 100644
--- a/PhysicsTools/IsolationUtils/interface/IntegrandThetaFunction.h
+++ b/PhysicsTools/IsolationUtils/interface/IntegrandThetaFunction.h
@@ -43,15 +43,15 @@ class IntegrandThetaFunction : public ROOT::Math::ParamFunction<ROOT::Math::IPar
   void SetParameterPhi0(double phi0);
   void SetParameterAlpha(double alpha);
 
-  virtual ROOT::Math::IGenFunction* Clone () const { return new IntegrandThetaFunction(*this); }
+  virtual ROOT::Math::IGenFunction* Clone () const override { return new IntegrandThetaFunction(*this); }
 
  private:
-  void SetParameters(double const * param);
+  void SetParameters(double const * param) override;
 
-  double DoEval(double x) const;
-  virtual double DoEvalPar(double, const double*) const;
+  double DoEval(double x) const override;
+  virtual double DoEvalPar(double, const double*) const override;
   double DoDerivative(double x) const;
-  virtual double DoParameterDerivative(double, const double*, unsigned int) const;
+  virtual double DoParameterDerivative(double, const double*, unsigned int) const override;
   void DoParameterGradient(double x, double* paramGradient) const;
 
   mutable double theta0_; // polar angle of cone axis
diff --git a/PhysicsTools/IsolationUtils/src/ConeAreaRootFunction.cc b/PhysicsTools/IsolationUtils/src/ConeAreaRootFunction.cc
index e6ff243839ceb..af925f5b2ae4a 100644
--- a/PhysicsTools/IsolationUtils/src/ConeAreaRootFunction.cc
+++ b/PhysicsTools/IsolationUtils/src/ConeAreaRootFunction.cc
@@ -73,7 +73,7 @@ void ConeAreaRootFunction::SetParameterConeArea(double coneArea)
   coneArea_ = coneArea;
 }
 
-void ConeAreaRootFunction::SetParameters(double* param)
+void ConeAreaRootFunction::SetParameters(const double* param)
 {
   if ( debugLevel_ > 0 ) {
     edm::LogVerbatim("") << "<ConeAreaRootFunction::SetParameters>:" << std::endl