From 56b85815c96e56e96085afd3c2575d9eaef1ae91 Mon Sep 17 00:00:00 2001 From: tlatorre Date: Fri, 24 May 2019 11:38:52 -0400 Subject: several small updates to fit.c - set number of shower points to 10 for the main fit - set step size to 10% of the energy - set max number of evals during quick minimization phase to 1000 --- src/fit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/fit.c') diff --git a/src/fit.c b/src/fit.c index 9968d15..fb9e13d 100644 --- a/src/fit.c +++ b/src/fit.c @@ -5343,7 +5343,7 @@ int fit_event2(event *ev, double *xopt, double *fmin, int *id, size_t n, double fpars.charge_only = 0; nlopt_set_ftol_abs(opt, 1e-5); nlopt_set_xtol_rel(opt, 1e-2); - nlopt_set_maxeval(opt, 10000); + nlopt_set_maxeval(opt, 1000); fpars.n = n; for (i = 0; i < n; i++) @@ -5445,7 +5445,7 @@ int fit_event2(event *ev, double *xopt, double *fmin, int *id, size_t n, double /* Set the energy step size to 2% of the energy. */ for (j = 0; j < n; j++) { - ss[4+3*j] = xopt[4+3*j]*0.02; + ss[4+3*j] = xopt[4+3*j]*0.1; } nlopt_set_lower_bounds(opt, lb); @@ -5455,7 +5455,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.ns = 100; + fpars.ns = 10; fpars.fast = 0; fpars.print = 1; fpars.charge_only = 0; -- cgit