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

Added autotool-support for building musrfit - some additional tests are needed, the old Makefiles are still around

Browse Source
This commit is contained in:
Bastian M. Wojek
2009-06-19 20:37:06 +00:00
parent 93e6e7d059
commit b5016637fd
28 changed files with 831 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/classes/PFitter.cpp
View File

@ -31,6 +31,7 @@
#include <iostream>
#include <fstream>
#include <limits>
using namespace std;
#include <math.h>
@ -408,8 +409,11 @@ bool PFitter::ExecuteHesse()
// create the hesse object
ROOT::Minuit2::MnHesse hesse;
// specify maximal number of function calls
unsigned int maxfcn = numeric_limits<unsigned int>::max();
// call hesse
ROOT::Minuit2::MnUserParameterState mnState = hesse((*fFitterFcn), fMnUserParams);
ROOT::Minuit2::MnUserParameterState mnState = hesse((*fFitterFcn), fMnUserParams, maxfcn);
if (!mnState.IsValid()) {
cout << endl << "**WARNING** PFitter::ExecuteHesse(): Hesse encountered some problems!";
@ -453,7 +457,7 @@ bool PFitter::ExecuteMigrad()
// minimize
// maxfcn is MINUIT2 Default maxfcn
unsigned int maxfcn = (200 + 100*fParams.size() + 5*fParams.size()*fParams.size());
unsigned int maxfcn = numeric_limits<unsigned int>::max();
// tolerance = MINUIT2 Default tolerance
double tolerance = 0.1;
ROOT::Minuit2::FunctionMinimum min = migrad(maxfcn, tolerance);
@ -521,7 +525,7 @@ bool PFitter::ExecuteMinimize()
// minimize
// maxfcn is MINUIT2 Default maxfcn
unsigned int maxfcn = (200 + 100*fParams.size() + 5*fParams.size()*fParams.size());
unsigned int maxfcn = numeric_limits<unsigned int>::max();
//cout << endl << "maxfcn=" << maxfcn << endl;
// tolerance = MINUIT2 Default tolerance
double tolerance = 0.1;
@ -896,7 +900,7 @@ bool PFitter::ExecuteSimplex()
// minimize
// maxfcn is 10*MINUIT2 Default maxfcn
unsigned int maxfcn = 10*(200 + 100*fParams.size() + 5*fParams.size()*fParams.size());
unsigned int maxfcn = numeric_limits<unsigned int>::max();
// tolerance = MINUIT2 Default tolerance
double tolerance = 0.1;
ROOT::Minuit2::FunctionMinimum min = simplex(maxfcn, tolerance);