diff options
Diffstat (limited to 'src/fit.c')
| -rw-r--r-- | src/fit.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -39,6 +39,7 @@ static size_t iter; typedef struct fitParams { event *ev; double dx; + double dx_shower; int fast; int print; int id; @@ -5003,7 +5004,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, fpars->id, T, pos, dir, t0, z1, z2, 1, fpars->dx, fpars->fast); + fval = nll_muon(fpars->ev, fpars->id, T, pos, dir, t0, z1, z2, 1, fpars->dx, fpars->dx_shower, 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; @@ -5212,6 +5213,7 @@ int fit_event(event *ev, double *xopt, double *fmin, int id) * maximum number of function evaluations to 100, and the relative * tolerance on the numerical integration to 10%. */ fpars.dx = 1.0; + fpars.dx_shower = 1.0; fpars.fast = 1; fpars.print = 0; nlopt_set_ftol_abs(opt, 1.0); @@ -5305,6 +5307,7 @@ int fit_event(event *ev, double *xopt, double *fmin, int id) /* Now, we do the "real" minimization. */ fpars.dx = 1.0; + fpars.dx_shower = 1.0; fpars.fast = 0; fpars.print = 1; nlopt_set_ftol_abs(opt, 1e-5); |