From 95e47a826a483954da21cba43b07e1a48c4c39f8 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Wed, 4 Apr 2018 11:53:38 +0200 Subject: [PATCH] prevents issue with root v6-13-2. --- src/external/libFitPofB/classes/TPofBCalc.cpp | 8 ++++---- src/external/libFitPofB/include/TPofBCalc.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/external/libFitPofB/classes/TPofBCalc.cpp b/src/external/libFitPofB/classes/TPofBCalc.cpp index cc8451f7..c36589e4 100644 --- a/src/external/libFitPofB/classes/TPofBCalc.cpp +++ b/src/external/libFitPofB/classes/TPofBCalc.cpp @@ -188,7 +188,7 @@ void TPofBCalc::Calculate(const string &type, const vector ¶) { if (type == "skg"){ // skewed Gaussian fBmin = 0.0; - fBmax = para[2]/gBar+10.0*fabs(para[4])/(2.0*pi*gBar); + fBmax = para[2]/gBar+10.0*fabs(para[4])/(2.0*PI*gBar); int a3(static_cast(floor(fBmax/fDB))); int a4(static_cast(ceil(fBmax/fDB))); @@ -196,8 +196,8 @@ void TPofBCalc::Calculate(const string &type, const vector ¶) { int BmaxIndex((a3 < a4) ? a4 : (a4 + 1)); int B0Index(static_cast(ceil(para[2]/(gBar*fDB)))); - double expominus(para[3]*para[3]/(2.0*pi*pi*gBar*gBar)); - double expoplus(para[4]*para[4]/(2.0*pi*pi*gBar*gBar)); + double expominus(para[3]*para[3]/(2.0*PI*PI*gBar*gBar)); + double expoplus(para[4]*para[4]/(2.0*PI*PI*gBar*gBar)); double B0(para[2]/(gBar)); int i; @@ -642,7 +642,7 @@ void TPofBCalc::AddBackground(double B, double s, double w) { return; int i; - double BsSq(s*s/(gBar*gBar*4.0*pi*pi)); + double BsSq(s*s/(gBar*gBar*4.0*PI*PI)); // calculate Gaussian background double bg[fPBSize]; diff --git a/src/external/libFitPofB/include/TPofBCalc.h b/src/external/libFitPofB/include/TPofBCalc.h index 0c52cc18..1bbdf4ba 100644 --- a/src/external/libFitPofB/include/TPofBCalc.h +++ b/src/external/libFitPofB/include/TPofBCalc.h @@ -36,7 +36,7 @@ #include "TBulkTriVortexFieldCalc.h" #define gBar 0.0135538817 -#define pi 3.14159265358979323846 +#define PI 3.14159265358979323846 /** *

Class used to calculate static magnetic field distributions