From fff7a01b7b2378d119a5c23815163a751e558a23 Mon Sep 17 00:00:00 2001 From: Jinho Kim Date: Tue, 31 May 2022 11:07:25 -0700 Subject: [PATCH 1/2] Temporary workaround of LIMS connection necessity commenting out add_image_contrast_to_stimulus_presentations in get_extended_stimulus_presentations_table --- visual_behavior/data_access/loading.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/visual_behavior/data_access/loading.py b/visual_behavior/data_access/loading.py index 7da8867fb..e2720ef10 100644 --- a/visual_behavior/data_access/loading.py +++ b/visual_behavior/data_access/loading.py @@ -486,7 +486,7 @@ def get_extended_stimulus_presentations_table(stimulus_presentations, licks, rew stimulus_presentations['engaged'] = [x > reward_threshold for x in stimulus_presentations['reward_rate']] stimulus_presentations['engagement_state'] = ['engaged' if True else 'disengaged' for engaged in stimulus_presentations['engaged'].values] stimulus_presentations = reformat.add_response_latency(stimulus_presentations) - stimulus_presentations = reformat.add_image_contrast_to_stimulus_presentations(stimulus_presentations) + # stimulus_presentations = reformat.add_image_contrast_to_stimulus_presentations(stimulus_presentations) # Commented out because it requires connection to LIMS (2022/05/30 JK) stimulus_presentations = reformat.add_time_from_last_lick(stimulus_presentations, licks) stimulus_presentations = reformat.add_time_from_last_reward(stimulus_presentations, rewards) stimulus_presentations = reformat.add_time_from_last_change(stimulus_presentations) From 5016d124169b0796324c70c0e9c6e862fbc87797 Mon Sep 17 00:00:00 2001 From: Jinho Kim Date: Tue, 31 May 2022 22:48:37 -0700 Subject: [PATCH 2/2] update engagement_state annotation --- visual_behavior/data_access/loading.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/visual_behavior/data_access/loading.py b/visual_behavior/data_access/loading.py index e2720ef10..80bba70bb 100644 --- a/visual_behavior/data_access/loading.py +++ b/visual_behavior/data_access/loading.py @@ -484,9 +484,9 @@ def get_extended_stimulus_presentations_table(stimulus_presentations, licks, rew reward_threshold = 2 / 3 # 2/3 rewards per minute = 1/90 rewards/second stimulus_presentations['engaged'] = [x > reward_threshold for x in stimulus_presentations['reward_rate']] - stimulus_presentations['engagement_state'] = ['engaged' if True else 'disengaged' for engaged in stimulus_presentations['engaged'].values] + stimulus_presentations['engagement_state'] = ['engaged' if engaged==True else 'disengaged' for engaged in stimulus_presentations['engaged'].values] stimulus_presentations = reformat.add_response_latency(stimulus_presentations) - # stimulus_presentations = reformat.add_image_contrast_to_stimulus_presentations(stimulus_presentations) # Commented out because it requires connection to LIMS (2022/05/30 JK) + stimulus_presentations = reformat.add_image_contrast_to_stimulus_presentations(stimulus_presentations) stimulus_presentations = reformat.add_time_from_last_lick(stimulus_presentations, licks) stimulus_presentations = reformat.add_time_from_last_reward(stimulus_presentations, rewards) stimulus_presentations = reformat.add_time_from_last_change(stimulus_presentations)