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

implemented minuit2 strategy command properly

Browse Source
This commit is contained in:
nemu
2009-03-02 06:56:08 +00:00
parent 0505aba5af
commit 21a93c6525
2 changed files with 44 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/classes/PFitter.cpp
View File

@ -43,10 +43,13 @@ using namespace std;
#include "Minuit2/MnSimplex.h" #include "Minuit2/MnSimplex.h"
#include "Minuit2/MnUserParameterState.h" #include "Minuit2/MnUserParameterState.h"
#include "TCanvas.h" #include <TCanvas.h>
#include "TH2.h" #include <TH2.h>
#include "TFile.h" #include <TFile.h>
#include "TDatime.h" #include <TDatime.h>
#include <TString.h>
#include <TObjArray.h>
#include <TObjString.h>
#include "PFitter.h" #include "PFitter.h"
@ -79,6 +82,8 @@ fout.close();
fUseChi2 = true; // chi^2 is the default fUseChi2 = true; // chi^2 is the default
fStrategy = 1; // 0=low, 1=default, 2=high
fParams = *(runInfo->GetMsrParamList()); fParams = *(runInfo->GetMsrParamList());
fCmdLines = *runInfo->GetMsrCommands(); fCmdLines = *runInfo->GetMsrCommands();
@ -290,7 +295,33 @@ bool PFitter::CheckCommands()
} else if (it->fLine.Contains("SIMPLEX")) { } else if (it->fLine.Contains("SIMPLEX")) {
fCmdList.push_back(PMN_SIMPLEX); fCmdList.push_back(PMN_SIMPLEX);
} else if (it->fLine.Contains("STRATEGY")) { } else if (it->fLine.Contains("STRATEGY")) {
fCmdList.push_back(PMN_STRATEGY); TObjArray *tokens = 0;
TObjString *ostr;
TString str;
tokens = it->fLine.Tokenize(" \t");
if (tokens->GetEntries() == 2) {
ostr = dynamic_cast<TObjString*>(tokens->At(1));
str = ostr->GetString();
if (str.CompareTo("0") == 0) { // low
fStrategy = 0;
} else if (str.CompareTo("1") == 0) { // default
fStrategy = 1;
} else if (str.CompareTo("2") == 0) { // high
fStrategy = 2;
} else if (str.CompareTo("LOW") == 0) { // low
fStrategy = 0;
} else if (str.CompareTo("DEFAULT") == 0) { // default
fStrategy = 1;
} else if (str.CompareTo("HIGH") == 0) { // high
fStrategy = 2;
}
}
if (tokens) {
delete tokens;
tokens = 0;
}
} else if (it->fLine.Contains("USER_COVARIANCE")) { } else if (it->fLine.Contains("USER_COVARIANCE")) {
fCmdList.push_back(PMN_USER_COVARIANCE); fCmdList.push_back(PMN_USER_COVARIANCE);
} else if (it->fLine.Contains("USER_PARAM_STATE")) { } else if (it->fLine.Contains("USER_PARAM_STATE")) {
@ -418,8 +449,8 @@ bool PFitter::ExecuteMigrad()
fMnUserParams = fFcnMin->UserParameters(); fMnUserParams = fFcnMin->UserParameters();
// create migrad object // create migrad object
// set MnStrategy to default == 1, high == 2, see MINUIT2 manual MnStrategy // strategy is by default = 'default'
ROOT::Minuit2::MnMigrad migrad((*fFitterFcn), fMnUserParams, 1); ROOT::Minuit2::MnMigrad migrad((*fFitterFcn), fMnUserParams, fStrategy);
// minimize // minimize
// maxfcn is MINUIT2 Default maxfcn // maxfcn is MINUIT2 Default maxfcn
@ -489,8 +520,8 @@ bool PFitter::ExecuteMinimize()
fMnUserParams = fFcnMin->UserParameters(); fMnUserParams = fFcnMin->UserParameters();
// create minimizer object // create minimizer object
// set MnStrategy to default == 1, high == 2, see MINUIT2 manual MnStrategy // strategy is by default = 'default'
ROOT::Minuit2::MnMinimize minimize((*fFitterFcn), fMnUserParams, 1); ROOT::Minuit2::MnMinimize minimize((*fFitterFcn), fMnUserParams, fStrategy);
// minimize // minimize
// maxfcn is MINUIT2 Default maxfcn // maxfcn is MINUIT2 Default maxfcn
@ -856,8 +887,8 @@ bool PFitter::ExecuteSimplex()
fMnUserParams = fFcnMin->UserParameters(); fMnUserParams = fFcnMin->UserParameters();
// create minimizer object // create minimizer object
// set MnStrategy to high == 2, see MINUIT2 manual MnStrategy // strategy is by default = 'default'
ROOT::Minuit2::MnSimplex simplex((*fFitterFcn), fMnUserParams, 2); ROOT::Minuit2::MnSimplex simplex((*fFitterFcn), fMnUserParams, fStrategy);
// minimize // minimize
// maxfcn is 10*MINUIT2 Default maxfcn // maxfcn is 10*MINUIT2 Default maxfcn

2
src/include/PFitter.h
View File

@ -74,6 +74,8 @@ class PFitter
bool fChisqOnly; bool fChisqOnly;
bool fUseChi2; bool fUseChi2;
unsigned int fStrategy;
PMsrHandler *fRunInfo; PMsrHandler *fRunInfo;
PMsrParamList fParams; ///< msr-file parameters PMsrParamList fParams; ///< msr-file parameters