diff --git a/growth_rate.py b/growth_rate.py index 9b654620fad9962f0206783e2bd417b42a9a91ad..a2554105620e337e6c693ed5c9c464dde52f4230 100644 --- a/growth_rate.py +++ b/growth_rate.py @@ -99,6 +99,7 @@ def find_all_grs( pickle.dump(res_m, file) figs2pdf(str(wdirpath / dataname) + "_m.pdf") plt.close("all") + return res_b, res_m def find_gr( @@ -133,6 +134,7 @@ def find_gr( t /= 60 # signals to be found if buddings_df is None: + buddings = None signals = [ "smoothed_volume", "growth_rate", @@ -235,7 +237,7 @@ def run_parallel(t, volume, buddings_df, buddings, no_cells, config): # mothers t_batch = [t for i in range(batch_size)] for idx in range(0, no_cells, batch_size): - print(f" mother {idx:d}/{no_cells:d}") + print(f" mother {idx:d}/{no_cells-1:d}") v_batch = [volume[idx + i, :] for i in range(batch_size)] res_batch = pool.map(batch_GP, t_batch, v_batch) for ires in res_batch: @@ -246,7 +248,7 @@ def run_parallel(t, volume, buddings_df, buddings, no_cells, config): else: # buds for idx in range(no_cells): - print(f" buds for {idx:d}/{no_cells:d}") + print(f" buds for {idx:d}/{no_cells-1:d}") ivol = volume[idx, :] bs = np.concatenate(([0], np.where(buddings[idx, :])[0], [t.size])) # get bud data