diff options
Diffstat (limited to 'src/fit.c')
| -rw-r--r-- | src/fit.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -4975,7 +4975,7 @@ static struct startingParameters { { 800.0, 800.0, 800.0}, }; -double nll(unsigned int n, const double *x, double *grad, void *params) +static double nopt_nll(unsigned int n, const double *x, double *grad, void *params) { fitParams *fpars = (fitParams *) params; double theta, phi; @@ -5007,7 +5007,7 @@ double nll(unsigned int n, const double *x, double *grad, void *params) v.n = 1; gettimeofday(&tv_start, NULL); - fval = nll_muon(fpars->ev, &v, 1, fpars->dx, fpars->dx_shower, fpars->fast); + fval = nll(fpars->ev, &v, 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; @@ -5118,7 +5118,7 @@ int fit_event(event *ev, double *xopt, double *fmin, int id) struct timeval tv_start, tv_stop; opt = nlopt_create(NLOPT_LN_BOBYQA, 9); - nlopt_set_min_objective(opt,nll,&fpars); + nlopt_set_min_objective(opt,nopt_nll,&fpars); /* Make a guess as to the energy. Right now we just use a simple * approximation that the muon produces approximately 6 photons/MeV. |