Skip to content

fixed bug that accidentally filtered out ignore trials #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rachelstephlee merged 1 commit into from
Apr 3, 2026
Merged

fixed bug that accidentally filtered out ignore trials #100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions src/aind_dynamic_foraging_basic_analysis/metrics/trial_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
Tools for computing trial by trial metrics
df_trials = compute_trial_metrics(nwb)
df_trials = compute_bias(nwb)
Tools for computing trial by trial metrics
df_trials = compute_trial_metrics(nwb)
df_trials = compute_bias(nwb)

"""

Expand Down Expand Up @@ -239,13 +239,7 @@ def add_intertrial_licking(df_trials, df_licks):


def get_average_signal_window_multi(
nwbs,
alignment_event,
offsets,
channel,
data_column='data_z',
censor=True,
output_col=None
nwbs, alignment_event, offsets, channel, data_column="data_z", censor=True, output_col=None
):
"""
Wrapper for get_average_signal_window to process a
Expand Down Expand Up @@ -280,7 +274,7 @@ def get_average_signal_window_multi(
channel=channel,
data_column=data_column,
censor=censor,
output_col=output_col
output_col=output_col,
)
nwb.df_trials = df_trials
return nwbs
Expand All @@ -291,7 +285,7 @@ def get_average_signal_window(
alignment_event,
offsets,
channel,
data_column='data_z',
data_column="data_z",
censor=True,
output_col=None,
):
Expand Down Expand Up @@ -331,7 +325,7 @@ def get_average_signal_window(
"""

# Check alignment_event ends with 'in_session'
if not alignment_event.endswith('in_session'):
if not alignment_event.endswith("in_session"):
raise ValueError(f"alignment_event '{alignment_event}' must end with 'in_session'.")

if not hasattr(nwb, "df_trials"):
Expand Down Expand Up @@ -380,10 +374,10 @@ def get_average_signal_window(
)

avg_activity = etr.groupby("event_number").mean()
avg_activity['trial'] = df_trials.trial.values
avg_activity["trial"] = df_trials.trial.values
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
Loading