Skip to content

Commit 78ed376

Browse files
authored
Merge branch 'spm:main' into main
2 parents a8cddb9 + e79f3c3 commit 78ed376

File tree

2 files changed

+24
-30
lines changed

2 files changed

+24
-30
lines changed

Diff for: docs/development/git.md

-30
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,6 @@ During installation, you can accept most defaults. There are three options to be
2727
![line ending conversions](../assets/figures/git_windows_eol.png){ width="45%" }
2828
![default behavior of `git pull`](../assets/figures/git_windows_rebase.png){ width="45%" }
2929

30-
If you do not have the administrative permissions to install Git as described above, try and install [64-bit Git for Windows Portable](https://git-scm.com/download/win) to `C:\wtcnapps\` and add the directory containing `git.exe` to the `Path` environment variable for your account.
31-
32-
<!--
33-
TortoiseGit is another graphical interface for Git on Windows:
34-
35-
* [TortoiseGit](https://tortoisegit.org/)
36-
-->
37-
38-
<!--
39-
40-
It is also recommended to install the Visual Studio Code text editor and WinMerge:
41-
42-
* [Visual Studio Code](https://code.visualstudio.com/)
43-
* [WinMerge](https://winmerge.org/)
44-
45-
### Visual Studio Code Extensions
46-
47-
Visual Studio Code has a native support of Git:
48-
49-
* [Git Support in Visual Studio Code](https://code.visualstudio.com/docs/editor/versioncontrol#_git-support)
50-
51-
but some extra extensions are worth considering for MATLAB development:
52-
53-
* [Code Spell Checker](https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker)
54-
* [MATLAB](https://marketplace.visualstudio.com/items?itemName=Gimly81.matlab)
55-
* [Remote - SSH](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-ssh)
56-
57-
-->
5830

5931
## Git Configuration
6032

@@ -115,8 +87,6 @@ Pull with rebase will fail if you have unstaged changes. One way around this if
11587
git config --global rebase.autoStash true
11688
```
11789

118-
This is equivalent to using `git fetch` followed by `git rebase --autostash` (or `git stash`, `git pull`, `git stash pop`).
119-
12090
As before, to apply this setting from GitHub Desktop, you need to open the command prompt by selecting ++"Repository"++ then ++"Open in Command Prompt"++ from the top menu and enter the above command line.
12191

12292
## Clone the SPM repository

Diff for: docs/tutorials/opm/formats/index.md

+24
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,30 @@ S.positions = 'positions.tsv';
5252
D =spm_opm_create(S);
5353
```
5454

55+
## MAG4Health
56+
MAG4Health also uses the existing `.fif` format and can take advantage of existing fileio available in SPM.
57+
58+
```matlab
59+
S = [];
60+
S.data = 'raw.fif';
61+
D =spm_opm_create(S);
62+
```
63+
64+
The channel types may not be listed correctly in the file. If so we can manually set the channel type with SPM. This sets all channels to the type `MEGMAG`
65+
66+
```matlab
67+
D = chantype(D,1:size(D,1),'MEGMAG');
68+
D.save();
69+
```
70+
71+
Currently, the second tangential axis of these sensors has a higher noise floor than the other 2. We can identify and mark these channels as bad using he following code.
72+
73+
```matlab
74+
badinds = D.selectchannels('regexp_(.*tang2$)');
75+
D = badchannels(D,[badinds],1);
76+
D.save();
77+
```
78+
5579
## Neuro-1
5680
The Neuro-1 system developed by QuSpin currently records data in `.lvm` files. just as with the other data files we can provide additional metadata in the form of `.tsv` and .json files
5781

0 commit comments

Comments
 (0)