Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BeamSpot Fitter: added parameters to the migrad functor to supersede EDM defaults #9853

Merged
merged 1 commit into from
Jul 29, 2015
Merged

BeamSpot Fitter: added parameters to the migrad functor to supersede EDM defaults #9853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 17 additions & 18 deletions RecoVertex/BeamSpotProducer/src/PVFitter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,17 +235,17 @@ bool PVFitter::runBXFitter() {
// fit parameters: positions, widths, x-y correlations, tilts in xz and yz
//
MnUserParameters upar;
upar.Add("x", 0., 0.02, -10., 10.); // 0
upar.Add("y", 0., 0.02, -10., 10.); // 1
upar.Add("z", 0., 0.20, -30., 30.); // 2
upar.Add("ex", 0.015, 0.01, 0., 10.); // 3
upar.Add("corrxy", 0., 0.02, -1., 1.); // 4
upar.Add("ey", 0.015, 0.01, 0., 10.); // 5
upar.Add("dxdz", 0., 0.0002, -0.1, 0.1); // 6
upar.Add("dydz", 0., 0.0002, -0.1, 0.1); // 7
upar.Add("ez", 1., 0.1, 0., 30.); // 8
upar.Add("scale", errorScale_, errorScale_/10.,
errorScale_/2., errorScale_*2.); // 9
upar.Add("x" , 0. , 0.02 , -10., 10.); // 0
upar.Add("y" , 0. , 0.02 , -10., 10.); // 1
upar.Add("z" , 0. , 0.20 , -30., 30.); // 2
upar.Add("ex" , 0.015, 0.01 , 0. , 10.); // 3
upar.Add("corrxy", 0. , 0.02 , -1. , 1. ); // 4
upar.Add("ey" , 0.015, 0.01 , 0. , 10.); // 5
upar.Add("dxdz" , 0. , 0.0002, -0.1, 0.1); // 6
upar.Add("dydz" , 0. , 0.0002, -0.1, 0.1); // 7
upar.Add("ez" , 1. , 0.1 , 0. , 30.); // 8
upar.Add("scale", errorScale_ , errorScale_/10.,
errorScale_/2., errorScale_*2.); // 9
MnMigrad migrad(*fcn, upar);

//
Expand All @@ -255,7 +255,7 @@ bool PVFitter::runBXFitter() {
upar.Fix(6);
upar.Fix(7);
upar.Fix(9);
FunctionMinimum ierr = migrad();
FunctionMinimum ierr = migrad(0,1.);
if ( !ierr.IsValid() ) {
edm::LogInfo("PVFitter") << "3D beam spot fit failed in 1st iteration" << std::endl;
fit_ok = false;
Expand All @@ -270,7 +270,7 @@ bool PVFitter::runBXFitter() {
upar.Value(1)+sigmaCut_*upar.Value(5),
upar.Value(2)-sigmaCut_*upar.Value(8),
upar.Value(2)+sigmaCut_*upar.Value(8));
ierr = migrad();
ierr = migrad(0,1.);
if ( !ierr.IsValid() ) {
edm::LogInfo("PVFitter") << "3D beam spot fit failed in 2nd iteration" << std::endl;
fit_ok = false;
Expand All @@ -282,7 +282,7 @@ bool PVFitter::runBXFitter() {
upar.Release(4);
upar.Release(6);
upar.Release(7);
ierr = migrad();
ierr = migrad(0,1.);
if ( !ierr.IsValid() ) {
edm::LogInfo("PVFitter") << "3D beam spot fit failed in 3rd iteration" << std::endl;
fit_ok = false;
Expand Down Expand Up @@ -408,7 +408,7 @@ bool PVFitter::runFitter() {
migrad.Fix(6);
migrad.Fix(7);
migrad.Fix(9);
FunctionMinimum ierr = migrad();
FunctionMinimum ierr = migrad(0,1.);
if ( !ierr.IsValid() ) {
edm::LogWarning("PVFitter") << "3D beam spot fit failed in 1st iteration" << std::endl;
return false;
Expand All @@ -428,7 +428,7 @@ bool PVFitter::runFitter() {
results[1]+sigmaCut_*results[5],
results[2]-sigmaCut_*results[8],
results[2]+sigmaCut_*results[8]);
ierr = migrad();
ierr = migrad(0,1.);
if ( !ierr.IsValid() ) {
edm::LogWarning("PVFitter") << "3D beam spot fit failed in 2nd iteration" << std::endl;
return false;
Expand All @@ -439,7 +439,7 @@ bool PVFitter::runFitter() {
migrad.Release(4);
migrad.Release(6);
migrad.Release(7);
ierr = migrad();
ierr = migrad(0,1.);
if ( !ierr.IsValid() ) {
edm::LogWarning("PVFitter") << "3D beam spot fit failed in 3rd iteration" << std::endl;
return false;
Expand Down Expand Up @@ -584,4 +584,3 @@ PVFitter::pvQuality (const BeamSpotFitPVData& pv) const
double ey = pv.posError[1];
return ex*ex*ey*ey*(1-pv.posCorr[0]*pv.posCorr[0]);
}