diff options
Diffstat (limited to 'src/fit.c')
| -rw-r--r-- | src/fit.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -37,7 +37,7 @@ static size_t iter; typedef struct fitParams { event *ev; - double epsrel; + int n; int fast; int print; } fitParams; @@ -4996,7 +4996,7 @@ double nll(unsigned int n, const double *x, double *grad, void *params) z2[0] = x[8]; gettimeofday(&tv_start, NULL); - fval = nll_muon(fpars->ev, IDP_MU_MINUS, T, pos, dir, t0, z1, z2, 1, fpars->epsrel, fpars->fast); + fval = nll_muon(fpars->ev, IDP_MU_MINUS, T, pos, dir, t0, z1, z2, 1, fpars->n, fpars->fast); gettimeofday(&tv_stop, NULL); long long elapsed = (tv_stop.tv_sec - tv_start.tv_sec)*1000 + (tv_stop.tv_usec - tv_start.tv_usec)/1000; @@ -5186,7 +5186,7 @@ int fit_event(event *ev, double *xopt, double *fmin) * faster, we set the absolute tolerance on the likelihood to 1.0, the * maximum number of function evaluations to 100, and the relative * tolerance on the numerical integration to 10%. */ - fpars.epsrel = 1e-1; + fpars.n = 100; fpars.fast = 1; fpars.print = 0; nlopt_set_ftol_abs(opt, 1.0); @@ -5279,7 +5279,7 @@ int fit_event(event *ev, double *xopt, double *fmin) nlopt_set_upper_bounds(opt, ub); /* Now, we do the "real" minimization. */ - fpars.epsrel = 1e-2; + fpars.n = 100; fpars.fast = 0; fpars.print = 1; nlopt_set_ftol_abs(opt, 1e-5); |