LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

prevents issue with root v6-13-2.

Browse Source
This commit is contained in:
suter_a 2018-04-04 11:53:38 +02:00
parent f843d61bbb
commit 95e47a826a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/external/libFitPofB/classes/TPofBCalc.cpp vendored
View File

@ -188,7 +188,7 @@ void TPofBCalc::Calculate(const string &type, const vector<double> &para) {
if (type == "skg"){ // skewed Gaussian if (type == "skg"){ // skewed Gaussian
fBmin = 0.0; 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<int>(floor(fBmax/fDB))); int a3(static_cast<int>(floor(fBmax/fDB)));
int a4(static_cast<int>(ceil(fBmax/fDB))); int a4(static_cast<int>(ceil(fBmax/fDB)));
@ -196,8 +196,8 @@ void TPofBCalc::Calculate(const string &type, const vector<double> &para) {
int BmaxIndex((a3 < a4) ? a4 : (a4 + 1)); int BmaxIndex((a3 < a4) ? a4 : (a4 + 1));
int B0Index(static_cast<int>(ceil(para[2]/(gBar*fDB)))); int B0Index(static_cast<int>(ceil(para[2]/(gBar*fDB))));
double expominus(para[3]*para[3]/(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 expoplus(para[4]*para[4]/(2.0*PI*PI*gBar*gBar));
double B0(para[2]/(gBar)); double B0(para[2]/(gBar));
int i; int i;
@ -642,7 +642,7 @@ void TPofBCalc::AddBackground(double B, double s, double w) {
return; return;
int i; 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 // calculate Gaussian background
double bg[fPBSize]; double bg[fPBSize];

2
src/external/libFitPofB/include/TPofBCalc.h vendored
View File

@ -36,7 +36,7 @@
#include "TBulkTriVortexFieldCalc.h" #include "TBulkTriVortexFieldCalc.h"
#define gBar 0.0135538817 #define gBar 0.0135538817
#define pi 3.14159265358979323846 #define PI 3.14159265358979323846
/** /**
* <p>Class used to calculate static magnetic field distributions * <p>Class used to calculate static magnetic field distributions