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

Merged in mnstrategy (pull request #19)

Browse Source 
Explicit passing of MnStrategy during minimizer initialization

Approved-by: Suter Andreas
This commit is contained in:
Ryan M. L. McFadden 2025-01-10 10:00:30 +00:00 committed by Suter Andreas
commit e67d92fc05
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/classes/PFitter.cpp
View File

@ -55,6 +55,7 @@
#include "Minuit2/MnPrint.h" #include "Minuit2/MnPrint.h"
#include "Minuit2/MnScan.h" #include "Minuit2/MnScan.h"
#include "Minuit2/MnSimplex.h" #include "Minuit2/MnSimplex.h"
#include "Minuit2/MnStrategy.h"
#include "Minuit2/MnUserParameterState.h" #include "Minuit2/MnUserParameterState.h"
#include "Minuit2/MinosError.h" #include "Minuit2/MinosError.h"
@ -1763,7 +1764,7 @@ Bool_t PFitter::ExecuteMigrad()
// create migrad object // create migrad object
// strategy is by default = 'default' // strategy is by default = 'default'
ROOT::Minuit2::MnMigrad migrad((*fFitterFcn), fMnUserParams, fStrategy); ROOT::Minuit2::MnMigrad migrad((*fFitterFcn), fMnUserParams, ROOT::Minuit2::MnStrategy{fStrategy});
// minimize // minimize
// maxfcn is MINUIT2 Default maxfcn // maxfcn is MINUIT2 Default maxfcn
@ -1839,7 +1840,7 @@ Bool_t PFitter::ExecuteMinimize()
// create minimizer object // create minimizer object
// strategy is by default = 'default' // strategy is by default = 'default'
ROOT::Minuit2::MnMinimize minimize((*fFitterFcn), fMnUserParams, fStrategy); ROOT::Minuit2::MnMinimize minimize((*fFitterFcn), fMnUserParams, ROOT::Minuit2::MnStrategy{fStrategy});
// minimize // minimize
// maxfcn is MINUIT2 Default maxfcn // maxfcn is MINUIT2 Default maxfcn
@ -2656,7 +2657,7 @@ Bool_t PFitter::ExecuteSimplex()
// create minimizer object // create minimizer object
// strategy is by default = 'default' // strategy is by default = 'default'
ROOT::Minuit2::MnSimplex simplex((*fFitterFcn), fMnUserParams, fStrategy); ROOT::Minuit2::MnSimplex simplex((*fFitterFcn), fMnUserParams, ROOT::Minuit2::MnStrategy{fStrategy});
// minimize // minimize
// maxfcn is 10*MINUIT2 Default maxfcn // maxfcn is 10*MINUIT2 Default maxfcn