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.

Sign up for GitHub

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

Jump to bottom

feat: add coordinates and sensor layout XML files for 10-20 layout #123

Merged
merged 8 commits into from
Jul 1, 2024
Merged

feat: add coordinates and sensor layout XML files for 10-20 layout #123

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
66e9491
feat: add coordinates and sensor layout XML files for 10-20 layout
damian5710 Jun 6, 2024
e6b59d6
docs: update CHANGELOG.md file
damian5710 Jun 6, 2024
5b6079c
test: update unit tests
damian5710 Jun 6, 2024
27272e2
chg: update GHW130 3D coordinates using latest sensornet version
damian5710 Jun 24, 2024
1449a47
docs: update CHANGELOG.md file
damian5710 Jun 25, 2024
c20d3cc
chg: update 3D coordinates of 10-20 layout using GHW130
damian5710 Jun 25, 2024
22ddf8c
test: update testing files
damian5710 Jun 25, 2024
5a5870f
chg: update acqTime and acqMethod values in coordinates.xml files
damian5710 Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added
- coordinates and sensor layout XML files for 10-20 layout

## [0.9.0] - 2024-03-26
### Added
- PNSSet class for parsing and writing `pnsSet.xml` files
Expand Down
164 changes: 164 additions & 0 deletions mffpy/resources/coordinates/Standard 10-20 (19 ch).xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
<?xml version='1.0' encoding='UTF-8'?>
<coordinates xmlns="http://www.egi.com/coordinates_mff"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we change this to http://www.bel.company/coordinates_mff?

xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sensorLayout>
<name>Standard 10-20 (19 ch)</name>
<sensors>
<sensor>
<name>7 FZ</name>
<number>7</number>
<type>0</type>
<x>0.294</x>
<y>10.208</y>
<z>-7.932</z>
</sensor>
<sensor>
<name>9 F4</name>
<number>9</number>
<type>0</type>
<x>4.125</x>
<y>8.685</y>
<z>-5.332</z>
</sensor>
<sensor>
<name>15 F3</name>
<number>15</number>
<type>0</type>
<x>-4.077</x>
<y>8.719</y>
<z>-5.932</z>
</sensor>
<sensor>
<name>28 FP2</name>
<number>28</number>
<type>0</type>
<x>4.013</x>
<y>9.283</y>
<z>-9.732</z>
</sensor>
<sensor>
<name>33 F8</name>
<number>33</number>
<type>0</type>
<x>7.298</x>
<y>5.148</y>
<z>-8.432</z>
</sensor>
<sensor>
<name>37 C4</name>
<number>37</number>
<type>0</type>
<x>6.562</x>
<y>1.933</y>
<z>-2.132</z>
</sensor>
<sensor>
<name>41 T8</name>
<number>41</number>
<type>0</type>
<x>8.516</x>
<y>-0.728</y>
<z>-9.132</z>
</sensor>
<sensor>
<name>55 O2</name>
<number>55</number>
<type>0</type>
<x>4.675</x>
<y>-8.607</y>
<z>-7.932</z>
</sensor>
<sensor>
<name>59 P8</name>
<number>59</number>
<type>0</type>
<x>7.224</x>
<y>-6.055</y>
<z>-7.732</z>
</sensor>
<sensor>
<name>65 P4</name>
<number>65</number>
<type>0</type>
<x>3.992</x>
<y>-4.52</y>
<z>0.368</z>
</sensor>
<sensor>
<name>81 P7</name>
<number>81</number>
<type>0</type>
<x>-6.043</x>
<y>-7.824</y>
<z>-5.532</z>
</sensor>
<sensor>
<name>85 O1</name>
<number>85</number>
<type>0</type>
<x>-3.014</x>
<y>-9.263</y>
<z>-5.032</z>
</sensor>
<sensor>
<name>90 P3</name>
<number>90</number>
<type>0</type>
<x>-8.45</x>
<y>-2.571</y>
<z>-4.632</z>
</sensor>
<sensor>
<name>99 PZ</name>
<number>99</number>
<type>0</type>
<x>1.738</x>
<y>-1.865</y>
<z>1.068</z>
</sensor>
<sensor>
<name>109 T7</name>
<number>109</number>
<type>0</type>
<x>-8.49</x>
<y>-0.572</y>
<z>-9.532</z>
</sensor>
<sensor>
<name>115 C3</name>
<number>115</number>
<type>0</type>
<x>-6.545</x>
<y>2.168</y>
<z>-2.732</z>
</sensor>
<sensor>
<name>119 F7</name>
<number>119</number>
<type>0</type>
<x>-6.81</x>
<y>5.364</y>
<z>-8.532</z>
</sensor>
<sensor>
<name>129 FP1</name>
<number>129</number>
<type>0</type>
<x>-3.691</x>
<y>9.427</y>
<z>-10.032</z>
</sensor>
<sensor>
<name>REF CZ</name>
<number>131</number>
<type>1</type>
<x>0.0</x>
<y>0.0</y>
<z>0.968</z>
</sensor>
</sensors>
</sensorLayout>
<acqTime>1984-02-18T14:00:10.000000+01:00</acqTime>
<acqMethod>some method</acqMethod>
damian5710 marked this conversation as resolved.
Show resolved Hide resolved
<defaultSubject>true</defaultSubject>
</coordinates>
159 changes: 159 additions & 0 deletions mffpy/resources/sensorLayout/Standard 10-20 (19 ch).xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
<?xml version='1.0' encoding='UTF-8'?>
<sensorLayout xmlns="http://www.egi.com/sensorLayout_mff"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<name>Standard 10-20 (19 ch)</name>
<sensors>
<sensor>
<name>7 FZ</name>
<number>7</number>
<type>0</type>
<x>0.016996377821119957</x>
<y>0.7295989815404201</y>
<z>0.0</z>
</sensor>
<sensor>
<name>9 F4</name>
<number>9</number>
<type>0</type>
<x>0.2716634159933127</x>
<y>0.5597708465945257</y>
<z>0.0</z>
</sensor>
<sensor>
<name>15 F3</name>
<number>15</number>
<type>0</type>
<x>-0.24575090554472</x>
<y>0.5506047103755569</y>
<z>0.0</z>
</sensor>
<sensor>
<name>28 FP2</name>
<number>28</number>
<type>0</type>
<x>0.39398161047645597</x>
<y>0.7761935073201782</y>
<z>0.0</z>
</sensor>
<sensor>
<name>33 F8</name>
<number>33</number>
<type>0</type>
<x>0.5633881303984396</x>
<y>0.4660725652450669</y>
<z>0.0</z>
</sensor>
<sensor>
<name>37 C4</name>
<number>37</number>
<type>0</type>
<x>0.31763722485371937</x>
<y>0.18446849140674737</y>
<z>0.0</z>
</sensor>
<sensor>
<name>41 T8</name>
<number>41</number>
<type>0</type>
<x>0.6974087489551406</x>
<y>0.104774029280713</y>
<z>0.0</z>
</sensor>
<sensor>
<name>55 O2</name>
<number>55</number>
<type>0</type>
<x>0.2803009194761772</x>
<y>-0.3484404837683006</y>
<z>0.0</z>
</sensor>
<sensor>
<name>59 P8</name>
<number>59</number>
<type>0</type>
<x>0.3995541933686264</x>
<y>-0.2626352641629537</y>
<z>0.0</z>
</sensor>
<sensor>
<name>65 P4</name>
<number>65</number>
<type>0</type>
<x>0.29339648927277784</x>
<y>-0.04392106938255891</y>
<z>0.0</z>
</sensor>
<sensor>
<name>81 P7</name>
<number>81</number>
<type>0</type>
<x>-0.3786570075229869</x>
<y>-0.278676002546149</y>
<z>0.0</z>
</sensor>
<sensor>
<name>85 O1</name>
<number>85</number>
<type>0</type>
<x>-0.23711340206185572</x>
<y>-0.3560789306174412</y>
<z>0.0</z>
</sensor>
<sensor>
<name>90 P3</name>
<number>90</number>
<type>0</type>
<x>-0.2594037336305378</x>
<y>-0.04392106938255891</y>
<z>0.0</z>
</sensor>
<sensor>
<name>99 PZ</name>
<number>99</number>
<type>0</type>
<x>0.009752020061298383</x>
<y>-0.09000636537237439</y>
<z>0.0</z>
</sensor>
<sensor>
<name>109 T7</name>
<number>109</number>
<type>0</type>
<x>-0.6767901922541097</x>
<y>0.09331635900700197</y>
<z>0.0</z>
</sensor>
<sensor>
<name>115 C3</name>
<number>115</number>
<type>0</type>
<x>-0.2950682641404293</x>
<y>0.18803309993634632</y>
<z>0.0</z>
</sensor>
<sensor>
<name>119 F7</name>
<number>119</number>
<type>0</type>
<x>-0.5475062691557537</x>
<y>0.46709102482495235</y>
<z>0.0</z>
</sensor>
<sensor>
<name>129 FP1</name>
<number>129</number>
<type>0</type>
<x>-0.3680691000278631</x>
<y>0.7749204328453214</y>
<z>0.0</z>
</sensor>
<sensor>
<name>VREF</name>
<number>131</number>
<type>1</type>
<x>0.017832265254945412</x>
<y>0.09993634627625725</y>
<z>0.0</z>
</sensor>
</sensors>
</sensorLayout>
Binary file added mffpy/resources/testing/Standard 10-20 (19 ch).npy
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions mffpy/tests/test_devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
'MicroCel GSN 100 64 1.0',
'MicroCel GSN 100 128 1.0',
'MicroCel GSN 100 256 1.0',
'Standard 10-20 (19 ch)'
])
def test_devices(device):
"""test integrity of coordinates.xml locations for each supported device
Expand Down
Loading