10511 Commits

Author SHA1 Message Date
Alexandre Gramfort 012b02bf40 bug overwritting params in _get_matrix_from_inverse_operator for PSF/CTF (#5393) 2018-08-04 12:26:08 +02:00
Henrich Kolkhorst 3d08007b75 Add support for offsets for arbitrary BrainVision marker types (#5391)
* add trig_shift_by_type parameter for read_raw_brainvision and deprecate response_trig_shift

* change formatting for docs
2018-08-03 22:30:25 +02:00
Joan Massich b9c712b237 [MRG] use set_annotations method for Raw objects (#4870) 2018-08-03 16:28:39 +02:00
Alexandre Gramfort 83e16e22b7 fix CTF MNE/dSPM due to comps (#5388)
* fix CTF MNE/dSPM due to comps

* simplify test
2018-08-03 15:19:19 +02:00
Britta Westner e60cc0ab0b Use src to create stc in beamformer code (#5317)
* use src to make stc in lcmv

* use src to make stc in dics

* storing src in filters for dics

* add src tests to lcmv

* rewrite tests to reflect changes in testing policy

* use already existing apply_lcmv for src test

* add test for dics

* update and fix docstrings

* change lcmv filters to only store src_type

* allow src_type as input to _make_stc

* adjust test for src to be test for src_type

* fix docstring

* exchange src with src_type in _make_stc

* adjust DICS to changes in _make_stc

* adjust DICS, iteration II

* pep8 fix

* adjust DICS test for filters

* adjust inverse.py to passing src_type instead of src

* fix _make_stc

* handle src_type being None

* add src_type as none if not in filter (lcmv)

* add src type as None if not in filters (dics)

* adapt tests for lcmv

* adapt dics tests

* fix docs / comments

* add flexible warning to _get_src_type

* add function for checking filters and warning message

* refactor lcmv and dics for filters and warning

* update emitted warning

* update tests lcmv

* adjust dics tests

* fix handling of dict

* fix dict handling, part II
2018-08-03 14:58:35 +02:00
Alexandre Gramfort 19a4428266 ENH : add replace param in raw.add_events (#5386) 2018-08-02 16:22:27 +02:00
Eric Larson 609515033e MRG: Fix check for avg ref (#5385)
* FIX: Fix check for avg ref

* FIX: Fix comps check
2018-08-01 13:33:44 +02:00
Eric Larson 52c432908a MRG: Fix resizing (#5378)
* FIX: Fix resizing

* FIX: One more
2018-08-01 13:26:31 +02:00
Eric Larson 5179d6c809 MRG: Fix sphere model fitting (#5381)
* FIX: Fix sphere model fitting

* FIX: Revert cons for old scipy
2018-08-01 09:00:27 +02:00
jona-sassenhagen 0af60b0598 Allow empty vlines in plot_compare_evokeds (#5376)
* init

* pep8
2018-07-31 20:21:40 -04:00
Eric Larson 16feb1ae3c MRG+1: Use read_mat for eeglab (#5326)
* ENH: Use read_mat

* FIX: Working

* FIX: Reorganize tests for speed

* FIX: Decs and nest

* FIX: Flake

* FIX: Fix for old pytest

* FIX: Nest imports

* FIX: Update

* DOC: whats_new.rst
2018-07-31 08:17:16 -04:00
Eric Larson fdba42d361 ENH: Add desc_prefix (#5371) 2018-07-28 08:29:22 +02:00
Thomas Hartmann 9358407481 updated external pymatreader to version 0.0.9. this fixes a bug that was discovered by @larsoner that prevented the proper loading of EEGLAB set files. (#5367) 2018-07-26 10:42:19 -04:00
Clemens Brunner 7e0e988b6e Merge pull request #5361 from sappelhoff/fix_meas_date_brainVision
read meas_date from BrainVision vmrk
2018-07-25 15:42:25 +02:00
Stefan Appelhoff b3f6182ae5 work regexp on stripped line 2018-07-25 12:59:00 +02:00
Stefan Appelhoff adb0897099 use meas_date unspecified in repr and test it 2018-07-25 11:07:57 +02:00
Stefan Appelhoff c37d2c10f9 make regex more specific 2018-07-25 10:56:18 +02:00
Eric Larson d109dd8d43 MRG: Fix Travis (#5363)
* FIX: Fix Travis

* FIX: Flake
2018-07-24 23:24:45 -04:00
Eric Larson 8bccec4977 MRG: Fix linkcode (#5350)
* FIX: Fix linkcode

* FIX: Fix linkcode

* FIX: Fix warning

* FIX: Minor fix

* FIX: Fix for windows

* FIX: Fix for Python2
2018-07-24 16:55:08 -04:00
Stefan Appelhoff 8d006f72f6 fix bugs, use math.modf now 2018-07-24 18:57:36 +02:00
Stefan Appelhoff 69ae9598d0 use for-else loop 2018-07-24 16:52:18 +02:00
Stefan Appelhoff 603c29d072 use for-else loop 2018-07-24 16:51:30 +02:00
Stefan Appelhoff 017a36325b corrected meas_date, and doc, and added test for repr() 2018-07-24 16:46:59 +02:00
Stefan Appelhoff 90d963ef04 break loop early, use proper time formatting 2018-07-24 15:56:48 +02:00
Stefan Appelhoff c3ee98337b read meas_date from BrainVision vmrk 2018-07-24 11:57:29 +02:00
Eric Larson 241161d00d MRG: Fix fwd with surf + discrete (#5354)
* FIX: Fix fwd with surf + discrete

* STY: docstring
2018-07-20 21:19:56 +02:00
Luke Bloy 1aea53a5e7 [MRG+1] CTF support for ds bad channels and bad segments (#5255)
* CTF support for ds bad channels and bad segments
2018-07-20 10:20:45 +02:00
Eric Larson e39e1f04cd FIX: Verbose (#5352) 2018-07-19 09:35:48 +02:00
Eric Larson 5389a456c4 ENH: Speed up a couple of tests (#5348)
* ENH: Speed up a couple of tests

* FIX: Combine runs
2018-07-18 13:49:05 -04:00
Christian Brodbeck 512fafcf40 [MRG] FIX (and test) scale_source_space() for uniform scaling (#5344)
* TEST scale fsaverage with uniform scaling

* FIX scale_source_space() for uniform scaling
2018-07-17 09:18:13 -04:00
Eric Larson a75970522e MRG: Rename buffer_size_sec (#5343)
* FIX: Rename buffer_size_sec properly

* FIX: Fix test
2018-07-16 16:39:01 -04:00
Eric Larson 52b94b1713 FIX: Dec 2018-07-16 16:07:01 -04:00
Alexandre Gramfort 1cedd32abe WIP : fix CTF lcmv due to comps (#5341)
* ugly hack

* add test

* flake8 + add XXX + update what's new
2018-07-16 21:50:05 +02:00
Eric Larson 039cb1bf52 MRG: Add pip requirements.txt and Travis runs (#5251)
* ENH: Test pip

* FIX: Bash

* FIX: More bash plus xdist

* FIX: Tweak

* FIX: ?

* FIX: Qt

* FIX: Remove Travis NumPy

* FIX: Mayavi req numpy

* FIX: Requirements

* FIX: Local fixes

* FIX: Speed up more

* FIX: Remove unneeded option

* ENH: Speed up CTF reading by using structured arrays

* ENH: Speed up beamforming tests

* FIX: Uncomment

* WIP: Use an extra split to get it to pass

* FIX: CTF

* FIX: Speed up?

* FIX: Fix Travis

* FIX: Dipole

* FIX: No skips

* FIX: Switch from sample to testing
2018-07-13 14:42:07 +02:00
Eric Larson 486c0638d8 FIX: Fix check 2018-07-11 19:53:50 -04:00
jona-sassenhagen 9af6fa422d MRG allow passing axes to evoked.plot_joint (#5263)
* init

* tests

* pep8

* FIX: whats_new.rst
2018-07-11 15:21:57 -04:00
Clemens Brunner 9b3883d4af Remove unused code after deprecation (#5331) 2018-07-10 15:53:21 +02:00
Eric Larson 4df573c93f FIX: Fix add_channels behavior (#5327) 2018-07-10 14:53:08 +02:00
Eric Larson 3022961cef ENH: Add ARTEMIS123 helmet (#5272) 2018-07-09 10:01:10 -04:00
Alexandre Gramfort f2fcc5aec0 attempt to fix interpolation of bad MEG sensors with applied compensation (#5321)
* attempt to fix interpolation of bad MEG sensors with applied compenstation.

* do not include comps in interpolation

* update what's new

* put back ref meg
2018-07-09 09:48:21 +02:00
Eric Larson 1442cc4b8c MRG: Modernize testing (#5308)
* ENH: Modernize tests

* FIX: Fix for newer traits

* FIX: Looser Subplot type check

* FIX: Fix docstring check

* FIX: Spelling

* FIX: Makefile
2018-07-06 16:18:33 +02:00
Tristan Stenner a44caaa3a5 Add nanovolts to allowed units in brainvision files (#5298)
* Add nanovolts to allowed units in brainvision files
2018-07-06 14:21:33 +02:00
Alexandre Gramfort f49022a6cf Macquarie kit layout (#5314) 2018-07-03 23:12:58 +02:00
Eric Larson 8812f9309c FIX: Fix for discrete (#5306) 2018-06-29 18:42:45 +02:00
Alexandre Gramfort a6ac948a43 MRG : better detect type of src for making an stc (#5231)
* wip : better detect type of src for making an stc

* fix VolSourceEstimate.as_volume when using multiple labels

* add test

* update docstring + update what's new

* deprecate save_stc_as_volume

* fix test

* address @larsoner's comments

* combined to mixed for src.kind with mixed source space
2018-06-28 09:10:45 -04:00
Clemens Brunner c2ad41f27f WIP: Set physical range to digital range for stim channels (#5160)
* Set physical range to digital range for stim channels (so that the scaling factor is 1)

* Scale up stim channel values if diff between max and min is less than 1

* Apply scaling only to data channels

* Don't scale stim channel for BDF files

* Move scaling up

* Get data index right

* Add GitHub PR and whats_new

* Fix for preload=False

* Add test with small BDF file

* FIX: Use testing

* PEP8
2018-06-27 12:21:52 -04:00
Alexandre Gramfort e4c995b451 Fix joint plot and compare_evoked for CTF data (#5295) 2018-06-24 17:28:10 +02:00
Eric Larson ef08c9ef02 MRG: Fix SNR estimation and plotting (#5291)
* FIX: Fix SNR estimation and plotting

* FIX: Fix docstring
2018-06-22 11:32:21 -04:00
Luke Bloy 5fb47e0e75 Fix check compensation on ica with EEG (#5270)
* Add test re: issue #5265

* Fix

* Add ctf test with apply compensation channels

* Appease travis

* Shorten test

* Fix Flake
2018-06-15 09:20:26 -04:00
Steven Bethard 76294a7b2e Fixes #5284: converts 1-indexed BrainVision offsets into 0-indexed mne offsets (#5285)
* Fixes #5284: converts 1-indexed BrainVision offsets into 0-indexed mne offsets

* Adds entry on fixing BrainVision indexing to What's New
2018-06-15 09:19:43 -04:00