Skip to content

Fix for expStop error and bug where event updates twice #149

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

Jump to bottom
Merged
merged 1 commit into from
May 7, 2019
Merged

Fix for expStop error and bug where event updates twice #149

merged 1 commit into from
May 7, 2019

Conversation

@k1o0
Copy link
Contributor

@k1o0 k1o0 commented May 4, 2019

Fix for issue #100.

  • Now the user may define expStop in their experiment definition. Once the definition has been run, expStop is reassigned to be a merge of the user's expStop signal and lastTrialOver, or the latter signal if the user didn't assign anything to expStop.
  • When this new expStop signal takes a value, the quit method is called.
  • In the quit method, if the expStop signal hasn't updated (i.e. the experiment was quit remotely or using the 'q' key) then the expStop event is reassigned as an origin signal and immediately takes a value of true.

This is untested.

@k1o0 k1o0 requested a review from jkbhagatio May 4, 2019 13:30
@jkbhagatio jkbhagatio merged commit 3c48d57 into dev May 7, 2019
jkbhagatio pushed a commit that referenced this pull request May 7, 2019
Revert "Merge pull request #149 from cortex-lab/expStop"
c7dd26c 
This reverts commit 3c48d57, reversing
changes made to d8d691e.
@jkbhagatio jkbhagatio deleted the expStop branch May 9, 2019 10:48
k1o0 pushed a commit that referenced this pull request Jan 3, 2021
Merge pull request #149 from cortex-lab/expStop
faeb322 
Fix for expStop error and bug where event updates twice
k1o0 pushed a commit that referenced this pull request Jan 3, 2021
Revert "Merge pull request #149 from cortex-lab/expStop"
d352b72 
This reverts commit 3c48d57, reversing
changes made to d8d691e.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jkbhagatio jkbhagatio jkbhagatio approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@k1o0 @jkbhagatio