Skip to content
Open
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
d1fb1c5
Added new Visual Pattern Reversal VEP experiment implementation, impr…
pellet Jul 16, 2025
91311dd
Merge branch 'master' into dev/prvep_experiment
pellet Jul 22, 2025
5f7cbbd
cleanup
pellet Aug 1, 2025
a4f2e0b
set up params and trial dataframe
pellet Aug 1, 2025
cbb3899
created BlockExperiment.py
pellet Aug 3, 2025
39147a5
fixed psychxr on 3.9
pellet Aug 3, 2025
f758b26
refactored experiment instructions
pellet Aug 3, 2025
43f6e58
fix
pellet Aug 3, 2025
7654574
fixed blocks and event markers
pellet Aug 4, 2025
d786e47
only 4 blocks
pellet Aug 6, 2025
4202631
block example
pellet Aug 13, 2025
456555f
fixed vr display
pellet Aug 15, 2025
4bcf3cf
dont bother with specifying python version in yml
pellet Aug 17, 2025
c1ac2fd
fixed numpy pin
pellet Aug 17, 2025
669a24e
remove the name field so it doesnt hardcode the environment name
pellet Aug 17, 2025
5dea45d
try individual eyes
pellet Aug 17, 2025
1619e3d
try drawing instructions for both eyes
pellet Aug 17, 2025
f698d67
draw block instructions correctly on monitor
pellet Aug 17, 2025
63cdfe2
draw iti for monitor and vr eyes
pellet Aug 17, 2025
ba485ef
try simplifying instructions per block for vr
pellet Aug 18, 2025
70febad
added refresh frame rate check
pellet Aug 18, 2025
342c683
fixed display on monitor which was crashing
pellet Aug 18, 2025
37d3252
fixed iti presentation to not occur mid-experiment
pellet Aug 18, 2025
f63569b
showing double vision
pellet Aug 18, 2025
fe79d11
fixed stereoscopic positioning
pellet Aug 19, 2025
f8cc28d
fixed monitor positioning
pellet Aug 19, 2025
647be89
fixed instructions
pellet Aug 19, 2025
2915061
try drawing block instructions to single eye
pellet Aug 20, 2025
1fede30
fix for globbing multiple sessions/subjects
pellet Aug 20, 2025
755be8c
try using consistent luminance in headset
pellet Aug 20, 2025
78f965d
use black background for other eye during instructions
pellet Aug 20, 2025
2e8522c
refactored to improve performance
pellet Aug 28, 2025
19349a9
allow early exit from instructions
pellet Aug 28, 2025
74a587c
clean up
pellet Aug 28, 2025
7e085c7
made more performant, no loading animation now
pellet Aug 28, 2025
3b2fedc
optimize again
pellet Aug 28, 2025
464f3a5
improved focus
pellet Aug 31, 2025
5227ced
fixed instructions
pellet Aug 31, 2025
d2e47c9
use conda
pellet Sep 18, 2025
fc9d1e3
revert change
pellet Oct 2, 2025
47c7311
Merge branch 'master' into dev/prvep_experiment
pellet Dec 4, 2025
9c0ff61
revert some unneeded changes
pellet Dec 4, 2025
49914d3
clean up
pellet Dec 4, 2025
08047d1
revert non-essential changes
pellet Dec 4, 2025
11a8dc5
removed unneeded members
pellet Dec 4, 2025
6668591
Merge branch 'master' of github.com:pellet/EEG-ExPy into dev/prvep_ex…
pellet Feb 5, 2026
00c6d23
Merge branch 'NeuroTechX:master' into dev/prvep_experiment
pellet Mar 4, 2026
8646f4d
Add missing pyxid2 dependency to requirements
pellet Mar 5, 2026
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
clean up
  • Loading branch information
pellet committed Aug 28, 2025
commit 74a587cbf541cd093aeaa60e6077d7f1ba12d76a
8 changes: 2 additions & 6 deletions eegnb/experiments/Experiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"""

from abc import abstractmethod, ABC
from typing import Callable, Optional
from typing import Callable
from eegnb.devices.eeg import EEG
from psychopy import prefs
from psychopy.visual.rift import Rift
Expand Down Expand Up @@ -304,14 +304,10 @@ def iti_with_jitter():
rendering_trial = current_trial
else:
self._draw(lambda: self.present_iti())
# log 'present iti' with the elapsed time and trial end time
# Log the ITI presentation
# logger.info(f"Present ITI - Trial: {current_trial}, Elapsed Time: {elapsed_time:.3f}s, Trial End Time: {trial_end_time:.3f}s, Trial Start Time: {trial_start_time:.3f}s")

if self._user_input('cancel'):
return False

# Return the number of trials that were run

return True

def run(self, instructions=True):
Expand Down