From 6114e760ee74ce1b12f17c2d834b43920cb4a0ca Mon Sep 17 00:00:00 2001 From: Roberto <37729096+RobertoDF@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:31:18 +0100 Subject: [PATCH 1/2] Update trials.py Hotfix --- .../behavior/data_objects/trials/trials.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/allensdk/brain_observatory/behavior/data_objects/trials/trials.py b/allensdk/brain_observatory/behavior/data_objects/trials/trials.py index 39950ecd3..31126deab 100644 --- a/allensdk/brain_observatory/behavior/data_objects/trials/trials.py +++ b/allensdk/brain_observatory/behavior/data_objects/trials/trials.py @@ -275,7 +275,11 @@ def index(self) -> pd.Index: @property def change_time(self) -> pd.Series: - return self.data["change_time"] + if "change_time" in self.data: + return self.data["change_time"] + elif "change_time_no_display_delay" in self.data: + return self.data["change_time_no_display_delay"] + @property def lick_times(self) -> pd.Series: From 9200c0f21bcee205036ad259093e93b7fc25ded0 Mon Sep 17 00:00:00 2001 From: Roberto <37729096+RobertoDF@users.noreply.github.com> Date: Fri, 10 Nov 2023 15:20:31 +0100 Subject: [PATCH 2/2] Update trials.py --- .../brain_observatory/behavior/data_objects/trials/trials.py | 1 - 1 file changed, 1 deletion(-) diff --git a/allensdk/brain_observatory/behavior/data_objects/trials/trials.py b/allensdk/brain_observatory/behavior/data_objects/trials/trials.py index 31126deab..176d86d49 100644 --- a/allensdk/brain_observatory/behavior/data_objects/trials/trials.py +++ b/allensdk/brain_observatory/behavior/data_objects/trials/trials.py @@ -280,7 +280,6 @@ def change_time(self) -> pd.Series: elif "change_time_no_display_delay" in self.data: return self.data["change_time_no_display_delay"] - @property def lick_times(self) -> pd.Series: return self.data["lick_times"]