From e9c414dab562f89f48729aee890acae942515656 Mon Sep 17 00:00:00 2001 From: "a.ott" Date: Sat, 1 Aug 2020 12:04:53 +0200 Subject: [PATCH] make some options global --- run_Fitter.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/run_Fitter.py b/run_Fitter.py index 76a7aa1..50bdce6 100644 --- a/run_Fitter.py +++ b/run_Fitter.py @@ -14,10 +14,12 @@ import numpy as np import multiprocessing as mp -SAVE_DIRECTORY = "./results/invivo_results/" -SAVE_DIRECTORY_BEST = "./results/invivo_best/" -# [bf, vs, sc, cv, bursty, f_inf, f_inf_slope, f_zero, f_zero_slope, f0_curve] -ERROR_WEIGHTS = (0, 2, 2, 2, 2, 1, 1, 1, 0, 1) +# SAVE_DIRECTORY = "./results/invivo_results/" +SAVE_DIRECTORY = "./results/test_data_isi_hist_err_added/" +# SAVE_DIRECTORY_BEST = "./results/invivo_best/" +SAVE_DIRECTORY_BEST = "./results/test_data_best_isi_hist/" +# [bf, vs, sc, cv, isi_hist, bursty, f_inf, f_inf_slope, f_zero, f_zero_slope, f0_curve] +ERROR_WEIGHTS = (0, 2, 2, 1, 1, 0, 1, 1, 1, 0, 1) def main(): @@ -30,10 +32,11 @@ def main(): fit_cell_parallel(cell_data, start_parameters) quit() - test_single_cell("data/invivo/2010-11-08-al-invivo-1/") + # test_single_cell("data/invivo/2010-11-08-al-invivo-1/") + test_single_cell("data/invivo_bursty/2014-03-19-ae-invivo-1/") # start_parameters = [p for p in iget_start_parameters()] - # cell_data = CellData("data/invivo/2013-04-17-ac-invivo-1/") + # cell_data = CellData("data/invivo_bursty/2014-03-19-ae-invivo-1/") # fit_cell_parallel(cell_data, start_parameters) @@ -156,7 +159,7 @@ def save_fitting_run_info(cell_data, parameters, start_parameters, plot=False, s c_cv = data_baseline.get_coefficient_of_variation() c_burst = data_baseline.get_burstiness() - data_fi_curve = get_fi_curve_class(cell_data, cell_data.get_fi_contrasts()) + data_fi_curve = get_fi_curve_class(cell_data, cell_data.get_fi_contrasts(), save_dir=cell_data.get_data_path()) c_f_inf_slope = data_fi_curve.get_f_inf_slope() c_f_inf_values = data_fi_curve.f_inf_frequencies