adapted for new folder structure

Author: HernandoMV

lecilab_behavior_analysis/df_transforms.py

@@ -945,7 +945,7 @@ def add_early_pokeouts(df_in: pd.DataFrame) -> pd.DataFrame:
     Adds a boolean column 'early_pokeout' to the dataframe indicating whether there was an early pokeout
     in the center port before holding the required time. This is irrespective of whether the trial was correct or incorrect.
     """
-    utils.column_checker(df_in, required_columns={"STATE_ready_to_initiate_START", "Port2In", "Port2Out"})
+    utils.column_checker(df_in, required_columns={"STATE_ready_to_initiate_START", "Port2In", "Port2Out", "holding_time"})
     df = df_in.copy()  # Make a copy to avoid modifying the original DataFrame
     df['early_pokeout'] = df.apply(utils.is_this_an_early_pokeout_trial, axis=1)
     return df

lecilab_behavior_analysis/plot_testing.ipynb

@@ -921,20 +921,20 @@ def generate_tv_report(events: pd.DataFrame, sessions_summary: pd.DataFrame, hou
     return report_df, max_date
 
 
-def load_all_events(project_name: str) -> pd.DataFrame:
+def load_all_events(events_subfolder_location: str) -> pd.DataFrame:
     """
     Load all events from the local machine for a given project.
     """
     outpath = get_outpath()
-    events_path = f"{outpath}/{project_name}/events.csv"
+    events_path = f"{outpath}/{events_subfolder_location}/events.csv"
     if not os.path.exists(events_path):
-        raise FileNotFoundError(f"Events file for project {project_name} does not exist.")
+        raise FileNotFoundError(f"Events file for project {events_subfolder_location} does not exist.")
 
     events_df = pd.read_csv(events_path, sep=";")
 
     # read events in old_events if they exist
     events_dfs_list = []
-    old_events_path = f"{outpath}/{project_name}/old_events"
+    old_events_path = f"{outpath}/{events_subfolder_location}/old_events"
     # list files in the old_events folder
     if os.path.exists(old_events_path):
         old_events_files = [f for f in os.listdir(old_events_path) if f.endswith('.csv')]