Skip to content
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.

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

8.24.6 #733

Merged
merged 1 commit into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
=========

8.24.6
------
* add property getters for feedback delays (for NM custom task)

8.24.5
------
* fix: visual stimulus not showing for first trial
Expand Down
2 changes: 1 addition & 1 deletion iblrig/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# 5) git tag the release in accordance to the version number below (after merge!)
# >>> git tag 8.15.6
# >>> git push origin --tags
__version__ = '8.24.5'
__version__ = '8.24.6'


from iblrig.version_management import get_detailed_version_string
Expand Down
18 changes: 15 additions & 3 deletions iblrig/base_choice_world.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ def get_state_machine_trial(self, i):
# No-go: hide the visual stimulus and play white noise. Go to exit_state after FEEDBACK_NOGO_DELAY_SECS.
sma.add_state(
state_name='no_go',
state_timer=self.task_params.FEEDBACK_NOGO_DELAY_SECS,
state_timer=self.feedback_nogo_delay,
output_actions=[self.bpod.actions.bonsai_hide_stim, self.bpod.actions.play_noise],
state_change_conditions={'Tup': 'exit_state'},
)
Expand All @@ -425,7 +425,7 @@ def get_state_machine_trial(self, i):
)
sma.add_state(
state_name='error',
state_timer=self.task_params.FEEDBACK_ERROR_DELAY_SECS,
state_timer=self.feedback_error_delay,
output_actions=[self.bpod.actions.play_noise],
state_change_conditions={'Tup': 'hide_stim'},
)
Expand All @@ -446,7 +446,7 @@ def get_state_machine_trial(self, i):
)
sma.add_state(
state_name='correct',
state_timer=self.task_params.FEEDBACK_CORRECT_DELAY_SECS - self.reward_time,
state_timer=self.feedback_correct_delay - self.reward_time,
output_actions=[],
state_change_conditions={'Tup': 'hide_stim'},
)
Expand Down Expand Up @@ -609,6 +609,18 @@ def reward_time(self):
def quiescent_period(self):
return self.trials_table.at[self.trial_num, 'quiescent_period']

@property
def feedback_correct_delay(self):
return self.task_params['FEEDBACK_CORRECT_DELAY_SECS']

@property
def feedback_error_delay(self):
return self.task_params['FEEDBACK_ERROR_DELAY_SECS']

@property
def feedback_nogo_delay(self):
return self.task_params['FEEDBACK_NOGO_DELAY_SECS']

@property
def position(self):
return self.trials_table.at[self.trial_num, 'position']
Expand Down