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 SSAEP - Single Frequency Experiment #280

Merged
merged 4 commits into from
Nov 21, 2024
Merged
Changes from 1 commit
Commits
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
Update ssaep_onefreq.py
removed some additional unneeded imports and white spaces
JohnGriffiths authored Nov 21, 2024
commit f2d7e5e09550544f6239267a813cb0748d3d4619
12 changes: 0 additions & 12 deletions eegnb/experiments/auditory_ssaep/ssaep_onefreq.py
Original file line number Diff line number Diff line change
@@ -13,10 +13,7 @@

import numpy as np
from pandas import DataFrame
#from psychopy import prefs
#prefs.general["audioLib"] = ["ptb"]
from psychopy import visual, core, event, sound
#from pylsl import StreamInfo, StreamOutlet
from scipy import stats

__title__ = "Auditory SSAEP (single freq)"
@@ -38,7 +35,6 @@ def present(
sample_rate=44100,
):


start = time()

# Set up trial parameters
@@ -54,9 +50,6 @@ def present(
)
fixation = visual.GratingStim(win=mywin, size=0.2, pos=[0, 0], sf=0, rgb=[1, 0, 0])
fixation.setAutoDraw(True)




# Generate stimuli
am1 = generate_am_waveform(cf1, amf1, secs=soa, sample_rate=sample_rate)
@@ -67,11 +60,9 @@ def present(
auds = [aud1]

mywin.flip()


# Show the instructions screen
show_instructions(duration)


# start the EEG stream=
if eeg:
@@ -114,8 +105,6 @@ def present(
eeg.stop()

mywin.close()




def show_instructions(duration):
@@ -150,7 +139,6 @@ def show_instructions(duration):

mywin.mouseVisible = True
mywin.close()


def generate_am_waveform(
carrier_freq,