From 7af641831cfefd9d60acaf757d965831f463f177 Mon Sep 17 00:00:00 2001 From: Jonathan Elsner Date: Thu, 5 Sep 2024 13:43:23 -0700 Subject: [PATCH] Declutter `get_change_time_from_stim_table` Properly check for aborted trials using @corbennett 's advice. Fixes #119 --- ...VBN-Tutorial-Aligning_Behavior_Data_to_Task_Events.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/databook/physiology/ephys/visual-behavior/VBN-Tutorial-Aligning_Behavior_Data_to_Task_Events.md b/databook/physiology/ephys/visual-behavior/VBN-Tutorial-Aligning_Behavior_Data_to_Task_Events.md index 83078d61..22342879 100644 --- a/databook/physiology/ephys/visual-behavior/VBN-Tutorial-Aligning_Behavior_Data_to_Task_Events.md +++ b/databook/physiology/ephys/visual-behavior/VBN-Tutorial-Aligning_Behavior_Data_to_Task_Events.md @@ -310,17 +310,12 @@ def get_change_time_from_stim_table(row): ''' table = stimulus_presentations change_frame = row['change_frame'] - if np.isnan(change_frame): + if change_frame == -99: #indicates aborted trial return np.nan change_times = table[table.start_frame==change_frame]['start_time'].values - if len(change_times) == 0: - return np.nan - else: - return change_times[0] - - return change_time + return change_times[0] change_times = trials.apply(get_change_time_from_stim_table, axis=1) trials['change_time_with_display_delay'] = change_times