Skip to content

simplify code and fix setting duration by removing redundant variable #315

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

Merged
pellet merged 2 commits into from
Dec 14, 2025
Merged

simplify code and fix setting duration by removing redundant variable #315

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa63602
simplify code and fix setting duration by removing redundant variable
pellet Dec 13, 2025
de52ed4
Merge branch 'master' into bugfix/duration_setting
pellet Dec 13, 2025
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
9 changes: 4 additions & 5 deletions eegnb/experiments/Experiment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ def __init__(self, exp_name, duration, eeg, save_fn, n_trials: int, iti: float,
self.use_fullscr = use_fullscr
self.window_size = [1600,800]

# Initializing the record duration and the marker names
self.record_duration = np.float32(self.duration)
# Initializing the marker names
self.markernames = [1, 2]

# Setting up the trial and parameter list
Expand Down Expand Up @@ -320,14 +319,14 @@ def run(self, instructions=True):
if self.eeg:
if self.eeg.backend not in ['serialport']:
print("Wait for the EEG-stream to start...")
self.eeg.start(self.save_fn, duration=self.record_duration + 5)
self.eeg.start(self.save_fn, duration=self.duration + 5)
print("EEG Stream started")

# Record experiment until a key is pressed or duration has expired.
record_start_time = time()

# Run the trial loop
self._run_trial_loop(record_start_time, self.record_duration)
self._run_trial_loop(record_start_time, self.duration)

# Clearing the screen for the next trial
event.clearEvents()
Expand Down
Loading