Skip to content

Commit d875d82

Browse files
authored
Merge pull request #685 from int-brain-lab/develop
Develop
2 parents 000bd1b + 934f9da commit d875d82

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+4381
-2030
lines changed

.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[flake8]
22
max-line-length = 130
3-
ignore = W504, W503, E266
3+
ignore = W504, W503, E266, D, BLK
44
exclude =
55
.git,
66
__pycache__,

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ __pycache__
77
python/scratch
88
.idea/*
99
.vscode/
10+
*.code-workspace
1011
*checkpoint.ipynb
1112
build/
1213
venv/

brainbox/behavior/pyschofit.py

Lines changed: 0 additions & 306 deletions
This file was deleted.

brainbox/behavior/training.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
from one.api import ONE
5353
from one.alf.io import AlfBunch
5454
from one.alf.exceptions import ALFObjectNotFound
55-
5655
import psychofit as psy
5756

5857
_logger = logging.getLogger('ibllib')
@@ -83,15 +82,16 @@ class TrainingStatus(IntFlag):
8382
... assert TrainingStatus[status.upper()] in ~TrainingStatus.FAILED, 'Subject untrained'
8483
... assert TrainingStatus[status.upper()] in TrainingStatus.TRAINED ^ TrainingStatus.READY
8584
86-
# Get the next training status
85+
Get the next training status
86+
8787
>>> next(member for member in sorted(TrainingStatus) if member > TrainingStatus[status.upper()])
8888
<TrainingStatus.READY4RECORDING: 128>
8989
9090
Notes
9191
-----
9292
- ~TrainingStatus.TRAINED means any status but trained 1a or trained 1b.
9393
- A subject may acheive both TRAINED_1A and TRAINED_1B within a single session, therefore it
94-
is possible to have skipped the TRAINED_1A session status.
94+
is possible to have skipped the TRAINED_1A session status.
9595
"""
9696
UNTRAINABLE = auto()
9797
UNBIASABLE = auto()

0 commit comments

Comments
 (0)