Merge branch 'master' of git.ffhartmann.de:Julius/semesterproject_lecture_eeg

.gitignore

@@ -0,0 +1,6 @@
+# Ignore the n170 dataset, so that it wont be pushed onto the repo
+/Dataset/n170
+
+# Ignore unnecessary files
+utils/__pycache__
+.idea/

Dataset/README.md

@@ -1,2 +1,2 @@
 This folder should hold the n170 dataset.
-Put  the dataset here, so that the file structure: 'Dataset/n170/...' exists.
+Unpack the dataset here, so that the file structure: 'Dataset/n170/...' exists.

cached_data/decoding_data/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

cached_data/erp_peaks/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

cached_data/tf_data/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

erp_analysis.py

@@ -130,5 +130,5 @@ def analyze_erp(channels):
 
 if __name__ == '__main__':
     mne.set_log_level(verbose=VERBOSE_LEVEL)
-    # precompute_erp_df('N170')
+    precompute_erp_df('N170')
     analyze_erp(['P7', 'PO7', 'P8', 'PO8'])

preprocessing_and_cleaning.py

@@ -119,8 +119,6 @@ def run_ica(raw, dataset, subject, search='manual'):
 
     if search == 'manual':
         ica_raw.load_data()
-        # ica.plot_components(inst=ica_raw, ch_type='eeg', contours=0, topomap_args={'extrapolate': 'head'},
-        #                    psd_args={'fmin': 0, 'fmax': 80})
         ica.plot_properties(inst=ica_raw, dB=False, topomap_args={'extrapolate': 'head', 'contours': 0},
                             psd_args={'fmin': 0, 'fmax': 50}, picks=['eeg'])
         ica.plot_sources(ica_raw)