Merge branch 'master' of https://c4science.ch/diffusion/1299/pycnbi

Authored by leekyuh on Aug 23 2017, 22:03.

Description

Merge branch 'master' of https://c4science.ch/diffusion/1299/pycnbi

Conflicts:
Utils/fif2mat.py

Merged Changes

CommitAuthorDetailsCommitted
7f63c8b7c78bleekyuh
preprocess() in pycnbi_utils.py: separate low-, band-, high-pass filter… 
Aug 18 2017
4a6bf4a315c9leekyuh
bugfix: in pycnbi_utils.py, preprocess() correctly converts channel names into… 
Aug 18 2017
559b9b0042efleekyuh
epochs2mat.py: Possibility to merge epochs from multiple raw files. 
Jul 7 2017
f14351d011f6leekyuh
mne 0.15+ compatibility 
Jul 6 2017
98d8fa0d6bb3leekyuh
pycnbi_config.py: "Analysis/" added to path upon loading. 
Jul 3 2017