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

Update with latest changes from develop #246

Merged
merged 37 commits into from
Mar 7, 2024
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
6579d6c
example test commit (#182)
JohnGriffiths Jun 2, 2022
ae4a5db
ci: run test workflow on develop branch
ErikBjare Jun 10, 2022
5c83bbe
ci: add develop branch to job triggers
ErikBjare May 5, 2022
32515fa
ci: fix syntax issue in workflow
ErikBjare Jun 16, 2022
75e42ef
fix: fixed import (brainflow updated API)
ErikBjare Jun 16, 2022
f139ab5
build(deps): locked pylsl==1.10.5 (#187)
ErikBjare Jun 16, 2022
e4e7d8a
Experiment Class Refactor (update to #183), converting specific exper…
Parvfect Aug 10, 2022
05bdf62
Submodule added for gsoc
Parvfect Sep 5, 2022
368afa3
Merge branch 'develop' of https://github.com/NeuroTechX/eeg-notebooks…
Parvfect Sep 5, 2022
6714740
Adding pipelines for cli analysis (#202)
Parvfect Oct 16, 2022
3f3281c
added more options for site args; improved function names; removed so…
JohnGriffiths Oct 16, 2022
79652af
fix subject num parsing bug
JohnGriffiths Oct 16, 2022
a62280a
analysis report function improvements for openbci cyton and gtec unic…
JohnGriffiths Oct 17, 2022
e7bee1b
run exp fix
JohnGriffiths Oct 18, 2022
e6e92b9
Update requirements.txt
JohnGriffiths Oct 20, 2022
30fb77c
fixes to get docs building by github action (#210)
pellet Oct 27, 2022
6783463
Update README.rst
JohnGriffiths Dec 1, 2022
3b1585f
removing gsoc submodule
JohnGriffiths Jan 19, 2023
8f41ebe
Merge branch 'master' into develop
JohnGriffiths Jan 19, 2023
478fa49
ci: update python to 3.8, update wxPython, update setup-python action
ErikBjare Mar 3, 2023
3bd12a7
ci: pin ubuntu versions to 22.04, updated wxPython urls
ErikBjare Mar 3, 2023
a4fe823
ci: bumped psychopy to 2023.1.0
ErikBjare Mar 3, 2023
c2c5d57
build(deps): set upper supported numpy version to 1.23.x
ErikBjare Mar 3, 2023
adf5e28
chore: applied no_implicit_optional
ErikBjare Mar 3, 2023
584272e
update dependencies - for build (#220)
oreHGA Mar 4, 2023
d0715cf
Updated psychopy (#215)
pellet Mar 4, 2023
c9b6671
Merge branch 'develop' into dev/update-wxpython
oreHGA Mar 4, 2023
53154c2
Updated doc examples for N170, P300 and SSVEP after Experiment Class …
Parvfect Mar 10, 2023
70758b7
Merge pull request #222 from NeuroTechX/dev/update-wxpython
ErikBjare Mar 11, 2023
c24b7c7
fix error breaking n170 test (#223)
pellet Mar 11, 2023
81dd244
fixed requirements.txt so 'pip install -e .' would work on windows. (…
pellet Apr 27, 2023
7be54d6
Get CI test builds working again! (#170)
ErikBjare Apr 27, 2023
9d61617
Merge branch 'master' into develop
oreHGA Nov 16, 2023
a4bec9b
fix macos build (#245)
pellet Nov 16, 2023
d8b5976
Add devcontainer configuration for CPU environment
tmorshed Dec 6, 2023
7cf7774
Fixed the python version needed
tmorshed Dec 8, 2023
d00c2dd
Fix plot conditions (#257)
JohnGriffiths Mar 7, 2024
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
Prev Previous commit
Next Next commit
fix subject num parsing bug
  • Loading branch information
JohnGriffiths committed Oct 16, 2022
commit 79652af421adda327ffb733bedbf8fc632c62bd7
9 changes: 5 additions & 4 deletions eegnb/analysis/utils.py
Original file line number Diff line number Diff line change
@@ -172,10 +172,11 @@ def load_data(
(mne.io.RawArray): loaded EEG
"""

subject_str = "*" if subject == "all" else f"subject{subject:04}"
session_str = "*" if session == "all" else f"session{session:03}"
if site == "all":
site = "*"
subject_int = int(subject)
session_int = int(session)

subject_str = "*" if subject == "all" else f"subject{subject_int:04}"
session_str = "*" if session == "all" else f"session{session_int:03}"

recdir = _get_recording_dir(device_name, experiment, subject_str, session_str, site)#, data_dir)
data_path = os.path.join(data_dir, recdir, "*.csv")