From f51044ec3b0bb493fffed3faa6511af0cca74236 Mon Sep 17 00:00:00 2001 From: Alex Piet Date: Fri, 10 Apr 2026 10:57:57 -0700 Subject: [PATCH 1/3] dev --- .../plot/plot_session_scroller.py | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/aind_dynamic_foraging_basic_analysis/plot/plot_session_scroller.py b/src/aind_dynamic_foraging_basic_analysis/plot/plot_session_scroller.py index 2e876fc..484c21d 100644 --- a/src/aind_dynamic_foraging_basic_analysis/plot/plot_session_scroller.py +++ b/src/aind_dynamic_foraging_basic_analysis/plot/plot_session_scroller.py @@ -513,15 +513,25 @@ def plot_fip(fip_df, channel, ax): if fip_df is None: raise Exception("Cannot plot FIP, no FIP data") - if channel not in fip_df["event"].unique(): - raise Exception("Cannot plot {}, no data".format(channel)) + if isinstance(channel, list): + for sub_channel in channel: + if sub_channel not in fip_df['event'].unique(): + raise Exception("Cannot plot {}, no data".format(sub_channel)) + + color = get_fip_color(channel) + C = fip_df.query("event == @channel") + ax.plot(C.timestamps.values, C.data.values, color,label=channel) + ax.set_ylabel('multiple', fontsize=12) + ax.legend() + else: + if channel not in fip_df["event"].unique(): + raise Exception("Cannot plot {}, no data".format(channel)) - color = get_fip_color(channel) - C = fip_df.query("event == @channel") - ax.plot(C.timestamps.values, C.data.values, color) + color = get_fip_color(channel) + C = fip_df.query("event == @channel") + ax.plot(C.timestamps.values, C.data.values, color) + ax.set_ylabel(channel, fontsize=12) ax.axhline(0, color="k", linewidth=0.5, alpha=0.25) - ax.set_ylabel(channel, fontsize=12) - def get_fip_color(channel): """ From 0550b0c16eebfad552f94f6718a765f75cd14e58 Mon Sep 17 00:00:00 2001 From: Alex Piet Date: Fri, 10 Apr 2026 11:00:15 -0700 Subject: [PATCH 2/3] dev --- .../plot/plot_session_scroller.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/aind_dynamic_foraging_basic_analysis/plot/plot_session_scroller.py b/src/aind_dynamic_foraging_basic_analysis/plot/plot_session_scroller.py index 484c21d..a0d8c70 100644 --- a/src/aind_dynamic_foraging_basic_analysis/plot/plot_session_scroller.py +++ b/src/aind_dynamic_foraging_basic_analysis/plot/plot_session_scroller.py @@ -518,9 +518,9 @@ def plot_fip(fip_df, channel, ax): if sub_channel not in fip_df['event'].unique(): raise Exception("Cannot plot {}, no data".format(sub_channel)) - color = get_fip_color(channel) - C = fip_df.query("event == @channel") - ax.plot(C.timestamps.values, C.data.values, color,label=channel) + color = get_fip_color(sub_channel) + C = fip_df.query("event == @sub_channel") + ax.plot(C.timestamps.values, C.data.values, color,label=sub_channel) ax.set_ylabel('multiple', fontsize=12) ax.legend() else: From a01f0abf3c8a4cd0375da1b2a63d4a98e6f39988 Mon Sep 17 00:00:00 2001 From: Alex Piet Date: Mon, 13 Apr 2026 10:51:41 -0700 Subject: [PATCH 3/3] linting --- .../plot/plot_session_scroller.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/aind_dynamic_foraging_basic_analysis/plot/plot_session_scroller.py b/src/aind_dynamic_foraging_basic_analysis/plot/plot_session_scroller.py index a0d8c70..1bde1db 100644 --- a/src/aind_dynamic_foraging_basic_analysis/plot/plot_session_scroller.py +++ b/src/aind_dynamic_foraging_basic_analysis/plot/plot_session_scroller.py @@ -515,13 +515,13 @@ def plot_fip(fip_df, channel, ax): if isinstance(channel, list): for sub_channel in channel: - if sub_channel not in fip_df['event'].unique(): + if sub_channel not in fip_df["event"].unique(): raise Exception("Cannot plot {}, no data".format(sub_channel)) color = get_fip_color(sub_channel) C = fip_df.query("event == @sub_channel") - ax.plot(C.timestamps.values, C.data.values, color,label=sub_channel) - ax.set_ylabel('multiple', fontsize=12) + ax.plot(C.timestamps.values, C.data.values, color, label=sub_channel) + ax.set_ylabel("multiple", fontsize=12) ax.legend() else: if channel not in fip_df["event"].unique(): @@ -533,6 +533,7 @@ def plot_fip(fip_df, channel, ax): ax.set_ylabel(channel, fontsize=12) ax.axhline(0, color="k", linewidth=0.5, alpha=0.25) + def get_fip_color(channel): """ Gets the color for FIP