diff --git a/dataloader.py b/dataloader.py index 5438f4434bda6106a96a1dc518554405fc8a938d..6a1db562a0865a42e0734bc42ec9bf9045c44643 100644 --- a/dataloader.py +++ b/dataloader.py @@ -273,7 +273,7 @@ class dataloader: if bud_fluorescence: # call postprocessor to add bud fluorescence to h5 files self.include_bud_fluorescence(grouper, dataname) - print("signals available:") + print("Signals available:") for signal in grouper.available: print(" ", signal) print() @@ -308,7 +308,7 @@ class dataloader: self.df = pd.merge(self.df, r_df, how="left") else: self.df = r_df - print(f"\n data size is {self.df.shape}") + print(f"Data size is {self.df.shape}.") # define ids self.ids = list(self.df.id.unique()) if not use_tsv: @@ -325,13 +325,13 @@ class dataloader: ): """Load data from h5 files into one long data frame.""" # load other signals + print("\nGetting data for other signals...") for i, sigpath in enumerate(self.g2a_dict): if ( sigpath in grouper.available and not ("buddings" in sigpath or "bud_metric" in sigpath) and sigpath != self.a2g_dict[key_index] ): - print(" " + sigpath) record = grouper.concat_signal( sigpath, cutoff=0, @@ -349,7 +349,7 @@ class dataloader: # merge into one data set # cell IDs not in r_df will be automatically dropped r_df = pd.merge(r_df, tdf, how="left") - print("\n Loading bud data.") + print("Getting bud data...") # load and correct buddings and bud_volume b_df = self.load_bud_data( grouper=grouper, @@ -370,6 +370,7 @@ class dataloader: experiment's duration. """ key_index_path = self.a2g_dict[key_index] + print("Getting data for key index...") record = grouper.concat_signal( key_index_path, cutoff=cutoff, tmax_in_mins_dict=tmax_in_mins_dict ) @@ -383,6 +384,7 @@ class dataloader: def get_bud_indices(self, grouper, key_index): """Use key_index to get a multi-index for all buds.""" key_index_path = self.a2g_dict[key_index] + print("Getting data to identify bud indices...") record = grouper.concat_signal(key_index_path, mode="raw_daughters") bud_indices = record.droplevel("mother_label").index return bud_indices