From 31109460612cc525f44ade765655efe4065d912e Mon Sep 17 00:00:00 2001
From: Lorenzo Moneta <Lorenzo.Moneta@cern.ch>
Date: Thu, 24 Apr 2008 15:09:19 +0000
Subject: [PATCH] - remove warning due to -Wshadow - rename variable "Name" to
"name" - rename also methods like a(), b() , x() to X() , A(), B() to be
consistent with ROOT coding convention
git-svn-id: http://root.cern.ch/svn/root/trunk@23522 27541ba8-7e3a-0410-8455-c3a389f83636
---
math/minuit2/inc/Minuit2/ABProd.h | 4 +-
math/minuit2/inc/Minuit2/ABSum.h | 4 +-
math/minuit2/inc/Minuit2/FumiliFCNBase.h | 2 +-
math/minuit2/inc/Minuit2/LASymMatrix.h | 36 ++++++------
math/minuit2/inc/Minuit2/LAVector.h | 54 ++++++++---------
math/minuit2/inc/Minuit2/MinuitParameter.h | 18 +++---
math/minuit2/inc/Minuit2/MnCross.h | 2 +-
math/minuit2/inc/Minuit2/MnParabola.h | 8 +--
math/minuit2/inc/Minuit2/MnParabolaPoint.h | 4 +-
math/minuit2/src/BasicMinimumError.cxx | 6 +-
math/minuit2/src/FumiliBuilder.cxx | 8 +--
math/minuit2/src/MnApplication.cxx | 20 +++----
math/minuit2/src/MnContours.cxx | 6 +-
math/minuit2/src/MnFunctionCross.cxx | 6 +-
math/minuit2/src/MnHesse.cxx | 4 +-
math/minuit2/src/MnLineSearch.cxx | 52 ++++++++---------
math/minuit2/src/MnParabolaFactory.cxx | 20 +++----
math/minuit2/src/MnSeedGenerator.cxx | 4 +-
math/minuit2/src/MnUserParameterState.cxx | 50 ++++++++--------
math/minuit2/src/MnUserParameters.cxx | 60 +++++++++----------
math/minuit2/src/MnUserTransformation.cxx | 68 +++++++++++-----------
math/minuit2/src/NegativeG2LineSearch.cxx | 6 +-
math/minuit2/src/VariableMetricBuilder.cxx | 8 +--
23 files changed, 225 insertions(+), 225 deletions(-)
diff --git a/math/minuit2/inc/Minuit2/ABProd.h b/math/minuit2/inc/Minuit2/ABProd.h
index 294f7781d53..b5298b3c966 100644
--- a/math/minuit2/inc/Minuit2/ABProd.h
+++ b/math/minuit2/inc/Minuit2/ABProd.h
@@ -40,8 +40,8 @@ public:
template<class A, class B>
ABProd(const ABProd<A,B>& prod) : fA(M1(prod.fA)), fB(M2(prod.fB)) {}
- const M1& a() const {return fA;}
- const M2& b() const {return fB;}
+ const M1& A() const {return fA;}
+ const M2& B() const {return fB;}
private:
diff --git a/math/minuit2/inc/Minuit2/ABSum.h b/math/minuit2/inc/Minuit2/ABSum.h
index 0aebb112748..8fbf8dc4d90 100644
--- a/math/minuit2/inc/Minuit2/ABSum.h
+++ b/math/minuit2/inc/Minuit2/ABSum.h
@@ -40,8 +40,8 @@ public:
template<class A, class B>
ABSum(const ABSum<A,B>& sum) : fA(M1(sum.fA)), fB(M2(sum.fB)) {}
- const M1& a() const {return fA;}
- const M2& b() const {return fB;}
+ const M1& A() const {return fA;}
+ const M2& B() const {return fB;}
private:
diff --git a/math/minuit2/inc/Minuit2/FumiliFCNBase.h b/math/minuit2/inc/Minuit2/FumiliFCNBase.h
index 3cf41e5bfd7..a1235ebd07e 100644
--- a/math/minuit2/inc/Minuit2/FumiliFCNBase.h
+++ b/math/minuit2/inc/Minuit2/FumiliFCNBase.h
@@ -144,7 +144,7 @@ protected :
}
// methods to be used by the derived classes to set the values
- void SetFCNValue(double Value) { fValue = Value; }
+ void SetFCNValue(double value) { fValue = value; }
std::vector<double> & Gradient() { return fGradient; }
diff --git a/math/minuit2/inc/Minuit2/LASymMatrix.h b/math/minuit2/inc/Minuit2/LASymMatrix.h
index 7251721dc3e..72b724fb9cf 100644
--- a/math/minuit2/inc/Minuit2/LASymMatrix.h
+++ b/math/minuit2/inc/Minuit2/LASymMatrix.h
@@ -101,8 +101,8 @@ public:
LASymMatrix(const ABObj<sym, ABSum<ABObj<sym, A, T>, ABObj<sym, B, T> >,T>& sum) : fSize(0), fNRow(0), fData(0) {
// std::cout<<"template<class A, class B, class T> LASymMatrix(const ABObj<sym, ABSum<ABObj<sym, A, T>, ABObj<sym, B, T> > >& sum)"<<std::endl;
// recursive construction
- (*this) = sum.Obj().a();
- (*this) += sum.Obj().b();
+ (*this) = sum.Obj().A();
+ (*this) += sum.Obj().B();
//std::cout<<"leaving template<class A, class B, class T> LASymMatrix(const ABObj..."<<std::endl;
}
@@ -111,10 +111,10 @@ public:
// std::cout<<"template<class A, class T> LASymMatrix(const ABObj<sym, ABSum<ABObj<sym, LASymMatrix, T>, ABObj<sym, A, T> >,T>& sum)"<<std::endl;
// recursive construction
- //std::cout<<"(*this)=sum.Obj().b();"<<std::endl;
- (*this)=sum.Obj().b();
- //std::cout<<"(*this)+=sum.Obj().a();"<<std::endl;
- (*this)+=sum.Obj().a();
+ //std::cout<<"(*this)=sum.Obj().B();"<<std::endl;
+ (*this)=sum.Obj().B();
+ //std::cout<<"(*this)+=sum.Obj().A();"<<std::endl;
+ (*this)+=sum.Obj().A();
//std::cout<<"leaving template<class A, class T> LASymMatrix(const ABObj<sym, ABSum<ABObj<sym, LASymMatrix,.."<<std::endl;
}
@@ -139,8 +139,8 @@ public:
// std::cout<<"template<class A, class T> LASymMatrix(const ABObj<sym, ABSum<ABObj<sym, MatrixInverse<sym, ABObj<sym, LASymMatrix, T>, T>, T>, ABObj<sym, A, T> >, T>& sum)"<<std::endl;
// recursive construction
- (*this)=sum.Obj().b();
- (*this)+=sum.Obj().a();
+ (*this)=sum.Obj().B();
+ (*this)+=sum.Obj().A();
//std::cout<<"leaving template<class A, class T> LASymMatrix(const ABObj<sym, ABSum<ABObj<sym, LASymMatrix,.."<<std::endl;
}
@@ -151,8 +151,8 @@ public:
// std::cout<<"template<class A, class T> LASymMatrix(const ABObj<sym, ABSum<ABObj<sym, VectorOuterProduct<ABObj<vec, LAVector, T>, T>, T> ABObj<sym, A, T> >,T>& sum)"<<std::endl;
// recursive construction
- (*this)=sum.Obj().b();
- (*this)+=sum.Obj().a();
+ (*this)=sum.Obj().B();
+ (*this)+=sum.Obj().A();
//std::cout<<"leaving template<class A, class T> LASymMatrix(const ABObj<sym, ABSum<ABObj<sym, LASymMatrix,.."<<std::endl;
}
@@ -285,12 +285,12 @@ public:
//std::cout<<"template<class A, class B, class T> LASymMatrix& operator=(const ABObj<sym, ABSum<ABObj<sym, A, T>, ABObj<sym, B, T> >,T>& sum)"<<std::endl;
// recursive construction
if(fSize == 0 && fData == 0) {
- (*this) = sum.Obj().a();
- (*this) += sum.Obj().b();
+ (*this) = sum.Obj().A();
+ (*this) += sum.Obj().B();
(*this) *= sum.f();
} else {
- LASymMatrix tmp(sum.Obj().a());
- tmp += sum.Obj().b();
+ LASymMatrix tmp(sum.Obj().A());
+ tmp += sum.Obj().B();
tmp *= sum.f();
assert(fSize == tmp.size());
memcpy(fData, tmp.Data(), fSize*sizeof(double));
@@ -304,13 +304,13 @@ public:
if(fSize == 0 && fData == 0) {
//std::cout<<"fSize == 0 && fData == 0"<<std::endl;
- (*this) = sum.Obj().b();
- (*this) += sum.Obj().a();
+ (*this) = sum.Obj().B();
+ (*this) += sum.Obj().A();
(*this) *= sum.f();
} else {
//std::cout<<"creating tmp variable"<<std::endl;
- LASymMatrix tmp(sum.Obj().b());
- tmp += sum.Obj().a();
+ LASymMatrix tmp(sum.Obj().B());
+ tmp += sum.Obj().A();
tmp *= sum.f();
assert(fSize == tmp.size());
memcpy(fData, tmp.Data(), fSize*sizeof(double));
diff --git a/math/minuit2/inc/Minuit2/LAVector.h b/math/minuit2/inc/Minuit2/LAVector.h
index 53ba5c455e7..4c0759230e9 100644
--- a/math/minuit2/inc/Minuit2/LAVector.h
+++ b/math/minuit2/inc/Minuit2/LAVector.h
@@ -84,8 +84,8 @@ public:
template<class A, class B, class T>
LAVector(const ABObj<vec, ABSum<ABObj<vec, A, T>, ABObj<vec, B, T> >,T>& sum) : fSize(0), fData(0) {
// std::cout<<"template<class A, class B, class T> LAVector(const ABObj<ABSum<ABObj<A, T>, ABObj<B, T> > >& sum)"<<std::endl;
- (*this) = sum.Obj().a();
- (*this) += sum.Obj().b();
+ (*this) = sum.Obj().A();
+ (*this) += sum.Obj().B();
(*this) *= double(sum.f());
}
@@ -94,10 +94,10 @@ public:
// std::cout<<"template<class A, class T> LAVector(const ABObj<ABSum<ABObj<LAVector, T>, ABObj<A, T> >,T>& sum)"<<std::endl;
// recursive construction
-// std::cout<<"(*this)=sum.Obj().b();"<<std::endl;
- (*this) = sum.Obj().b();
-// std::cout<<"(*this)+=sum.Obj().a();"<<std::endl;
- (*this) += sum.Obj().a();
+// std::cout<<"(*this)=sum.Obj().B();"<<std::endl;
+ (*this) = sum.Obj().B();
+// std::cout<<"(*this)+=sum.Obj().A();"<<std::endl;
+ (*this) += sum.Obj().A();
(*this) *= double(sum.f());
// std::cout<<"leaving template<class A, class T> LAVector(const ABObj<ABSum<ABObj<LAVector,.."<<std::endl;
}
@@ -111,17 +111,17 @@ public:
//
template<class T>
- LAVector(const ABObj<vec, ABProd<ABObj<sym, LASymMatrix, T>, ABObj<vec, LAVector, T> >, T>& prod) : fSize(prod.Obj().b().Obj().size()), fData((double*)StackAllocatorHolder::Get().Allocate(sizeof(double)*prod.Obj().b().Obj().size())) {
+ LAVector(const ABObj<vec, ABProd<ABObj<sym, LASymMatrix, T>, ABObj<vec, LAVector, T> >, T>& prod) : fSize(prod.Obj().B().Obj().size()), fData((double*)StackAllocatorHolder::Get().Allocate(sizeof(double)*prod.Obj().B().Obj().size())) {
// std::cout<<"template<class T> LAVector(const ABObj<vec, ABProd<ABObj<sym, LASymMatrix, T>, ABObj<vec, LAVector, T> >, T>& prod)"<<std::endl;
- Mndspmv("U", fSize, prod.f()*prod.Obj().a().f()*prod.Obj().b().f(), prod.Obj().a().Obj().Data(), prod.Obj().b().Obj().Data(), 1, 0., fData, 1);
+ Mndspmv("U", fSize, prod.f()*prod.Obj().A().f()*prod.Obj().B().f(), prod.Obj().A().Obj().Data(), prod.Obj().B().Obj().Data(), 1, 0., fData, 1);
}
//
template<class T>
LAVector(const ABObj<vec, ABSum<ABObj<vec, ABProd<ABObj<sym, LASymMatrix, T>, ABObj<vec, LAVector, T> >, T>, ABObj<vec, LAVector, T> >, T>& prod) : fSize(0), fData(0) {
- (*this) = prod.Obj().b();
- (*this) += prod.Obj().a();
+ (*this) = prod.Obj().B();
+ (*this) += prod.Obj().A();
(*this) *= double(prod.f());
}
@@ -162,7 +162,7 @@ public:
template<class T>
LAVector& operator+=(const ABObj<vec, ABProd<ABObj<sym, LASymMatrix, T>, ABObj<vec, LAVector, T> >, T>& prod) {
- Mndspmv("U", fSize, prod.f()*prod.Obj().a().f()*prod.Obj().b().f(), prod.Obj().a().Obj().Data(), prod.Obj().b().Data(), 1, 1., fData, 1);
+ Mndspmv("U", fSize, prod.f()*prod.Obj().A().f()*prod.Obj().B().f(), prod.Obj().A().Obj().Data(), prod.Obj().B().Data(), 1, 1., fData, 1);
return *this;
}
@@ -235,11 +235,11 @@ public:
template<class A, class B, class T>
LAVector& operator=(const ABObj<vec, ABSum<ABObj<vec, A, T>, ABObj<vec, B, T> >,T>& sum) {
if(fSize == 0 && fData == 0) {
- (*this) = sum.Obj().a();
- (*this) += sum.Obj().b();
+ (*this) = sum.Obj().A();
+ (*this) += sum.Obj().B();
} else {
- LAVector tmp(sum.Obj().a());
- tmp += sum.Obj().b();
+ LAVector tmp(sum.Obj().A());
+ tmp += sum.Obj().B();
assert(fSize == tmp.size());
memcpy(fData, tmp.Data(), fSize*sizeof(double));
}
@@ -250,11 +250,11 @@ public:
template<class A, class T>
LAVector& operator=(const ABObj<vec, ABSum<ABObj<vec, LAVector, T>, ABObj<vec, A, T> >,T>& sum) {
if(fSize == 0 && fData == 0) {
- (*this) = sum.Obj().b();
- (*this) += sum.Obj().a();
+ (*this) = sum.Obj().B();
+ (*this) += sum.Obj().A();
} else {
- LAVector tmp(sum.Obj().a());
- tmp += sum.Obj().b();
+ LAVector tmp(sum.Obj().A());
+ tmp += sum.Obj().B();
assert(fSize == tmp.size());
memcpy(fData, tmp.Data(), fSize*sizeof(double));
}
@@ -266,13 +266,13 @@ public:
template<class T>
LAVector& operator=(const ABObj<vec, ABProd<ABObj<sym, LASymMatrix, T>, ABObj<vec, LAVector, T> >, T>& prod) {
if(fSize == 0 && fData == 0) {
- fSize = prod.Obj().b().Obj().size();
+ fSize = prod.Obj().B().Obj().size();
fData = (double*)StackAllocatorHolder::Get().Allocate(sizeof(double)*fSize);
- Mndspmv("U", fSize, double(prod.f()*prod.Obj().a().f()*prod.Obj().b().f()), prod.Obj().a().Obj().Data(), prod.Obj().b().Obj().Data(), 1, 0., fData, 1);
+ Mndspmv("U", fSize, double(prod.f()*prod.Obj().A().f()*prod.Obj().B().f()), prod.Obj().A().Obj().Data(), prod.Obj().B().Obj().Data(), 1, 0., fData, 1);
} else {
- LAVector tmp(prod.Obj().b());
+ LAVector tmp(prod.Obj().B());
assert(fSize == tmp.size());
- Mndspmv("U", fSize, double(prod.f()*prod.Obj().a().f()), prod.Obj().a().Obj().Data(), tmp.Data(), 1, 0., fData, 1);
+ Mndspmv("U", fSize, double(prod.f()*prod.Obj().A().f()), prod.Obj().A().Obj().Data(), tmp.Data(), 1, 0., fData, 1);
}
return *this;
}
@@ -281,12 +281,12 @@ public:
template<class T>
LAVector& operator=(const ABObj<vec, ABSum<ABObj<vec, ABProd<ABObj<sym, LASymMatrix, T>, ABObj<vec, LAVector, T> >, T>, ABObj<vec, LAVector, T> >, T>& prod) {
if(fSize == 0 && fData == 0) {
- (*this) = prod.Obj().b();
- (*this) += prod.Obj().a();
+ (*this) = prod.Obj().B();
+ (*this) += prod.Obj().A();
} else {
// std::cout<<"creating tmp variable"<<std::endl;
- LAVector tmp(prod.Obj().b());
- tmp += prod.Obj().a();
+ LAVector tmp(prod.Obj().B());
+ tmp += prod.Obj().A();
assert(fSize == tmp.size());
memcpy(fData, tmp.Data(), fSize*sizeof(double));
}
diff --git a/math/minuit2/inc/Minuit2/MinuitParameter.h b/math/minuit2/inc/Minuit2/MinuitParameter.h
index e86b87b7552..70a9df5b315 100644
--- a/math/minuit2/inc/Minuit2/MinuitParameter.h
+++ b/math/minuit2/inc/Minuit2/MinuitParameter.h
@@ -31,21 +31,21 @@ class MinuitParameter {
public:
//constructor for constant Parameter
- MinuitParameter(unsigned int num, const char* Name, double val) :
+ MinuitParameter(unsigned int num, const char* name, double val) :
fNum(num), fValue(val), fError(0.), fConst(true), fFix(false),
fLoLimit(0.), fUpLimit(0.), fLoLimValid(false), fUpLimValid(false){
- SetName(Name);
+ SetName(name);
}
//constructor for standard Parameter
- MinuitParameter(unsigned int num, const char* Name, double val, double err) :
+ MinuitParameter(unsigned int num, const char* name, double val, double err) :
fNum(num), fValue(val), fError(err), fConst(false), fFix(false),
fLoLimit(0.), fUpLimit(0.), fLoLimValid(false), fUpLimValid(false){
- SetName(Name);
+ SetName(name);
}
//constructor for limited Parameter
- MinuitParameter(unsigned int num, const char* Name, double val, double err,
+ MinuitParameter(unsigned int num, const char* name, double val, double err,
double min, double max) :
fNum(num),fValue(val), fError(err), fConst(false), fFix(false),
fLoLimit(min), fUpLimit(max), fLoLimValid(true), fUpLimValid(true){
@@ -54,7 +54,7 @@ public:
fLoLimit = max;
fUpLimit = min;
}
- SetName(Name);
+ SetName(name);
}
~MinuitParameter() {}
@@ -151,10 +151,10 @@ private:
private:
- void SetName(const char* Name) {
- int l = std::min(int(strlen(Name)), 11);
+ void SetName(const char* name) {
+ int l = std::min(int(strlen(name)), 11);
memset(fName, 0, 11*sizeof(char));
- memcpy(fName, Name, l*sizeof(char));
+ memcpy(fName, name, l*sizeof(char));
fName[10] = '\0';
}
};
diff --git a/math/minuit2/inc/Minuit2/MnCross.h b/math/minuit2/inc/Minuit2/MnCross.h
index 69d431991b5..2e573bf3433 100644
--- a/math/minuit2/inc/Minuit2/MnCross.h
+++ b/math/minuit2/inc/Minuit2/MnCross.h
@@ -33,7 +33,7 @@ public:
MnCross(const MnUserParameterState& state, unsigned int nfcn) : fValue(0.), fState(state), fNFcn(nfcn), fValid(false), fLimset(false), fMaxFcn(false), fNewMin(false) {}
- MnCross(double Value, const MnUserParameterState& state, unsigned int nfcn) : fValue(Value), fState(state), fNFcn(nfcn), fValid(true), fLimset(false), fMaxFcn(false), fNewMin(false) {}
+ MnCross(double value, const MnUserParameterState& state, unsigned int nfcn) : fValue(value), fState(state), fNFcn(nfcn), fValid(true), fLimset(false), fMaxFcn(false), fNewMin(false) {}
MnCross(const MnUserParameterState& state, unsigned int nfcn, CrossParLimit) : fValue(0.), fState(state), fNFcn(nfcn), fValid(true), fLimset(true), fMaxFcn(false), fNewMin(false) {}
diff --git a/math/minuit2/inc/Minuit2/MnParabola.h b/math/minuit2/inc/Minuit2/MnParabola.h
index b642352e4f5..d59fee6f2eb 100644
--- a/math/minuit2/inc/Minuit2/MnParabola.h
+++ b/math/minuit2/inc/Minuit2/MnParabola.h
@@ -59,7 +59,7 @@ public:
*/
- double y(double x) const {return (fA*x*x + fB*x +fC);}
+ double Y(double x) const {return (fA*x*x + fB*x +fC);}
/**
@@ -135,7 +135,7 @@ public:
*/
- double a() const {return fA;}
+ double A() const {return fA;}
/**
@@ -146,7 +146,7 @@ public:
*/
- double b() const {return fB;}
+ double B() const {return fB;}
/**
@@ -157,7 +157,7 @@ public:
*/
- double c() const {return fC;}
+ double C() const {return fC;}
private:
diff --git a/math/minuit2/inc/Minuit2/MnParabolaPoint.h b/math/minuit2/inc/Minuit2/MnParabolaPoint.h
index c496bcad071..694e4134017 100644
--- a/math/minuit2/inc/Minuit2/MnParabolaPoint.h
+++ b/math/minuit2/inc/Minuit2/MnParabolaPoint.h
@@ -63,7 +63,7 @@ public:
*/
- double x() const {return fX;}
+ double X() const {return fX;}
/**
@@ -74,7 +74,7 @@ public:
*/
- double y() const {return fY;}
+ double Y() const {return fY;}
private:
diff --git a/math/minuit2/src/BasicMinimumError.cxx b/math/minuit2/src/BasicMinimumError.cxx
index 0e6c53d1d2e..68c62c3e500 100644
--- a/math/minuit2/src/BasicMinimumError.cxx
+++ b/math/minuit2/src/BasicMinimumError.cxx
@@ -28,11 +28,11 @@ MnAlgebraicSymMatrix BasicMinimumError::Hessian() const {
#ifdef WARNINGMSG
MN_INFO_MSG("BasicMinimumError: inversion fails; return diagonal matrix.");
#endif
- MnAlgebraicSymMatrix tmp(fMatrix.Nrow());
+ MnAlgebraicSymMatrix tmp2(fMatrix.Nrow());
for(unsigned int i = 0; i < fMatrix.Nrow(); i++) {
- tmp(i,i) = 1./fMatrix(i,i);
+ tmp2(i,i) = 1./fMatrix(i,i);
}
- return tmp;
+ return tmp2;
}
return tmp;
}
diff --git a/math/minuit2/src/FumiliBuilder.cxx b/math/minuit2/src/FumiliBuilder.cxx
index 8b4ae3ced27..e26f1c1a7e5 100644
--- a/math/minuit2/src/FumiliBuilder.cxx
+++ b/math/minuit2/src/FumiliBuilder.cxx
@@ -278,13 +278,13 @@ FunctionMinimum FumiliBuilder::Minimum(const MnFcn& fcn, const GradientCalculato
// MnParabolaPoint pp = lsearch(fcn, s0.Parameters(), step, gdel, prec);
- // if(fabs(pp.y() - s0.Fval()) < prec.Eps()) {
+ // if(fabs(pp.Y() - s0.Fval()) < prec.Eps()) {
// std::cout<<"FumiliBuilder: no improvement"<<std::endl;
// break; //no improvement
// }
- // MinimumParameters p(s0.Vec() + pp.x()*step, pp.y());
+ // MinimumParameters p(s0.Vec() + pp.X()*step, pp.Y());
// if taking a full step
@@ -298,11 +298,11 @@ FunctionMinimum FumiliBuilder::Minimum(const MnFcn& fcn, const GradientCalculato
MnLineSearch lsearch;
MnParabolaPoint pp = lsearch(fcn, s0.Parameters(), step, gdel, prec);
- if(fabs(pp.y() - s0.Fval()) < prec.Eps()) {
+ if(fabs(pp.Y() - s0.Fval()) < prec.Eps()) {
//std::cout<<"FumiliBuilder: no improvement"<<std::endl;
break; //no improvement
}
- p = MinimumParameters(s0.Vec() + pp.x()*step, pp.y() );
+ p = MinimumParameters(s0.Vec() + pp.X()*step, pp.Y() );
}
#ifdef DEBUG
diff --git a/math/minuit2/src/MnApplication.cxx b/math/minuit2/src/MnApplication.cxx
index c9d6e2a1367..7c8f73e9d24 100644
--- a/math/minuit2/src/MnApplication.cxx
+++ b/math/minuit2/src/MnApplication.cxx
@@ -62,19 +62,19 @@ const MinuitParameter& MnApplication::Parameter(unsigned int i) const {
}
-void MnApplication::Add(const char* Name, double val, double err) {
+void MnApplication::Add(const char* name, double val, double err) {
//add free Parameter
- fState.Add(Name, val, err);
+ fState.Add(name, val, err);
}
-void MnApplication::Add(const char* Name, double val, double err, double low, double up) {
+void MnApplication::Add(const char* name, double val, double err, double low, double up) {
//add limited Parameter
- fState.Add(Name, val, err, low, up);
+ fState.Add(name, val, err, low, up);
}
-void MnApplication::Add(const char* Name, double val) {
+void MnApplication::Add(const char* name, double val) {
//add const Parameter
- fState.Add(Name, val);
+ fState.Add(name, val);
}
//interaction via external number of Parameter
@@ -110,13 +110,13 @@ double MnApplication::Value(const char* i) const {return fState.Value(i);}
double MnApplication::Error(const char* i) const {return fState.Error(i);}
-unsigned int MnApplication::Index(const char* Name) const {
- //convert Name into external number of Parameter
- return fState.Index(Name);
+unsigned int MnApplication::Index(const char* name) const {
+ //convert name into external number of Parameter
+ return fState.Index(name);
}
const char* MnApplication::Name(unsigned int i) const {
- //convert external number into Name of Parameter
+ //convert external number into name of Parameter
return fState.Name(i);
}
diff --git a/math/minuit2/src/MnContours.cxx b/math/minuit2/src/MnContours.cxx
index 97169ab7626..566cf4abd41 100644
--- a/math/minuit2/src/MnContours.cxx
+++ b/math/minuit2/src/MnContours.cxx
@@ -124,9 +124,9 @@ ContoursError MnContours::Contour(unsigned int px, unsigned int py, unsigned int
std::vector<std::pair<double,double> >::iterator idist1 = result.end()-1;
std::vector<std::pair<double,double> >::iterator idist2 = result.begin();
- double distx = idist1->first - (idist2)->first;
- double disty = idist1->second - (idist2)->second;
- double bigdis = scalx*scalx*distx*distx + scaly*scaly*disty*disty;
+ double dx = idist1->first - (idist2)->first;
+ double dy = idist1->second - (idist2)->second;
+ double bigdis = scalx*scalx*dx*dx + scaly*scaly*dy*dy;
for(std::vector<std::pair<double,double> >::iterator ipair = result.begin(); ipair != result.end()-1; ipair++) {
double distx = ipair->first - (ipair+1)->first;
diff --git a/math/minuit2/src/MnFunctionCross.cxx b/math/minuit2/src/MnFunctionCross.cxx
index 5405a5e1148..5dbc3da9779 100644
--- a/math/minuit2/src/MnFunctionCross.cxx
+++ b/math/minuit2/src/MnFunctionCross.cxx
@@ -332,9 +332,9 @@ L500:
std::cout << "MnFunctionCross: parabola fit: iteration " << ipt << std::endl;
#endif
- double coeff1 = parbol.c();
- double coeff2 = parbol.b();
- double coeff3 = parbol.a();
+ double coeff1 = parbol.C();
+ double coeff2 = parbol.B();
+ double coeff3 = parbol.A();
double determ = coeff2*coeff2 - 4.*coeff3*(coeff1 - aim);
#ifdef DEBUG
diff --git a/math/minuit2/src/MnHesse.cxx b/math/minuit2/src/MnHesse.cxx
index 963d90113dc..61426598c4c 100644
--- a/math/minuit2/src/MnHesse.cxx
+++ b/math/minuit2/src/MnHesse.cxx
@@ -214,8 +214,8 @@ L30:
}
//verify if matrix pos-def (still 2nd derivative)
- MinimumError tmp = MnPosDef()(MinimumError(vhmat,1.), prec);
- vhmat = tmp.InvHessian();
+ MinimumError tmpErr = MnPosDef()(MinimumError(vhmat,1.), prec);
+ vhmat = tmpErr.InvHessian();
int ifail = Invert(vhmat);
if(ifail != 0) {
diff --git a/math/minuit2/src/MnLineSearch.cxx b/math/minuit2/src/MnLineSearch.cxx
index e5da8de0978..777a0cbdbda 100644
--- a/math/minuit2/src/MnLineSearch.cxx
+++ b/math/minuit2/src/MnLineSearch.cxx
@@ -161,14 +161,14 @@ MnParabolaPoint MnLineSearch::operator()(const MnFcn& fcn, const MinimumParamete
// std::cout<<"slam= "<<slam<<std::endl;
if(slam < slamin) {
if (debug) std::cout << "slam smaller than " << slamin << " return " << std::endl;
- // std::cout<<"f1, f2= "<<p0.y()<<", "<<p1.y()<<std::endl;
- // std::cout<<"x1, x2= "<<p0.x()<<", "<<p1.x()<<std::endl;
+ // std::cout<<"f1, f2= "<<p0.Y()<<", "<<p1.Y()<<std::endl;
+ // std::cout<<"x1, x2= "<<p0.X()<<", "<<p1.X()<<std::endl;
// std::cout<<"x, f= "<<xvmin<<", "<<fvmin<<std::endl;
return MnParabolaPoint(xvmin, fvmin);
}
- if(fabs(slam - 1.) < toler8 && p1.y() < p0.y()) {
- // std::cout<<"f1, f2= "<<p0.y()<<", "<<p1.y()<<std::endl;
- // std::cout<<"x1, x2= "<<p0.x()<<", "<<p1.x()<<std::endl;
+ if(fabs(slam - 1.) < toler8 && p1.Y() < p0.Y()) {
+ // std::cout<<"f1, f2= "<<p0.Y()<<", "<<p1.Y()<<std::endl;
+ // std::cout<<"x1, x2= "<<p0.X()<<", "<<p1.X()<<std::endl;
// std::cout<<"x, f= "<<xvmin<<", "<<fvmin<<std::endl;
return MnParabolaPoint(xvmin, fvmin);
}
@@ -199,8 +199,8 @@ MnParabolaPoint MnLineSearch::operator()(const MnFcn& fcn, const MinimumParamete
xvmin = slam;
}
// LM : correct a bug using precision
- if (fabs( p0.y() - fvmin) < fabs(fvmin)*prec.Eps() ) {
- // if(p0.y()-prec.Eps() < fvmin && fvmin < p0.y()+prec.Eps()) {
+ if (fabs( p0.Y() - fvmin) < fabs(fvmin)*prec.Eps() ) {
+ // if(p0.Y()-prec.Eps() < fvmin && fvmin < p0.Y()+prec.Eps()) {
iterate = true;
flast = f2;
toler8 = toler*slam;
@@ -217,8 +217,8 @@ MnParabolaPoint MnLineSearch::operator()(const MnFcn& fcn, const MinimumParamete
if (debug){
std::cout<<"after initial 2-point iter: "<<std::endl;
- std::cout<<"x0, x1, x2= "<<p0.x()<<", "<<p1.x()<<", "<<slam<<std::endl;
- std::cout<<"f0, f1, f2= "<<p0.y()<<", "<<p1.y()<<", "<<f2<<std::endl;
+ std::cout<<"x0, x1, x2= "<<p0.X()<<", "<<p1.X()<<", "<<slam<<std::endl;
+ std::cout<<"f0, f1, f2= "<<p0.Y()<<", "<<p1.Y()<<", "<<f2<<std::endl;
}
MnParabolaPoint p2(slam, f2);
@@ -229,14 +229,14 @@ MnParabolaPoint MnLineSearch::operator()(const MnFcn& fcn, const MinimumParamete
MnParabola pb = MnParabolaFactory()(p0, p1, p2);
if (debug) {
std::cout << "\nLS Iteration " << niter << std::endl;
- std::cout<<"x0, x1, x2= "<<p0.x()<<", "<<p1.x()<<", "<<p2.x() <<std::endl;
- std::cout<<"f0, f1, f2= "<<p0.y()<<", "<<p1.y()<<", "<<p2.y() <<std::endl;
+ std::cout<<"x0, x1, x2= "<<p0.X()<<", "<<p1.X()<<", "<<p2.X() <<std::endl;
+ std::cout<<"f0, f1, f2= "<<p0.Y()<<", "<<p1.Y()<<", "<<p2.Y() <<std::endl;
std::cout << "slamax = " << slamax << std::endl;
- std::cout<<"p2-p0,p1: "<<p2.y() - p0.y()<<", "<<p2.y() - p1.y()<<std::endl;
- std::cout<<"a, b, c= "<<pb.a()<<" "<<pb.b()<<" "<<pb.c()<<std::endl;
+ std::cout<<"p2-p0,p1: "<<p2.Y() - p0.Y()<<", "<<p2.Y() - p1.Y()<<std::endl;
+ std::cout<<"a, b, c= "<<pb.A()<<" "<<pb.B()<<" "<<pb.C()<<std::endl;
}
- if(pb.a() < prec.Eps2()) {
- double slopem = 2.*pb.a()*xvmin + pb.b();
+ if(pb.A() < prec.Eps2()) {
+ double slopem = 2.*pb.A()*xvmin + pb.B();
if(slopem < 0.) slam = xvmin + slamax;
else slam = xvmin - slamax;
if (debug) std::cout << "xvmin = " << xvmin << " slopem " << slopem << " slam " << slam << std::endl;
@@ -264,11 +264,11 @@ MnParabolaPoint MnLineSearch::operator()(const MnFcn& fcn, const MinimumParamete
iterate = false;
double toler9 = std::max(toler8, fabs(toler8*slam));
// min. of parabola at one point
- if(fabs(p0.x() - slam) < toler9 ||
- fabs(p1.x() - slam) < toler9 ||
- fabs(p2.x() - slam) < toler9) {
- // std::cout<<"f1, f2, f3= "<<p0.y()<<", "<<p1.y()<<", "<<p2.y()<<std::endl;
- // std::cout<<"x1, x2, x3= "<<p0.x()<<", "<<p1.x()<<", "<<p2.x()<<std::endl;
+ if(fabs(p0.X() - slam) < toler9 ||
+ fabs(p1.X() - slam) < toler9 ||
+ fabs(p2.X() - slam) < toler9) {
+ // std::cout<<"f1, f2, f3= "<<p0.Y()<<", "<<p1.Y()<<", "<<p2.Y()<<std::endl;
+ // std::cout<<"x1, x2, x3= "<<p0.X()<<", "<<p1.X()<<", "<<p2.X()<<std::endl;
// std::cout<<"x, f= "<<xvmin<<", "<<fvmin<<std::endl;
return MnParabolaPoint(xvmin, fvmin);
}
@@ -279,10 +279,10 @@ MnParabolaPoint MnLineSearch::operator()(const MnFcn& fcn, const MinimumParamete
f3 = fcn(st.Vec() + slam*step);
if (debug) {
std::cout<<"f3= "<<f3<<std::endl;
- std::cout<<"f3-p(2-0).y()= "<<f3-p2.y()<<" "<<f3-p1.y()<<" "<<f3-p0.y()<<std::endl;
+ std::cout<<"f3-p(2-0).Y()= "<<f3-p2.Y()<<" "<<f3-p1.Y()<<" "<<f3-p0.Y()<<std::endl;
}
// if latest point worse than all three previous, cut step
- if(f3 > p0.y() && f3 > p1.y() && f3 > p2.y()) {
+ if(f3 > p0.Y() && f3 > p1.Y() && f3 > p2.Y()) {
if (debug) {
std::cout<<"f3 worse than all three previous"<<std::endl;
}
@@ -303,8 +303,8 @@ MnParabolaPoint MnLineSearch::operator()(const MnFcn& fcn, const MinimumParamete
// find worst previous point out of three and replace
MnParabolaPoint p3(slam, f3);
- if(p0.y() > p1.y() && p0.y() > p2.y()) p0 = p3;
- else if(p1.y() > p0.y() && p1.y() > p2.y()) p1 = p3;
+ if(p0.Y() > p1.Y() && p0.Y() > p2.Y()) p0 = p3;
+ else if(p1.Y() > p0.Y() && p1.Y() > p2.Y()) p1 = p3;
else p2 = p3;
if (debug) std::cout << " f3 " << f3 << " fvmin " << fvmin << " xvmin " << xvmin << std::endl;
if(f3 < fvmin) {
@@ -319,8 +319,8 @@ MnParabolaPoint MnLineSearch::operator()(const MnFcn& fcn, const MinimumParamete
} while(niter < maxiter);
if (debug) {
- std::cout<<"f1, f2= "<<p0.y()<<", "<<p1.y()<<std::endl;
- std::cout<<"x1, x2= "<<p0.x()<<", "<<p1.x()<<std::endl;
+ std::cout<<"f1, f2= "<<p0.Y()<<", "<<p1.Y()<<std::endl;
+ std::cout<<"x1, x2= "<<p0.X()<<", "<<p1.X()<<std::endl;
std::cout<<"x, f= "<<xvmin<<", "<<fvmin<<std::endl;
}
return MnParabolaPoint(xvmin, fvmin);
diff --git a/math/minuit2/src/MnParabolaFactory.cxx b/math/minuit2/src/MnParabolaFactory.cxx
index 8e8aa29c0ac..c1ac0962d54 100644
--- a/math/minuit2/src/MnParabolaFactory.cxx
+++ b/math/minuit2/src/MnParabolaFactory.cxx
@@ -22,9 +22,9 @@ MnParabola MnParabolaFactory::operator()(const MnParabolaPoint& p1,
const MnParabolaPoint& p2,
const MnParabolaPoint& p3) const {
// construct the parabola from 3 points p1,p2,p3
- double x1 = p1.x();
- double x2 = p2.x();
- double x3 = p3.x();
+ double x1 = p1.X();
+ double x2 = p2.X();
+ double x3 = p3.X();
double dx12 = x1-x2;
double dx13 = x1-x3;
double dx23 = x2-x3;
@@ -36,9 +36,9 @@ MnParabola MnParabolaFactory::operator()(const MnParabolaPoint& p1,
x2 -= xm;
x3 -= xm;
- double y1 = p1.y();
- double y2 = p2.y();
- double y3 = p3.y();
+ double y1 = p1.Y();
+ double y2 = p2.Y();
+ double y3 = p3.Y();
// std::cout<<"MnParabolaFactory y1, y2, y3: "<<y1<<" "<<y2<<" "<<y3<<std::endl;
double a = y1/(dx12*dx13) - y2/(dx12*dx23) + y3/(dx13*dx23);
@@ -56,12 +56,12 @@ MnParabola MnParabolaFactory::operator()(const MnParabolaPoint& p1,
double dxdy1,
const MnParabolaPoint& p2) const {
// construct the parabola from 2 points + derivative at first point dxdy1
- double x1 = p1.x();
+ double x1 = p1.X();
double xx1 = x1*x1;
- double x2 = p2.x();
+ double x2 = p2.X();
double xx2 = x2*x2;
- double y1 = p1.y();
- double y12 = p1.y() - p2.y();
+ double y1 = p1.Y();
+ double y12 = p1.Y() - p2.Y();
double det = xx1-xx2 - 2.*x1*(x1-x2);
double a = -( y12 + (x2-x1)*dxdy1)/det;
diff --git a/math/minuit2/src/MnSeedGenerator.cxx b/math/minuit2/src/MnSeedGenerator.cxx
index 772de50b0d8..78c155a0620 100644
--- a/math/minuit2/src/MnSeedGenerator.cxx
+++ b/math/minuit2/src/MnSeedGenerator.cxx
@@ -164,8 +164,8 @@ MinimumSeed MnSeedGenerator::operator()(const MnFcn& fcn, const AnalyticalGradie
if(stra.Strategy() == 2 && !st.HasCovariance()) {
//calculate full 2nd derivative
- MinimumState tmp = MnHesse(stra)(fcn, state, st.Trafo());
- return MinimumSeed(tmp, st.Trafo());
+ MinimumState tmpState = MnHesse(stra)(fcn, state, st.Trafo());
+ return MinimumSeed(tmpState, st.Trafo());
}
return MinimumSeed(state, st.Trafo());
diff --git a/math/minuit2/src/MnUserParameterState.cxx b/math/minuit2/src/MnUserParameterState.cxx
index d46de793557..ee58118bcf4 100644
--- a/math/minuit2/src/MnUserParameterState.cxx
+++ b/math/minuit2/src/MnUserParameterState.cxx
@@ -159,32 +159,32 @@ const MinuitParameter& MnUserParameterState::Parameter(unsigned int i) const {
return fParameters.Parameter(i);
}
-void MnUserParameterState::Add(const char* Name, double val, double err) {
+void MnUserParameterState::Add(const char* name, double val, double err) {
//add free Parameter
- if ( fParameters.Add(Name, val, err) ) {
+ if ( fParameters.Add(name, val, err) ) {
fIntParameters.push_back(val);
fCovarianceValid = false;
fGCCValid = false;
fValid = true;
}
else {
- int i = Index(Name);
+ int i = Index(name);
SetValue(i,val);
SetError(i,err);
}
}
-void MnUserParameterState::Add(const char* Name, double val, double err, double low, double up) {
+void MnUserParameterState::Add(const char* name, double val, double err, double low, double up) {
//add limited Parameter
- if ( fParameters.Add(Name, val, err, low, up) ) {
+ if ( fParameters.Add(name, val, err, low, up) ) {
fCovarianceValid = false;
- fIntParameters.push_back(Ext2int(Index(Name), val));
+ fIntParameters.push_back(Ext2int(Index(name), val));
fGCCValid = false;
fValid = true;
}
else { // Parameter already exist - just set values
- int i = Index(Name);
+ int i = Index(name);
SetValue(i,val);
SetError(i,err);
SetLimits(i,low,up);
@@ -193,12 +193,12 @@ void MnUserParameterState::Add(const char* Name, double val, double err, double
}
-void MnUserParameterState::Add(const char* Name, double val) {
+void MnUserParameterState::Add(const char* name, double val) {
//add const Parameter
- if ( fParameters.Add(Name, val) )
+ if ( fParameters.Add(name, val) )
fValid = true;
else
- SetValue(Name,val);
+ SetValue(name,val);
}
//interaction via external number of Parameter
@@ -304,36 +304,36 @@ double MnUserParameterState::Error(unsigned int i) const {
return fParameters.Error(i);
}
-//interaction via Name of Parameter
+//interaction via name of Parameter
-void MnUserParameterState::Fix(const char* Name) { Fix(Index(Name));}
+void MnUserParameterState::Fix(const char* name) { Fix(Index(name));}
-void MnUserParameterState::Release(const char* Name) {Release(Index(Name));}
+void MnUserParameterState::Release(const char* name) {Release(Index(name));}
-void MnUserParameterState::SetValue(const char* Name, double val) {SetValue(Index(Name), val);}
+void MnUserParameterState::SetValue(const char* name, double val) {SetValue(Index(name), val);}
-void MnUserParameterState::SetError(const char* Name, double val) { SetError(Index(Name), val);}
+void MnUserParameterState::SetError(const char* name, double val) { SetError(Index(name), val);}
-void MnUserParameterState::SetLimits(const char* Name, double low, double up) {SetLimits(Index(Name), low, up);}
+void MnUserParameterState::SetLimits(const char* name, double low, double up) {SetLimits(Index(name), low, up);}
-void MnUserParameterState::SetUpperLimit(const char* Name, double up) { SetUpperLimit(Index(Name), up);}
+void MnUserParameterState::SetUpperLimit(const char* name, double up) { SetUpperLimit(Index(name), up);}
-void MnUserParameterState::SetLowerLimit(const char* Name, double low) {SetLowerLimit(Index(Name), low);}
+void MnUserParameterState::SetLowerLimit(const char* name, double low) {SetLowerLimit(Index(name), low);}
-void MnUserParameterState::RemoveLimits(const char* Name) {RemoveLimits(Index(Name));}
+void MnUserParameterState::RemoveLimits(const char* name) {RemoveLimits(Index(name));}
-double MnUserParameterState::Value(const char* Name) const {return Value(Index(Name));}
+double MnUserParameterState::Value(const char* name) const {return Value(Index(name));}
-double MnUserParameterState::Error(const char* Name) const {return Error(Index(Name));}
+double MnUserParameterState::Error(const char* name) const {return Error(Index(name));}
-unsigned int MnUserParameterState::Index(const char* Name) const {
- //convert Name into external number of Parameter
- return fParameters.Index(Name);
+unsigned int MnUserParameterState::Index(const char* name) const {
+ //convert name into external number of Parameter
+ return fParameters.Index(name);
}
const char* MnUserParameterState::Name(unsigned int i) const {
- //convert external number into Name of Parameter
+ //convert external number into name of Parameter
return fParameters.Name(i);
}
diff --git a/math/minuit2/src/MnUserParameters.cxx b/math/minuit2/src/MnUserParameters.cxx
index f5055bce1f9..93297586194 100644
--- a/math/minuit2/src/MnUserParameters.cxx
+++ b/math/minuit2/src/MnUserParameters.cxx
@@ -38,22 +38,22 @@ const MinuitParameter& MnUserParameters::Parameter(unsigned int n) const {
return fTransformation.Parameter(n);
}
-bool MnUserParameters::Add(const char* Name, double val, double err) {
+bool MnUserParameters::Add(const char* name, double val, double err) {
// add a new unlimited parameter giving name, value and err (step size)
// return false if parameter already exists
- return fTransformation.Add(Name, val, err);
+ return fTransformation.Add(name, val, err);
}
-bool MnUserParameters::Add(const char* Name, double val, double err, double low, double up) {
+bool MnUserParameters::Add(const char* name, double val, double err, double low, double up) {
// add a new limited parameter giving name, value, err (step size) and lower/upper limits
// return false if parameter already exists
- return fTransformation.Add(Name, val, err, low, up);
+ return fTransformation.Add(name, val, err, low, up);
}
-bool MnUserParameters::Add(const char* Name, double val) {
+bool MnUserParameters::Add(const char* name, double val) {
// add a new unlimited parameter giving name and value
// return false if parameter already exists
- return fTransformation.Add(Name, val);
+ return fTransformation.Add(name, val);
}
void MnUserParameters::Fix(unsigned int n) {
@@ -108,63 +108,63 @@ double MnUserParameters::Error(unsigned int n) const {
// interface using parameter name
-void MnUserParameters::Fix(const char* Name) {
+void MnUserParameters::Fix(const char* name) {
// fix parameter
- Fix(Index(Name));
+ Fix(Index(name));
}
-void MnUserParameters::Release(const char* Name) {
+void MnUserParameters::Release(const char* name) {
// release parameter
- Release(Index(Name));
+ Release(Index(name));
}
-void MnUserParameters::SetValue(const char* Name, double val) {
+void MnUserParameters::SetValue(const char* name, double val) {
// set value for parameter
- SetValue(Index(Name), val);
+ SetValue(Index(name), val);
}
-void MnUserParameters::SetError(const char* Name, double err) {
+void MnUserParameters::SetError(const char* name, double err) {
// set error
- SetError(Index(Name), err);
+ SetError(Index(name), err);
}
-void MnUserParameters::SetLimits(const char* Name, double low, double up) {
+void MnUserParameters::SetLimits(const char* name, double low, double up) {
// set lower/upper limits
- SetLimits(Index(Name), low, up);
+ SetLimits(Index(name), low, up);
}
-void MnUserParameters::SetUpperLimit(const char* Name, double up) {
+void MnUserParameters::SetUpperLimit(const char* name, double up) {
// set upper limit
- fTransformation.SetUpperLimit(Index(Name), up);
+ fTransformation.SetUpperLimit(Index(name), up);
}
-void MnUserParameters::SetLowerLimit(const char* Name, double low) {
+void MnUserParameters::SetLowerLimit(const char* name, double low) {
// set lower limit
- fTransformation.SetLowerLimit(Index(Name), low);
+ fTransformation.SetLowerLimit(Index(name), low);
}
-void MnUserParameters::RemoveLimits(const char* Name) {
+void MnUserParameters::RemoveLimits(const char* name) {
// remove limits
- RemoveLimits(Index(Name));
+ RemoveLimits(Index(name));
}
-double MnUserParameters::Value(const char* Name) const {
+double MnUserParameters::Value(const char* name) const {
// get parameter value
- return Value(Index(Name));
+ return Value(Index(name));
}
-double MnUserParameters::Error(const char* Name) const {
+double MnUserParameters::Error(const char* name) const {
// get parameter error
- return Error(Index(Name));
+ return Error(Index(name));
}
-unsigned int MnUserParameters::Index(const char* Name) const {
- // get index (external) corresponding to Name
- return fTransformation.Index(Name);
+unsigned int MnUserParameters::Index(const char* name) const {
+ // get index (external) corresponding to name
+ return fTransformation.Index(name);
}
const char* MnUserParameters::Name(unsigned int n) const {
- // get Name corresponding to index (external)
+ // get name corresponding to index (external)
return fTransformation.Name(n);
}
diff --git a/math/minuit2/src/MnUserTransformation.cxx b/math/minuit2/src/MnUserTransformation.cxx
index 9e2d299ed8a..36703eff374 100644
--- a/math/minuit2/src/MnUserTransformation.cxx
+++ b/math/minuit2/src/MnUserTransformation.cxx
@@ -22,7 +22,7 @@ class MnParStr {
public:
- MnParStr(const char* Name) : fName(Name) {}
+ MnParStr(const char* name) : fName(name) {}
~MnParStr() {}
@@ -221,36 +221,36 @@ const MinuitParameter& MnUserTransformation::Parameter(unsigned int n) const {
return fParameters[n];
}
-bool MnUserTransformation::Add(const char* Name, double val, double err) {
+bool MnUserTransformation::Add(const char* name, double val, double err) {
// add a new unlimited parameter giving name, value and err (step size)
// return false if parameter already exists
// return false if parameter already exists
- if (std::find_if(fParameters.begin(), fParameters.end(), MnParStr(Name)) != fParameters.end() )
+ if (std::find_if(fParameters.begin(), fParameters.end(), MnParStr(name)) != fParameters.end() )
return false;
fExtOfInt.push_back(fParameters.size());
fCache.push_back(val);
- fParameters.push_back(MinuitParameter(fParameters.size(), Name, val, err));
+ fParameters.push_back(MinuitParameter(fParameters.size(), name, val, err));
return true;
}
-bool MnUserTransformation::Add(const char* Name, double val, double err, double low, double up) {
+bool MnUserTransformation::Add(const char* name, double val, double err, double low, double up) {
// add a new limited parameter giving name, value, err (step size) and lower/upper limits
// return false if parameter already exists
- if (std::find_if(fParameters.begin(), fParameters.end(), MnParStr(Name)) != fParameters.end() )
+ if (std::find_if(fParameters.begin(), fParameters.end(), MnParStr(name)) != fParameters.end() )
return false;
fExtOfInt.push_back(fParameters.size());
fCache.push_back(val);
- fParameters.push_back(MinuitParameter(fParameters.size(), Name, val, err, low, up));
+ fParameters.push_back(MinuitParameter(fParameters.size(), name, val, err, low, up));
return true;
}
-bool MnUserTransformation::Add(const char* Name, double val) {
+bool MnUserTransformation::Add(const char* name, double val) {
// add a new unlimited parameter giving name and value
// return false if parameter already exists
- if (std::find_if(fParameters.begin(), fParameters.end(), MnParStr(Name)) != fParameters.end() )
+ if (std::find_if(fParameters.begin(), fParameters.end(), MnParStr(name)) != fParameters.end() )
return false;
fCache.push_back(val);
- fParameters.push_back(MinuitParameter(fParameters.size(), Name, val));
+ fParameters.push_back(MinuitParameter(fParameters.size(), name, val));
return true;
}
@@ -325,67 +325,67 @@ double MnUserTransformation::Error(unsigned int n) const {
// interface by parameter name
-void MnUserTransformation::Fix(const char* Name) {
+void MnUserTransformation::Fix(const char* name) {
// fix parameter
- Fix(Index(Name));
+ Fix(Index(name));
}
-void MnUserTransformation::Release(const char* Name) {
+void MnUserTransformation::Release(const char* name) {
// release parameter
- Release(Index(Name));
+ Release(Index(name));
}
-void MnUserTransformation::SetValue(const char* Name, double val) {
+void MnUserTransformation::SetValue(const char* name, double val) {
// set value for parameter
- SetValue(Index(Name), val);
+ SetValue(Index(name), val);
}
-void MnUserTransformation::SetError(const char* Name, double err) {
+void MnUserTransformation::SetError(const char* name, double err) {
// set error
- SetError(Index(Name), err);
+ SetError(Index(name), err);
}
-void MnUserTransformation::SetLimits(const char* Name, double low, double up) {
+void MnUserTransformation::SetLimits(const char* name, double low, double up) {
// set lower/upper limits
- SetLimits(Index(Name), low, up);
+ SetLimits(Index(name), low, up);
}
-void MnUserTransformation::SetUpperLimit(const char* Name, double up) {
+void MnUserTransformation::SetUpperLimit(const char* name, double up) {
// set upper limit
- SetUpperLimit(Index(Name), up);
+ SetUpperLimit(Index(name), up);
}
-void MnUserTransformation::SetLowerLimit(const char* Name, double lo) {
+void MnUserTransformation::SetLowerLimit(const char* name, double lo) {
// set lower limit
- SetLowerLimit(Index(Name), lo);
+ SetLowerLimit(Index(name), lo);
}
-void MnUserTransformation::RemoveLimits(const char* Name) {
+void MnUserTransformation::RemoveLimits(const char* name) {
// remove limits
- RemoveLimits(Index(Name));
+ RemoveLimits(Index(name));
}
-double MnUserTransformation::Value(const char* Name) const {
+double MnUserTransformation::Value(const char* name) const {
// get parameter value
- return Value(Index(Name));
+ return Value(Index(name));
}
-double MnUserTransformation::Error(const char* Name) const {
+double MnUserTransformation::Error(const char* name) const {
// get parameter error
- return Error(Index(Name));
+ return Error(Index(name));
}
-unsigned int MnUserTransformation::Index(const char* Name) const {
- // get index (external) corresponding to Name
+unsigned int MnUserTransformation::Index(const char* name) const {
+ // get index (external) corresponding to name
std::vector<MinuitParameter>::const_iterator ipar =
- std::find_if(fParameters.begin(), fParameters.end(), MnParStr(Name));
+ std::find_if(fParameters.begin(), fParameters.end(), MnParStr(name));
assert(ipar != fParameters.end());
// return (ipar - fParameters.begin());
return (*ipar).Number();
}
const char* MnUserTransformation::Name(unsigned int n) const {
- // get Name corresponding to index (external)
+ // get name corresponding to index (external)
assert(n < fParameters.size());
return fParameters[n].Name();
}
diff --git a/math/minuit2/src/NegativeG2LineSearch.cxx b/math/minuit2/src/NegativeG2LineSearch.cxx
index dafccb9b37a..9376dcedb59 100644
--- a/math/minuit2/src/NegativeG2LineSearch.cxx
+++ b/math/minuit2/src/NegativeG2LineSearch.cxx
@@ -84,11 +84,11 @@ MinimumState NegativeG2LineSearch::operator()(const MnFcn& fcn, const MinimumSta
#ifdef DEBUG
- std::cout << "\nLine search result " << pp.x() << " f(0) " << pa.Fval() << " f(1) " << pp.y() << std::endl;
+ std::cout << "\nLine search result " << pp.X() << " f(0) " << pa.Fval() << " f(1) " << pp.Y() << std::endl;
#endif
- step *= pp.x();
- pa = MinimumParameters(pa.Vec() + step, pp.y());
+ step *= pp.X();
+ pa = MinimumParameters(pa.Vec() + step, pp.Y());
dgrad = gc(pa, dgrad);
diff --git a/math/minuit2/src/VariableMetricBuilder.cxx b/math/minuit2/src/VariableMetricBuilder.cxx
index 68a408bd193..f93e2cda8c2 100644
--- a/math/minuit2/src/VariableMetricBuilder.cxx
+++ b/math/minuit2/src/VariableMetricBuilder.cxx
@@ -236,7 +236,7 @@ FunctionMinimum VariableMetricBuilder::Minimum(const MnFcn& fcn, const GradientC
MnParabolaPoint pp = lsearch(fcn, s0.Parameters(), step, gdel, prec);
// <= needed for case 0 <= 0
- if(fabs(pp.y() - s0.Fval()) <= fabs(s0.Fval())*prec.Eps() ) {
+ if(fabs(pp.Y() - s0.Fval()) <= fabs(s0.Fval())*prec.Eps() ) {
#ifdef WARNINGMSG
MN_INFO_MSG("VariableMetricBuilder: no improvement in line search");
#endif
@@ -249,13 +249,13 @@ FunctionMinimum VariableMetricBuilder::Minimum(const MnFcn& fcn, const GradientC
}
#ifdef DEBUG
- std::cout << "Result after line search : \nx = " << pp.x()
+ std::cout << "Result after line search : \nx = " << pp.X()
<< "\nOld Fval = " << s0.Fval()
- << "\nNew Fval = " << pp.y()
+ << "\nNew Fval = " << pp.Y()
<< "\nNFcalls = " << fcn.NumOfCalls() << std::endl;
#endif
- MinimumParameters p(s0.Vec() + pp.x()*step, pp.y());
+ MinimumParameters p(s0.Vec() + pp.X()*step, pp.Y());
FunctionGradient g = gc(p, s0.Gradient());
--
GitLab