diff --git a/CellData.py b/CellData.py index f55b916..5db7872 100644 --- a/CellData.py +++ b/CellData.py @@ -163,6 +163,7 @@ class CellData: self.__read_fi_spiketimes_info__() contrast = [] for i in range(len(self.fi_intensities)): + contrast.append((self.fi_intensities[i] - self.fi_trans_amplitudes[i]) / self.fi_trans_amplitudes[i]) return contrast diff --git a/analysis.py b/analysis.py index ff0cf9e..0c6c08a 100644 --- a/analysis.py +++ b/analysis.py @@ -18,7 +18,7 @@ def main(): # args = parser.parse_args() dir_path = "results/invivo_results/" # args.dir - # dir_path = "results/results_add__trial_more_iter_NM/invivo_results" # args.dir + dir_path = "results/test_data/" # if not os.path.isdir(dir_path): # print("Argument dir is not a directory.") diff --git a/run_cellwise_fitting.sh b/run_cellwise_fitting.sh index 8921fa8..4814ebc 100755 --- a/run_cellwise_fitting.sh +++ b/run_cellwise_fitting.sh @@ -1,5 +1,5 @@ -for file in data/invivo_bursty/*; do +for file in data/test_data/*; do if [ -d "$file" ]; then nice python3 run_Fitter.py --cell $file fi diff --git a/test.py b/test.py index 77be16e..db85b29 100644 --- a/test.py +++ b/test.py @@ -16,14 +16,25 @@ from scipy.optimize import curve_fit from scipy.signal import find_peaks from thunderfish.eventdetection import threshold_crossing_times, threshold_crossings, detect_peaks -folder = "./results/invivo_results/2010-11-08-al-invivo-1/" +isis = np.random.normal(0, 1, 200000) +bins = np.arange(-5, 5, 0.1) +counts = np.array([np.sum((isis >= b) & (isis < b+0.1)) for b in bins]) / len(isis) +plt.plot(counts) +plt.show() +quit() +folder = "./results/test_data/start_parameter_1_err_28.43" + +fit = ModelFit(folder) +print(fit.get_fit_routine_error()) +fit.generate_master_plot() +quit() for item in os.listdir(folder): fit_path = os.path.join(folder, item) fit = ModelFit(fit_path) print(fit.get_fit_routine_error()) - # fit.generate_master_plot() + fit.generate_master_plot() quit()