Tidied up run_gr and growth_rate

dataloader.py

@@ -343,7 +343,7 @@ class dataloader:
             Name of the file
         """
         r_df = pd.read_csv(str(self.wdirpath / (dataname + ".tsv")), sep="\t")
-        print("\nloaded", dataname)
+        print("\nLoaded", dataname)
         if hasattr(self, "r"):
             # merge new data to current dataframe
             self.df = pd.merge(self.df, r_df, how="left")

examples/run_gr.py

-from wela.growth_rate import find_all_grs, add_to_dataloader
+from wela.growth_rate import find_all_grs, add_gr_from_pkl
 from wela.dataloader import dataloader
 
 run_GP = False
 
 wdir = "/Users/pswain/wip/tsv_data"
-datasets = ["Pdr5_3_11_22", "Pdr5_flc_10ugml_1676"]
+
+datasets = [
+    "922_2023_03_03_pyrToGalplusGlc_00",
+    "1005_2023_03_09_exp_00_pyrToGalInduction",
+    "1574_2023_04_04_pyrTo0_1glc_00",
+    "1334_2023_03_28_pyrTo2Gal_01glc_00",
+]
+
 
 # it is better to run dataloader first to generate a tsv file
 # to run directly on h5 files, add use_tsv=False
@@ -18,6 +25,6 @@ for dataname in datasets:
         # add pkl files to df
         dl = dataloader(wdir=wdir)
         dl.load(dataname, use_tsv=True)
-        add_to_dataloader(dl, wdir)
+        add_gr_from_pkl(dl, wdir)
         # add data to existing tsv file
-        # dl.save()
+        dl.save()

growth_rate.py

@@ -72,14 +72,6 @@ def find_all_grs(
         plt.close("all")
 
 
-def add_to_dataloader(dl, pkl_dir=".", savename=None):
-    """Add data from pkl files to a dataloader's data frame."""
-    addgrfrompkl(dl, pkl_dir)
-    if savename is None:
-        savename = dl.dataname
-    dl.save(savename)
-
-
 def find_gr(
     volume_df,
     buddings_df=None,
@@ -251,7 +243,7 @@ def reNaN(oldlist, i_nan):
         return oldlist
 
 
-def addgrfrompkl(dl, pkldir):
+def add_gr_from_pkl(dl, pkldir):
     """
     Load growth rate from pickle files.