Fix: Wrong channel-adjacency-matrix for Neuromag122#8891
Fix: Wrong channel-adjacency-matrix for Neuromag122#8891larsoner merged 10 commits intomne-tools:mainfrom
Conversation
|
I don't understand why some checks fail. |
|
Do you think, this is sufficient as a solution? |
In this case those two builds can be ignored, the failure is unrelated and @drammock plans to look into it soon.
Maybe we should wait a couple of days to hear from the upstream issue fieldtrip/fieldtrip#1676 , and then merge this if we can't get an updated file, WDYT? |
|
Yes sure, that would interest me too (maybe there are several versions of Neuromag122?). Thank you for looking into it |
|
... as mentioned in the issue, let's get rid of the |
|
Ok:) |
|
@marsipu I realized that we are missing some sort of test. This is a little bit tricky because we don't have a Neuromag 122 test file. Do you have or could you create some tiny raw (you could crop it to 1 sec and save it in MNE) file that we could add to the testing dataset? I would probably put it in misc. Then we could for example add a tiny test that connectivity can be computed and the result is a sparse array of shape |
|
Ok sure, I'll do it as soon as I got time |
|
Oh, I rebased the branch but I didn't think about the commits then being part of the pull request. Is this a problem, should I revert the new commits from main? |
Hmmm, if you rebase properly then the commits from Is actually a different commit actually in How did you do the rebase? One option is that, if your latest commit is actually meant to be b2ef4a0, you can do |
6746b00 to
b2ef4a0
Compare
|
Thank you for your help, I started the rebase in a terminal with but then pushed the changes with PyCharm (because I am still a bit confused about how the GitHub authentication works and in PyCharm my credentials are already stored). Maybe that combination was the problem. |
b2ef4a0 to
19e8889
Compare
|
I added the test-file to mne-testing and updated the version in mne, just the hash-update is missing. |
I added a first attempt of a test, not sure if it is at the right spot (I haven't got a lot of experience with testing yet) |
larsoner
left a comment
There was a problem hiding this comment.
Looks like it should work after a hash update!
|
Ok, I don't know why it was not changed in the conversation, but I already changed the testing-version in 2e2f76c before. so I marked the conversation as resolved, right? |
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
ef03005 to
c759a70
Compare
|
I rebased the branch onto upstream/main to resolve the conflict in latest.inc. |
* upstream/main: MAINT: Skip matplotlib pre for now (mne-tools#8973) FIX: Brain lights (mne-tools#8972) MNT: Migrate VTK Widgets (mne-tools#8862) Fix (mne-tools#8971) Fix indexing dipoles read from a bdip file (mne-tools#8963)
|
Thanks @marsipu ! |
* upstream/main: MAINT: Revert conda azure change (mne-tools#8978) make large rotation penalty optional in chpi function (mne-tools#8770) Fix: Wrong channel-adjacency-matrix for Neuromag122 (mne-tools#8891) [MRG] Add optional different ways of averaging EpochsTFR (mne-tools#8879) DOC, STY: fix dataframe scrolling (mne-tools#8977)
Reference issue
Fixes #8890.
What does this implement/fix?
This disables reading the channel-adjacency for Neuromag122-Data from a precomputed file in .../channels/data/neighbors and fixes the computation of the matrix.