diff options
Diffstat (limited to 'src/fit.c')
| -rw-r--r-- | src/fit.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -66,7 +66,7 @@ static size_t iter; typedef struct fitParams { event *ev; double dx; - double dx_shower; + double ns; int fast; int print; int id[MAX_VERTICES]; @@ -5036,7 +5036,7 @@ static double nlopt_nll2(unsigned int n, const double *x, double *grad, void *pa } gettimeofday(&tv_start, NULL); - fval = nll(fpars->ev, v, fpars->n, fpars->dx, fpars->dx_shower, fpars->fast, fpars->charge_only, fpars->hit_only); + fval = nll(fpars->ev, v, fpars->n, fpars->dx, fpars->ns, fpars->fast, fpars->charge_only, fpars->hit_only); 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; @@ -5093,7 +5093,7 @@ static double nlopt_nll(unsigned int n, const double *x, double *grad, void *par v.n = 1; gettimeofday(&tv_start, NULL); - fval = nll(fpars->ev, &v, 1, fpars->dx, fpars->dx_shower, fpars->fast, fpars->charge_only, fpars->hit_only); + fval = nll(fpars->ev, &v, 1, fpars->dx, fpars->ns, fpars->fast, fpars->charge_only, fpars->hit_only); 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; @@ -5334,7 +5334,7 @@ int fit_event2(event *ev, double *xopt, double *fmin, int *id, size_t n, double /* First we do a set of "quick" minimizations to try and start the * minimizer close to the minimum. */ fpars.dx = 1.0; - fpars.dx_shower = 10.0; + fpars.ns = 100; fpars.fast = 1; fpars.hit_only = 0; fpars.print = 0; @@ -5453,7 +5453,7 @@ int fit_event2(event *ev, double *xopt, double *fmin, int *id, size_t n, double /* Now, we do the "real" minimization. */ fpars.dx = 1.0; - fpars.dx_shower = 10.0; + fpars.ns = 100; fpars.fast = 0; fpars.print = 1; fpars.charge_only = 0; @@ -5617,7 +5617,7 @@ int fit_event(event *ev, double *xopt, double *fmin, int id, double maxtime) * maximum number of function evaluations to 100, and the relative * tolerance on the numerical integration to 10%. */ fpars.dx = 1.0; - fpars.dx_shower = 10.0; + fpars.ns = 100; fpars.fast = 1; fpars.print = 0; fpars.charge_only = 0; @@ -5713,7 +5713,7 @@ int fit_event(event *ev, double *xopt, double *fmin, int id, double maxtime) /* Now, we do the "real" minimization. */ fpars.dx = 1.0; - fpars.dx_shower = 10.0; + fpars.ns = 100; fpars.fast = 0; fpars.print = 1; fpars.charge_only = 0; |