Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add example showing all the eeg helmets #6158

Merged
merged 24 commits into from
Apr 23, 2019

Commits on Apr 16, 2019

  1. Configuration menu
    Copy the full SHA
    8be92ab View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2019

  1. Configuration menu
    Copy the full SHA
    22c2b41 View commit details
    Browse the repository at this point in the history
  2. use unit='auto'

    massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    79fb4dc View commit details
    Browse the repository at this point in the history
  3. use auto and transform=False

    massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    9b01b71 View commit details
    Browse the repository at this point in the history
  4. fix

    massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    fac9c01 View commit details
    Browse the repository at this point in the history
  5. MRG: Fix inconsistencies with compute_proj_raw (mne-tools#6160)

    * FIX: Fix inconsistencies with compute_proj_raw
    
    * BUG: SciPy req
    larsoner authored and massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    96d1070 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    cce5cec View commit details
    Browse the repository at this point in the history
  7. nilearn was updated

    agramfort authored and massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    1690d14 View commit details
    Browse the repository at this point in the history
  8. Raise ValueError if TFR freqs <= 0 (mne-tools#6169)

    * Added import _freq_mask
    
    Enable import the function _freq_mask from .numerics
    
    * Added _freq_mask function
    
    Added _freq_mask function equivalent to _time_mask function, but for frequency
    
    * Added tests for _freq_mask
    
    Added tests for _freq_mask
    
    * Added frequency cropping args to BaseTFR class
    
    Enables frequency cropping with tfr.crop(fmin, fmax) for TFR objects
    
    * Enhanced test_crop
    
    Enhanced test_crop to also test for frequency cropping.
    
    * updated documentation for BaseTFR.crop function,
    fixed floating point issues in utils.numerics._freq_mask
    
    * Updated docstring for BaseTFR.crop
    
    Updated docstring for BaseTFR.crop to show fmin/fmax params
    
    * Fixed _freq_mask
    
    fixed floating point error in _freq_mask
    
    * Adapted test_freq_mask to function changes
    
    Adapted test_freq_mask to error fix in freq_mask
    
    * Adapted docstring BaseTFR.crop
    
    Adapted docstring for version in BaseTFR.crop
    
    * Removed Debugging notes
    
    Removed Debugging notes from test_crop
    
    * correct spacing
    
    correct spacing
    
    * Fixed code format
    Fixed some code for flake8
    
    * Updated whats_new.rst
    Added changes to whats_new.rst
    
    * Updated whats_new.rst
    Fixed update to whats_new.rst
    
    * Eliminated Conflicts with master
    eliminated merge conflicts in mne.utils.__init__.py
    
    Also edited test_freq_mask and test_time_mask mne.utils.tests.test_numerics to find errors more explicitely.
    
    * fixed flake8 probs
    
    * changed _time/_freq_mask code style
    changed code format and error message.
    
    * Removed sfreq=None from _freq_mask
    -Removed sfreq=None argument default from mne/utils/numerics.py::_freq_mask
    -Adapted relevant tests and methods accordingly
    
    * Removed support for sfreq=None from _freq_mask
    -Introduced raise(ValueError) When sfreq=None
    -Introduced tests for sfreq=None case
    
    * Made _BaseTFR.crop omit mask if not defined.
    - _time_mask or _freq_mask are only called, if they were defined in crop()
    - _time_mask, _freq_mask were changed back to save time & mem
    
    * corrected new merge conflicts once again
    
    corrected merge conflicts with mne/utils/__init__.py
    
    * corrected conditions in _BaseTFR.crop
    
    corrected ```_time_mask``` and ```_freq_mask``` conditions in ```_BaseTFR.crop()```
    
    * Make TFR raise value error for freqs <= 0
    
    Make multitaper and morlet raise a value error if freqs include a frequency <= 0.
    
    Signed-off-by: Dirk Gütlin <[email protected]>
    
    * convert freqs in morlet and _make_dpss to np.array
    
    convert freqs in morlet and _make_dpss to np.array for faster computation
    
    Signed-off-by: Dirk Gütlin <[email protected]>
    
    * changed error statements
    
    changed error statements for invalid frequencies passed in mne/time_frequency/tfr.py ::morlet and ::_make_dpss
    
    Signed-off-by: Dirk Gütlin <[email protected]>
    DiGyt authored and massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    fa08e93 View commit details
    Browse the repository at this point in the history
  9. init (mne-tools#6181)

    jona-sassenhagen authored and massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    8dc00bf View commit details
    Browse the repository at this point in the history
  10. MRG+1: better title in plot_compare_evokeds (closes mne-tools#6165) (m…

    …ne-tools#6173)
    
    * better title in plot_compare_evokeds (closes mne-tools#6165)
    
    * use logger.info instead of warn
    
    * fix stupidity
    
    * simplify
    drammock authored and massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    fd1d227 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    09eeb1e View commit details
    Browse the repository at this point in the history
  12. DOC: make sure you get a warning when reading onsets which are not ti…

    …mestamps (mne-tools#6184)
    
    * DOC: make sure you get a warning when reading onsets which are not timestamps in .csv
    
    * non-empty match
    agramfort authored and massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    2e0d870 View commit details
    Browse the repository at this point in the history
  13. [MRG] RealTime client refactor (mne-tools#6141)

    * Add an example using the LSLClient
    
    n_chan --> n_channels
    
    * Refactor FTClient; Add MockLSLStream, refactor test to use mock stream
    
    * update reference and whats new
    
    * fixing some errors
    
    * update style
    
    * temp
    
    * improvements to the realtime module
    
    currently the test is breaking when it comes to using the RtEpochs object.
    
    * minor fix
    
    * move the RtEpochs testing to separate PR
    
    * cleanup
    
    * fix the way super is called
    
    * updated the MockLSLStream to take raw instance
    
    * add time dilation factor, cleanup
    
    * add more info on lsl identifier
    
    * address ci
    
    * skip running test with multiprocessing on windows
    
    Windows runs into a problem with multiprocessing: 'https://stackoverflow.com/questions/50079165/'
    
    * cleaned up the windows check
    
    * update the pylsl requirement to 1.12
    
    this is compatible across platforms
    teonbrooks authored and massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    18a4587 View commit details
    Browse the repository at this point in the history
  14. ENH: Add MNE-fsaverage (mne-tools#6174)

    * Keep eric's fsaverage
    
    * make set_montage_coreg_path as private
    
    * stip check manifest out from fsaverage
    
    * ENH: better parameter name
    
    * move the fsaverage info to fsaverage
    
    * FIX: docstring
    
    * [skip ci] move fsaverage files
    
    * rename
    
    * update the fsaverage manifests
    
    * FIX: use the new zip files
    
    * FIX: Fix test
    
    * FIX: manifests
    
    * FIX: Manifest again
    
    * FIX: Doc
    
    * FIX: call montage setter
    
    * ENH: Simplify
    
    * FIX: string
    
    * fix
    
    * Skip the test for 3.5, since zipfiles cannot be written
    massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    748ff19 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    79ccebc View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    c88bf12 View commit details
    Browse the repository at this point in the history
  17. whats new + couple words

    massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    c9f75ae View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    2226da4 View commit details
    Browse the repository at this point in the history
  19. document 'auto'

    massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    72c12e0 View commit details
    Browse the repository at this point in the history
  20. Cross reference the example

    massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    d4613b8 View commit details
    Browse the repository at this point in the history
  21. fix cross references

    massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    f5553d4 View commit details
    Browse the repository at this point in the history
  22. I forgot one

    massich committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    8f16135 View commit details
    Browse the repository at this point in the history
  23. FIX: Spelling [ci skip]

    larsoner authored Apr 23, 2019
    Configuration menu
    Copy the full SHA
    f0044f3 View commit details
    Browse the repository at this point in the history