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 from upstream #1

Open
wants to merge 213 commits into
base: dev_inscapesMEG
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
213 commits
Select commit Hold shift + click to select a range
1223246
hope that this sticks
Feb 4, 2019
97d4f19
Merge branch 'master' into mri_laptop
Feb 6, 2019
a1fc0d8
Merge branch 'master' into mri_laptop
Feb 8, 2019
a3bd270
switch to audio filtered videos
Feb 8, 2019
39dada1
Merge branch 'master' into mri_laptop
Feb 11, 2019
70e66f7
Merge branch 'master' into mri_laptop
Feb 11, 2019
7df1db3
use inscapes filtered
Feb 11, 2019
c437ab9
Merge branch 'master' into mri_laptop
Nov 11, 2019
eda4afb
add friends-s2
bpinsard Dec 16, 2019
4826c76
check if power is plugged in at startup, to avoid any failed scans du…
bpinsard Dec 19, 2019
9e709dd
working on eyetracking automatization
bpinsard Feb 27, 2020
c3d1958
working on push-to-talk function
bpinsard Feb 27, 2020
80566ac
friends s3
bpinsard Feb 27, 2020
dc566e4
test session for audio video sync
bpinsard Feb 27, 2020
23ee331
code to check if laptop is plugged on power outlet
bpinsard Feb 27, 2020
be4950f
switch to MovieStim2 due to video lags in MovieStim3
bpinsard Feb 27, 2020
130c79f
avoid clearing buffer for videos
bpinsard Mar 4, 2020
d4ed142
changetoptt
bpinsard Mar 4, 2020
26cc65f
large restructuration of the code to make it cleaner
bpinsard Mar 4, 2020
f6b8487
fixes following the major restructuring
bpinsard Mar 5, 2020
df86c85
wip: polishing eyetracker client
bpinsard Mar 6, 2020
7beb378
save eye video for tests
bpinsard Mar 9, 2020
f55677f
un-annex stuff!!
bpinsard Mar 9, 2020
561c76f
un-annex stuff!!
bpinsard Mar 9, 2020
5c82824
un-annex stuff!!
bpinsard Mar 9, 2020
fb967ba
unannex
bpinsard Mar 9, 2020
fa298ad
unannex
bpinsard Mar 9, 2020
51d4e79
tabarnakkkkkkkkkkkkkk
bpinsard Mar 9, 2020
444a940
remove git-annex shit
bpinsard Mar 9, 2020
68f8b15
git-annex wtf happened
bpinsard Mar 9, 2020
120efee
Merge branch 'master' into dev
bpinsard Mar 9, 2020
e946ece
remove git-nan
bpinsard Mar 9, 2020
cc54585
trying for 1h to fix git-annex mess
bpinsard Mar 9, 2020
56e3985
delete
bpinsard Mar 9, 2020
2cd6067
readd files
bpinsard Mar 9, 2020
50eb931
fix battery checking when using desktop
bpinsard Mar 9, 2020
1d7ddbe
add profiling option to improve perfs
bpinsard Mar 10, 2020
32670b8
profiling and bug fix
bpinsard Mar 10, 2020
22b5d6c
fix eyetracking issues
Mar 13, 2020
f93ece8
add a new class for looping on set of videogame levels
bpinsard Sep 5, 2020
d045a74
add session script for 3 shinobi levels looping
bpinsard Sep 7, 2020
b003377
Merge branch 'master' into mri_laptop
bpinsard Sep 8, 2020
7513466
restructuring, improve video games
bpinsard Sep 9, 2020
ce5412e
refactor videogame code and optimize to avoid lags
bpinsard Sep 11, 2020
be0b366
add pause to shinobi
bpinsard Sep 14, 2020
edeb924
change doc for CLI changes
bpinsard Sep 14, 2020
bf1c273
display initial frame and soundblock
bpinsard Sep 14, 2020
953f3a6
code basic likert scale for games self-eval during scan
bpinsard Sep 15, 2020
b879a0e
remove autolog from likerts stimuli
bpinsard Sep 16, 2020
d5764e3
bunch of changes before covid, need to merge with all changes done on…
Sep 18, 2020
17eac23
merge
Sep 18, 2020
57ed4d1
Merge branch 'dev' of github.com:courtois-neuromod/task_stimuli into dev
bpinsard Sep 18, 2020
a93e6f3
coding videogame questionaire.
bpinsard Sep 21, 2020
f30c876
wip
bpinsard Oct 1, 2020
b28bdd9
fix vg sizing issues
bpinsard Oct 5, 2020
a35cfa5
cleanup
bpinsard Oct 5, 2020
0a1ddac
pass parsed params to sessions task loading for emotions/prisme and c…
bpinsard Oct 6, 2020
45e6af9
cleanup
bpinsard Oct 8, 2020
5c3127c
fix button presses buffer clearing between runs
bpinsard Oct 8, 2020
c387319
config for new projector
Oct 8, 2020
4c358af
config for new projector
Oct 8, 2020
9ea44ee
Merge branch 'master' into mri_laptop
Oct 8, 2020
3aa1e8e
fix set/unset game handler
bpinsard Oct 9, 2020
39b107c
tests
Oct 9, 2020
d52f8ac
merge
Oct 9, 2020
8fda8e6
difference in python libs/versions
Oct 20, 2020
7497593
add friends s4
Oct 20, 2020
87bff93
Merge branch 'mri_laptop' of github.com:courtois-neuromod/task_stimul…
Oct 20, 2020
e3c2ea0
force resolution at start: wip
Oct 20, 2020
baed491
force screen resolution at startup, restructure code
bpinsard Oct 20, 2020
7714634
Merge branch 'mri_laptop'
bpinsard Oct 20, 2020
ca2de3e
optimizing things
bpinsard Oct 23, 2020
b4caebb
things task: wip
bpinsard Oct 23, 2020
e0b4cce
generator of design and fix the task, almost working
bpinsard Oct 26, 2020
975996f
fix pb with movie recording. it is still very RAM-intensive to store …
bpinsard Oct 26, 2020
4c3e22c
Merge branch 'record_movie' into things
bpinsard Oct 26, 2020
58ca916
things, and record movie downsampling
bpinsard Oct 27, 2020
8db5270
change Things task for non-slip timing,
bpinsard Oct 27, 2020
3b2adaa
reset screen after script run
bpinsard Oct 27, 2020
fbceefd
merge
bpinsard Oct 27, 2020
198316d
improve non-slip timing
bpinsard Oct 28, 2020
5d88606
merge
bpinsard Oct 28, 2020
e7ecd6f
update zmq_tools and eyetracking for pupil2
bpinsard Nov 3, 2020
3836236
add dev option for debug/profile, cleanup and reorde init
bpinsard Nov 11, 2020
a34b83c
merge
bpinsard Nov 11, 2020
c691d3a
fix call to calibration
bpinsard Nov 11, 2020
fdae44f
better saving of task events and data, unified name generation to fol…
bpinsard Dec 9, 2020
f1fef13
rename emotions as liris
bpinsard Dec 9, 2020
5ae2b54
fix task naming for liris
bpinsard Dec 9, 2020
56f07da
update eyetracking, fix threading issues
bpinsard Dec 10, 2020
87bdf78
use callback to store pupils during calibration
bpinsard Dec 11, 2020
80f9ad4
factorize events saving
bpinsard Dec 11, 2020
9ffbb03
generate event file for calibration task, black
bpinsard Dec 11, 2020
3de441a
fix event logging
bpinsard Dec 11, 2020
0f309b2
apply black
bpinsard Dec 11, 2020
bcd4403
calibrate et for each task
bpinsard Dec 11, 2020
c269a49
remove waitBlanking for exp_win, to allow non-slip timing
bpinsard Dec 11, 2020
e6daccb
fix pupil accessor
bpinsard Dec 11, 2020
6ae2a96
fix eyetracking issues
bpinsard Jan 12, 2021
e39db9b
log computer monotonic time with events
bpinsard Jan 12, 2021
ffc48b1
fix loading of scenarii, randomize order of levels within runs
bpinsard Jan 12, 2021
f918b42
code to create design files
bpinsard Jan 13, 2021
5e06869
complete coding of ThingsMemory task.
bpinsard Jan 15, 2021
76d182e
comment design generation
bpinsard Jan 15, 2021
d404f1f
change to circular mapping
bpinsard Jan 19, 2021
0b7050a
change wrap_width for instruction
bpinsard Jan 19, 2021
badc9f7
add a requirement file, wip
bpinsard Jan 19, 2021
dcaaf87
[DATALAD] Recorded changes
bpinsard Jan 21, 2021
490fbc0
reinstall things stimuli subdataset
bpinsard Jan 22, 2021
26e4997
set images size in visual angle
bpinsard Jan 22, 2021
0c91f5b
add mapping for controller for Things memory task
bpinsard Jan 26, 2021
af0b24a
Merge branch 'master' into things_mem
bpinsard Jan 26, 2021
29991e5
[DATALAD] Recorded changes
bpinsard Jan 26, 2021
c07c867
[DATALAD] new dataset
bpinsard Jan 28, 2021
76634ad
save .gitattributes
bpinsard Jan 28, 2021
4e3ffb7
add static images and source svgs
bpinsard Jan 28, 2021
6b11790
save structure
bpinsard Jan 28, 2021
4644003
adjust instructions for marker fixation
bpinsard Feb 3, 2021
27aa68d
[DATALAD] Recorded changes
bpinsard Feb 3, 2021
9e49e50
update submodule
bpinsard Feb 3, 2021
c1cf7b6
use local copy of gym-retro game for simplified and robust deployment
bpinsard Feb 3, 2021
21e67d5
merge videogames
bpinsard Feb 3, 2021
808a129
Merge branch 'things_mem'
bpinsard Feb 3, 2021
d4a57e4
change pseudo-randomization to have constant seen/unseen ratio in eac…
bpinsard Feb 9, 2021
2f2e0c4
add pandas as requirementes
bpinsard Feb 12, 2021
ef89578
add friends season 5
bpinsard Feb 16, 2021
3b0a4e2
things mem to use real images not pilot ones
bpinsard Feb 16, 2021
6582eb1
Merge branch 'master' of github.com:courtois-neuromod/task_stimuli
bpinsard Feb 16, 2021
78ea449
load env with dotenv
bpinsard Feb 16, 2021
871041e
fix python integer division
bpinsard Feb 16, 2021
09ce813
fix rendering
bpinsard Feb 16, 2021
c501079
fix rendering
bpinsard Feb 16, 2021
a33a3f3
add template .env
bpinsard Feb 16, 2021
869548c
fix problem when restarting the task
bpinsard Mar 1, 2021
73b148f
merge
bpinsard Mar 1, 2021
f95b88c
fix framerate issue,
bpinsard Mar 1, 2021
2a07b56
add a reading task class for word by word reading
FrancoisPgm Mar 4, 2021
5737a75
comment out height arg and add ses-harrypotter
Mar 9, 2021
4deb641
add clearbuffer through yield
bpinsard Mar 9, 2021
b61e610
fix colorspace error
bpinsard Mar 9, 2021
0b49362
Merge branch 'master' into harry_potter
bpinsard Mar 9, 2021
7accb51
use target in triplets as word for test
Mar 9, 2021
fc23631
Merge branch 'harry_potter' of https://github.com/courtois-neuromod/t…
Mar 9, 2021
6659689
Merge branch 'harry_potter' of github.com:courtois-neuromod/task_stim…
bpinsard Mar 9, 2021
530ba99
fixes
bpinsard Mar 10, 2021
da3ef6e
add a helper function for non-slip timing.
bpinsard Mar 11, 2021
834235d
try to fix timing issue
bpinsard Mar 11, 2021
ba36e32
fix response mapping: seems ok now, implement operator feedback
bpinsard Mar 12, 2021
44f1227
fix colorspace errors with newer psychopy.
bpinsard Mar 16, 2021
0865908
Merge branch 'master' into videogames
bpinsard Mar 16, 2021
195433c
fix wrong scenario name
bpinsard Mar 16, 2021
993583b
fix: load state from custom only
bpinsard Mar 16, 2021
ba6e224
add a suggestion if --task arg is wrong
FrancoisPgm Mar 18, 2021
6f792c0
Revert "add a reading task class for word by word reading"
FrancoisPgm Mar 18, 2021
f642eb2
remove randomization, fix loading of custom integration
bpinsard Mar 19, 2021
5f32ff9
make calibration restart if failed. add instruction for rolling eyes
bpinsard Mar 23, 2021
025a66f
add yield to clear things instructions
bpinsard Mar 24, 2021
5dbe4a5
Merge branch 'things_mem'
bpinsard Mar 24, 2021
8430464
Merge branch 'eyetracking_pupil2'
bpinsard Mar 24, 2021
033e446
Add events tasks, load them with pd.read_csv
FrancoisPgm Mar 31, 2021
55208d4
Merge branch 'things_mem' into harry_potter
bpinsard Apr 1, 2021
228d4a5
implement non-slip code, save flips
bpinsard Apr 6, 2021
51640bd
merge
bpinsard Apr 6, 2021
0b7fa3a
fix the italic display due to psychopy bug
bpinsard Apr 6, 2021
6b9d33f
add updated hp tsv files
bpinsard Apr 7, 2021
05cca2e
fix tsv path in session script
bpinsard Apr 7, 2021
8fbe738
fix non-slip timing code
bpinsard Apr 7, 2021
7445ad8
fix hp progress bar
bpinsard Apr 7, 2021
aefe1fe
fix end of task
bpinsard Apr 7, 2021
f3b5342
add separate session for shinobi MEG
bpinsard Apr 9, 2021
1f755a9
Merge branch 'master' into videogames
bpinsard Apr 9, 2021
b5ef8f4
set max duration to 9min
bpinsard Apr 9, 2021
d5fc3ca
finish coding questionnaire for flow measures
bpinsard Apr 9, 2021
2bed8f5
properly log questionnaire in events file, when changing value and fi…
bpinsard Apr 12, 2021
c354d72
change design for half runs, randomize examplar orders while keeping …
bpinsard Apr 12, 2021
8a9cb26
fix double logging of value change when loading questionnaire
bpinsard Apr 12, 2021
c9f81c1
Merge branch 'things_mem' into eyetracking_pupil2
bpinsard Apr 13, 2021
f83d93f
fix saving eyetracking calibration data
bpinsard Apr 20, 2021
8415df4
wip: implement KK/HCP/NSD retinotopy task
bpinsard Apr 23, 2021
f734d3b
created session file for supermariobros
hyruuk Apr 27, 2021
19ceb94
removed supermariobros files added by mistake
hyruuk Apr 27, 2021
238241e
wip retino
bpinsard Apr 28, 2021
2a71869
set 2d detector intensity range to 4 at startup
bpinsard Apr 28, 2021
b7aa1cb
wip: timing adjustment for TR in retino
bpinsard Apr 29, 2021
df0ebf0
add clock type to log_events, update retinotopy for our TR
bpinsard Apr 29, 2021
874560e
fix timing
bpinsard Apr 29, 2021
54a1196
add an option to skip screen resolution forcing
bpinsard Apr 29, 2021
c323139
Merge branch 'master' into eyetracking_pupil2
bpinsard Apr 29, 2021
b138140
fix file saving: should occur after task is fully stopped in particul…
bpinsard Apr 29, 2021
41daedb
[DATALAD] Recorded changes
bpinsard Apr 30, 2021
1d2611a
Merge branch 'videogames' into supermariobros
bpinsard Apr 30, 2021
1846662
cleaner sound handling across emulators
bpinsard May 5, 2021
cf0fccb
make nicer instructions
bpinsard May 5, 2021
d6e6c98
renaming to mario
bpinsard May 7, 2021
1f5ff7d
Merge branch 'things_mem' into mario
bpinsard May 7, 2021
46f8605
Merge branch 'master' into mario
bpinsard May 7, 2021
d3d3eca
update mario.stimuli
bpinsard May 11, 2021
bbcb5f9
retinotopy for mixed wedges and rings, global fixes to progress bar
bpinsard May 13, 2021
df9536f
fix flip timing/logging issues
bpinsard May 13, 2021
a5f9034
fix flip timing log, add retino block in events file
bpinsard May 20, 2021
53339b9
Merge branch 'retino'
bpinsard May 20, 2021
bfc27f2
refix flip timing log, only show first response for RT
bpinsard May 20, 2021
98cadae
Merge branch 'retino'
bpinsard May 20, 2021
aa44526
merge didyoumean
bpinsard May 20, 2021
bcc8ce7
merge
bpinsard May 20, 2021
3ed9cef
Merge branch 'master' into mario
bpinsard May 21, 2021
a54335b
code adaptive design for mario, required important changes to the cod…
bpinsard May 21, 2021
42de8df
restore previous run duration
bpinsard May 21, 2021
dcaf3f2
uncommented flow questionnaire after each repetition
hyruuk Jun 1, 2021
080bee7
fix bk2 saving, log key releases
bpinsard Jun 2, 2021
6b1dae0
reorder soundcheck and pauses.
bpinsard Jun 17, 2021
5c171a7
fix skip_n_tasks
bpinsard Jun 29, 2021
54f48a9
Merge branch 'dev_inscapesMEG' into master
hyruuk Jul 1, 2021
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 .datalad/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

config annex.largefiles=nothing
metadata/aggregate* annex.largefiles=nothing
metadata/objects/** annex.largefiles=(anything)
2 changes: 2 additions & 0 deletions .datalad/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[datalad "dataset"]
id = 2b3f09cc-05d0-4364-a694-73e1af4079e6
3 changes: 3 additions & 0 deletions .env.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export PUPIL_PATH=../pupil
#export PUPIL_PATH=/home/basile/data/src/pupil
export GI_TYPELIB_PATH=/usr/local/lib/x86_64-linux-gnu/girepository-1.0/
9 changes: 9 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
* annex.backend=MD5E
**/.git* annex.largefiles=nothing
*.jpg annex.largefiles=anything
*.png annex.largefiles=anything
*.svg annex.largefiles=anything
*.txt annex.largefiles=nothing
*.tsv annex.largefiles=nothing
*.csv annex.largefiles=nothing
*.py annex.largefiles=nothing
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,4 @@ venv.bak/

# mypy
.mypy_cache/
data/things/memory_designs/*
12 changes: 12 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[submodule "data/things/images"]
path = data/things/images
url = [email protected]:courtois-neuromod/things.stimuli.git
datalad-id = 5504289b-0ac5-4f7c-a6cd-86af1f5c2135
[submodule "data/videogames/shinobi"]
path = data/videogames/shinobi
url = [email protected]:courtois-neuromod/shinobi.stimuli.git
datalad-id = 74cb8a6e-664b-11eb-a4f2-1a44c1d5432b
[submodule "data/videogames/mario"]
path = data/videogames/mario
url = [email protected]:courtois-neuromod/mario.stimuli.git
datalad-id = 23782599-795f-46e5-aefe-5ecd578e968d
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,13 @@ mkdir output

## how to launch a session

`python3 main.py --subject test --ses videoshorttest --eyetracking --fmri`
`python3 main.py --subject test --session video003 --tasks videoshorttest --eyetracking --fmri -o /path/to/dataset/`

- --subject: can be whatever, will be used to save data in a bids-like structure
- --session: must match the name of a session script in `src/ses-<session_name>.py`, which contains the tasks to be ran on that session
- --session: a session identifier that will be used to save the data in the BIDS
- --tasks: must match the name of a session script in `src/ses-<session_name>.py`, which contains the tasks to be ran on that session
- --eyetracking: turn on eyetracking, start pupil software and recording of eye
- -o : specifies the path to the root of the dataset where to output the data (in sourcedata or BIDS )

- --fmri: will wait for TTL (can be emulated with character `5` on the keyboard) to start the tasks that are labeled as fmri dependent. When not using that flag, tasks will run back to back. It will also append a video loop at the beginning of the session in order for the participant to have sound and visual stimuli to test the setup (then skip to start the session).

Expand Down
123 changes: 0 additions & 123 deletions bug_game.txt

This file was deleted.

Loading