From ce02f17ad7be8fac97cb28d7f4dad210f87ea2df Mon Sep 17 00:00:00 2001 From: rachelstephlee Date: Fri, 12 Dec 2025 01:49:12 +0000 Subject: [PATCH 1/3] choice or animal response? weird issue on plot_foraging_session --- .../plot/plot_foraging_session.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/aind_dynamic_foraging_basic_analysis/plot/plot_foraging_session.py b/src/aind_dynamic_foraging_basic_analysis/plot/plot_foraging_session.py index dc2fca9..c747bd8 100644 --- a/src/aind_dynamic_foraging_basic_analysis/plot/plot_foraging_session.py +++ b/src/aind_dynamic_foraging_basic_analysis/plot/plot_foraging_session.py @@ -35,7 +35,7 @@ def plot_foraging_session_nwb(nwb, **kwargs): if "side_bias" not in nwb.df_trials: fig, axes = plot_foraging_session( - [np.nan if x == 2 else x for x in nwb.df_trials["animal_response"].values], + [np.nan if x == 2 else x for x in nwb.df_trials["choice"].values], nwb.df_trials["earned_reward"].values, [nwb.df_trials["reward_probabilityL"], nwb.df_trials["reward_probabilityR"]], **kwargs, @@ -44,7 +44,7 @@ def plot_foraging_session_nwb(nwb, **kwargs): if "plot_list" not in kwargs: kwargs["plot_list"] = ["choice", "reward_prob", "bias"] fig, axes = plot_foraging_session( - [np.nan if x == 2 else x for x in nwb.df_trials["animal_response"].values], + [np.nan if x == 2 else x for x in nwb.df_trials["choice"].values], nwb.df_trials["earned_reward"].values, [nwb.df_trials["reward_probabilityL"], nwb.df_trials["reward_probabilityR"]], bias=nwb.df_trials["side_bias"].values, @@ -66,9 +66,9 @@ def plot_foraging_session_nwb(nwb, **kwargs): 0, 1.05, f"{nwb.session_id}\n" - f'Total trials {len(nwb.df_trials)}, ignored {np.sum(nwb.df_trials["animal_response"]==2)},' - f' left {np.sum(nwb.df_trials["animal_response"] == 0)},' - f' right {np.sum(nwb.df_trials["animal_response"] == 1)}', + f'Total trials {len(nwb.df_trials)}, ignored {np.sum(nwb.df_trials["choice"]==2)},' + f' left {np.sum(nwb.df_trials["choice"] == 0)},' + f' right {np.sum(nwb.df_trials["choice"] == 1)}', fontsize=8, transform=axes[0].transAxes, ) From 5f7da0200a49276ec17863bca856e9888dd9c223 Mon Sep 17 00:00:00 2001 From: rachelstephlee Date: Wed, 17 Dec 2025 06:07:19 +0000 Subject: [PATCH 2/3] return fig and axes --- .../plot/plot_foraging_session.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/aind_dynamic_foraging_basic_analysis/plot/plot_foraging_session.py b/src/aind_dynamic_foraging_basic_analysis/plot/plot_foraging_session.py index c747bd8..c7619e2 100644 --- a/src/aind_dynamic_foraging_basic_analysis/plot/plot_foraging_session.py +++ b/src/aind_dynamic_foraging_basic_analysis/plot/plot_foraging_session.py @@ -72,6 +72,7 @@ def plot_foraging_session_nwb(nwb, **kwargs): fontsize=8, transform=axes[0].transAxes, ) + return fig, axes def plot_foraging_session( # noqa: C901 From 8090c736aa456b49b5fe500ebbe2f32698f70a0f Mon Sep 17 00:00:00 2001 From: rachelstephlee Date: Thu, 26 Mar 2026 23:57:08 +0000 Subject: [PATCH 3/3] getting the avg signal dropping all ignore trials, which is a problem. --- .../metrics/trial_metrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aind_dynamic_foraging_basic_analysis/metrics/trial_metrics.py b/src/aind_dynamic_foraging_basic_analysis/metrics/trial_metrics.py index 5e04497..9254f13 100644 --- a/src/aind_dynamic_foraging_basic_analysis/metrics/trial_metrics.py +++ b/src/aind_dynamic_foraging_basic_analysis/metrics/trial_metrics.py @@ -384,6 +384,6 @@ def get_average_signal_window( avg_activity = avg_activity.rename(columns={data_column: output_col}) # Merge on 'trial' - df_trials = df_trials.merge(avg_activity[['trial', output_col]], on='trial', how='left') + df_trials = nwb.df_trials.merge(avg_activity[['trial', output_col]], on='trial', how='left') return df_trials