Merge branch 'master' into develop

doc/getting_started/available_notebooks.md

@@ -2,7 +2,7 @@
 # Available Notebooks
 
 ### Visual P300 with Oddball paradigm
-The visual P300 is a spike that occurs 300ms after perceiving a visual stimulus that has implications on decision making. This was validated in Muse by Alexandre Barachant with the Oddball paradigm, in which low-probability target items (oddballs) are interspersed with high probability non-target items. With AB's paradigm, the experiment takes about 10 minutes to run (5 x 2 minute trials). Although the Muse's sensors aren't in the ideal position for detecting the P300, AB was able to attan "good" accuracy in identifying P300 spikes.
+The visual P300 is a spike that occurs 300ms after perceiving a visual stimulus that has implications on decision making. This was validated in Muse by Alexandre Barachant with the Oddball paradigm, in which low-probability target items (oddballs) are interspersed with high probability non-target items. With AB's paradigm, the experiment takes about 10 minutes to run (5 x 2 minute trials). Although the Muse's sensors aren't in the ideal position for detecting the P300, AB was able to attain "good" accuracy in identifying P300 spikes.
 
 ### N170
 The N170 is an ERP specifically related to the perception of faces. This was validated in Muse by Hubert with a 12 minute experiment (6 x 2 minute trials). Stimuli consists of 12 pictures of houses and 12 pictures of faces. Accuracy of N170 detection is rather good.
@@ -22,7 +22,7 @@ The steady state auditory evoked potential is a frequency response produced when
 ### C1 and P1
 C1 and P1 are two ERPs related to the perception of a visual stimulus. The C1 is the first component, appearing in the 65-90ms range after stimulus onset while the P1 appears later, around 100ms.
 
-C1 and P1 were validated in Muse by Hubert with a left/right visual field experiment. Comparing ERPs to left or right-field presentation of visual stimuli revealed a contralateral pattern of C1 and P1 in the both the temporal and anterior electrodes. However, their timing seems a little delayed.
+C1 and P1 were validated in Muse by Hubert with a left/right visual field experiment. Comparing ERPs to left or right-field presentation of visual stimuli revealed a contralateral pattern of C1 and P1 in both the temporal and anterior electrodes. However, their timing seems a little delayed.
 
 
 ### Auditory P300

eegnb/analysis/utils.py

@@ -5,10 +5,8 @@
 import sys
 from collections import OrderedDict
 from glob import glob
-from typing import Union, List#, Dict
-# from collections import Iterable
+from typing import Union, List
 from time import sleep, time
-# from numpy.core.fromnumeric import std
 import keyboard
 import os
 

eegnb/cli/__main__.py

@@ -13,6 +13,7 @@
 from typing import Optional
 
 
+
 @click.group(name="eegnb")
 def main():
     """eeg-notebooks command line interface"""

eegnb/experiments/Experiment.py

@@ -94,6 +94,7 @@ def setup(self, instructions=True):
                 # Generating save function
                 experiment_directory = self.name.replace(' ', '_')
                 self.save_fn = generate_save_fn(self.eeg.device_name, experiment_directory, random_id, random_id, "unnamed")
+
                 print(
                     f"No path for a save file was passed to the experiment. Saving data to {self.save_fn}"
                 )
@@ -169,3 +170,4 @@ def run(self, instructions=True):
     def name(self) -> str:
         """ This experiment's name """
         return self.exp_name
+

eegnb/experiments/auditory_oddball/aob.py

@@ -8,9 +8,11 @@
 from typing import Optional
 
 
+
 class AuditoryOddball(Experiment.BaseExperiment):
 
     def __init__(self, duration=120, eeg: Optional[EEG]=None, save_fn=None, n_trials = 2010, iti = 0.3, soa = 0.2, jitter = 0.2, secs=0.2, volume=0.8, random_state=42, s1_freq="C", s2_freq="D", s1_octave=5, s2_octave=6):
+
         """
 
         Auditory Oddball Experiment

eegnb/experiments/visual_n170/n170.py

@@ -22,9 +22,11 @@
 from typing import Optional
 
 
+
 class VisualN170(Experiment.BaseExperiment):
 
     def __init__(self, duration=120, eeg: Optional[EEG]=None, save_fn=None,
+
             n_trials = 2010, iti = 0.4, soa = 0.3, jitter = 0.2):
 
         # Set experiment name        

eegnb/experiments/visual_p300/p300.py

@@ -20,6 +20,7 @@
 class VisualP300(Experiment.BaseExperiment):
 
     def __init__(self, duration=120, eeg: Optional[EEG]=None, save_fn=None,
+
             n_trials = 2010, iti = 0.4, soa = 0.3, jitter = 0.2):
 
         exp_name = "Visual P300"

eegnb/experiments/visual_ssvep/ssvep.py

@@ -80,6 +80,7 @@ def init_flicker_stim(frame_rate, cycle, soa):
             )
         )
 
+
         return [
             init_flicker_stim(frame_rate, 2, self.soa),
             init_flicker_stim(frame_rate, 3, self.soa),

eegnb/experiments/visual_vep/vep.py

@@ -8,6 +8,7 @@
 class VisualVEP(Experiment.BaseExperiment):
 
     def __init__(self, duration=120, eeg: Optional[EEG]=None, save_fn=None,
+
             n_trials = 2000, iti = 0.2, soa = 0.2, jitter = 0.1):
 
         exp_name = "Visual VEP"