diff --git a/run_Fitter.py b/run_Fitter.py index 2bbbcd1..486d521 100644 --- a/run_Fitter.py +++ b/run_Fitter.py @@ -14,8 +14,8 @@ from helperFunctions import plot_errors import multiprocessing as mp -SAVE_DIRECTORY = "./results/ref_and_tau/no_dend_tau/" -SAVE_DIRECTORY_BEST = "./results/ref_and_tau/ndt_best" +SAVE_DIRECTORY = "./results/ref_and_tau/with_out_both/" +SAVE_DIRECTORY_BEST = "./results/ref_and_tau/wob_best/" # [vs, sc, cv, isi_hist, bursty, f_inf, f_inf_slope, f_zero, f_zero_slope, f0_curve] ERROR_WEIGHTS = (1, 1, 1, 1, 1, 1, 1, 1, 0, 1) @@ -45,7 +45,7 @@ def test_single_cell(path): for i, p in enumerate(start_parameters): fitter = Fitter() fitter.set_data_reference_values(cell_data) - fmin, res_par = fitter.fit_routine_no_dend_tau(p, ERROR_WEIGHTS) + fmin, res_par = fitter.fit_routine_no_dend_tau_and_no_ref_period(p, ERROR_WEIGHTS) cell_path = os.path.split(cell_data.get_data_path())[-1] @@ -60,7 +60,7 @@ def fit_cell_base(parameters): time1 = time.time() fitter = Fitter() fitter.set_data_reference_values(parameters[0]) - fmin, res_par = fitter.fit_routine_no_dend_tau(parameters[2], ERROR_WEIGHTS) + fmin, res_par = fitter.fit_routine_no_dend_tau_and_no_ref_period(parameters[2], ERROR_WEIGHTS) cell_data = parameters[0] cell_name = os.path.split(cell_data.get_data_path())[-1]