minor changes
This commit is contained in:
@ -355,12 +355,12 @@ bool PFitter::ExecuteMigrad()
|
|||||||
fMnUserParams = fFcnMin->UserParameters();
|
fMnUserParams = fFcnMin->UserParameters();
|
||||||
|
|
||||||
// create migrad object
|
// create migrad object
|
||||||
// set MnStrategy to high == 2, see MINUIT2 manual MnStrategy
|
// set MnStrategy to default == 1, high == 2, see MINUIT2 manual MnStrategy
|
||||||
ROOT::Minuit2::MnMigrad migrad((*fFitterFcn), fMnUserParams, 2);
|
ROOT::Minuit2::MnMigrad migrad((*fFitterFcn), fMnUserParams, 1);
|
||||||
|
|
||||||
// minimize
|
// minimize
|
||||||
// maxfcn is 10*MINUIT2 Default maxfcn
|
// maxfcn is MINUIT2 Default maxfcn
|
||||||
unsigned int maxfcn = 10*(200 + 100*fParams.size() + 5*fParams.size()*fParams.size());
|
unsigned int maxfcn = (200 + 100*fParams.size() + 5*fParams.size()*fParams.size());
|
||||||
// tolerance = MINUIT2 Default tolerance
|
// tolerance = MINUIT2 Default tolerance
|
||||||
double tolerance = 0.1;
|
double tolerance = 0.1;
|
||||||
ROOT::Minuit2::FunctionMinimum min = migrad(maxfcn, tolerance);
|
ROOT::Minuit2::FunctionMinimum min = migrad(maxfcn, tolerance);
|
||||||
|
@ -668,6 +668,7 @@ int PMsrHandler::WriteMsrLogFile()
|
|||||||
line.fLine += fStatistic.fNdf;
|
line.fLine += fStatistic.fNdf;
|
||||||
line.fLine += ", chisq/NDF = ";
|
line.fLine += ", chisq/NDF = ";
|
||||||
line.fLine += fStatistic.fMin / fStatistic.fNdf;
|
line.fLine += fStatistic.fMin / fStatistic.fNdf;
|
||||||
|
cout << endl << line.fLine.Data() << endl;
|
||||||
} else {
|
} else {
|
||||||
line.fLine = " maxLH = ";
|
line.fLine = " maxLH = ";
|
||||||
line.fLine += fStatistic.fMin;
|
line.fLine += fStatistic.fMin;
|
||||||
@ -675,6 +676,7 @@ int PMsrHandler::WriteMsrLogFile()
|
|||||||
line.fLine += fStatistic.fNdf;
|
line.fLine += fStatistic.fNdf;
|
||||||
line.fLine += ", maxLH/NDF = ";
|
line.fLine += ", maxLH/NDF = ";
|
||||||
line.fLine += fStatistic.fMin / fStatistic.fNdf;
|
line.fLine += fStatistic.fMin / fStatistic.fNdf;
|
||||||
|
cout << endl << line.fLine.Data() << endl;
|
||||||
}
|
}
|
||||||
fStatistic.fStatLines.push_back(line);
|
fStatistic.fStatLines.push_back(line);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user