Fixed merge conflict

This commit is contained in:
2021-03-29 16:27:41 +02:00
2 changed files with 47 additions and 16 deletions

View File

@@ -254,5 +254,6 @@ def time_frequency(dataset, filename, scaling='lin', compute_tfr=True):
if __name__ == '__main__':
mne.set_log_level(verbose=VERBOSE_LEVEL)
ds = 'N170'
decoding(ds, 'faces_vs_cars', True)
time_frequency(ds, 'face_intact_vs_all_0.1_50hz_ncf2', 'log', False)
# decoding(ds, 'faces_vs_cars', True)
time_frequency(ds, 'face_intact_vs_all_0.1_50hz_ncf2', 'log', True)