Merge pull request #43 from SFB-ELAINE/fix_typo_in_electrode

Fix typo in electrode
SFB-ELAINE · Jul 7, 2024 · 16a3ce0 · 16a3ce0
2 parents de29e10 + 9abeee1
commit 16a3ce0
Show file tree

Hide file tree

Showing 29 changed files with 138 additions and 28 deletions.
diff --git a/ossdbs/electrodes/__init__.py b/ossdbs/electrodes/__init__.py
@@ -114,7 +114,7 @@
     "DixiSEEG10Custom": DixiSEEGModel,
     "DixiSEEG12Custom": DixiSEEGModel,
     "DixiSEEG15Custom": DixiSEEGModel,
-    "DixiSEEG158ustom": DixiSEEGModel,
+    "DixiSEEG18Custom": DixiSEEGModel,
     "Medtronic3387Custom": MedtronicModel,
     "Medtronic3389Custom": MedtronicModel,
     "Medtronic3391Custom": MedtronicModel,

diff --git a/tests/electrode_tests/test_abbottstjudeactivetip6142_6145.py b/tests/electrode_tests/test_abbottstjudeactivetip6142_6145.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import AbbottStJudeActiveTip6142_6145
+from ossdbs.electrodes import ELECTRODE_MODELS, AbbottStJudeActiveTip6142_6145
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_abbottstjudeactivetip6146_6149.py b/tests/electrode_tests/test_abbottstjudeactivetip6146_6149.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import AbbottStJudeActiveTip6146_6149
+from ossdbs.electrodes import ELECTRODE_MODELS, AbbottStJudeActiveTip6146_6149
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_abbottstjudedirected6172.py b/tests/electrode_tests/test_abbottstjudedirected6172.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import AbbottStJudeDirected6172
+from ossdbs.electrodes import ELECTRODE_MODELS, AbbottStJudeDirected6172
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_abbottstjudedirected6173.py b/tests/electrode_tests/test_abbottstjudedirected6173.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import AbbottStJudeDirected6173
+from ossdbs.electrodes import ELECTRODE_MODELS, AbbottStJudeDirected6173
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_bostonscientificcartesiahx.py b/tests/electrode_tests/test_bostonscientificcartesiahx.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import BostonScientificCartesiaHX
+from ossdbs.electrodes import ELECTRODE_MODELS, BostonScientificCartesiaHX
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_bostonscientificcartesiax.py b/tests/electrode_tests/test_bostonscientificcartesiax.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import BostonScientificCartesiaX
+from ossdbs.electrodes import ELECTRODE_MODELS, BostonScientificCartesiaX
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_bostonscientificvercise.py b/tests/electrode_tests/test_bostonscientificvercise.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import BostonScientificVercise
+from ossdbs.electrodes import ELECTRODE_MODELS, BostonScientificVercise
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_bostonscientificvercisedirected.py b/tests/electrode_tests/test_bostonscientificvercisedirected.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import BostonScientificVerciseDirected
+from ossdbs.electrodes import ELECTRODE_MODELS, BostonScientificVerciseDirected
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_diximicrotechniquesSEEG10.py b/tests/electrode_tests/test_diximicrotechniquesSEEG10.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import DixiSEEG10
+from ossdbs.electrodes import ELECTRODE_MODELS, DixiSEEG10
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_diximicrotechniquesSEEG12.py b/tests/electrode_tests/test_diximicrotechniquesSEEG12.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import DixiSEEG12
+from ossdbs.electrodes import ELECTRODE_MODELS, DixiSEEG12
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_diximicrotechniquesSEEG15.py b/tests/electrode_tests/test_diximicrotechniquesSEEG15.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import DixiSEEG15
+from ossdbs.electrodes import ELECTRODE_MODELS, DixiSEEG15
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_diximicrotechniquesSEEG18.py b/tests/electrode_tests/test_diximicrotechniquesSEEG18.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import DixiSEEG18
+from ossdbs.electrodes import ELECTRODE_MODELS, DixiSEEG18
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_diximicrotechniquesSEEG5.py b/tests/electrode_tests/test_diximicrotechniquesSEEG5.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import DixiSEEG5
+from ossdbs.electrodes import ELECTRODE_MODELS, DixiSEEG5
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_diximicrotechniquesSEEG8.py b/tests/electrode_tests/test_diximicrotechniquesSEEG8.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import DixiSEEG8
+from ossdbs.electrodes import ELECTRODE_MODELS, DixiSEEG8
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_electrodes.py b/tests/electrode_tests/test_electrodes.py
@@ -3,6 +3,8 @@
 import numpy as np
 
 
+# TODO is there a nicer way to not need to copy-paste
+# the tests into each electrode file?
 class TestElectrode:
     """Class for testing electrodes."""
 

diff --git a/tests/electrode_tests/test_medtronic3387.py b/tests/electrode_tests/test_medtronic3387.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import Medtronic3387
+from ossdbs.electrodes import ELECTRODE_MODELS, Medtronic3387
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_medtronic3389.py b/tests/electrode_tests/test_medtronic3389.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import Medtronic3389
+from ossdbs.electrodes import ELECTRODE_MODELS, Medtronic3389
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_medtronic3391.py b/tests/electrode_tests/test_medtronic3391.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import Medtronic3391
+from ossdbs.electrodes import ELECTRODE_MODELS, Medtronic3391
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_medtronicsensightB33005.py b/tests/electrode_tests/test_medtronicsensightB33005.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import MedtronicSenSightB33005
+from ossdbs.electrodes import ELECTRODE_MODELS, MedtronicSenSightB33005
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_medtronicsensightB33015.py b/tests/electrode_tests/test_medtronicsensightB33015.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import MedtronicSenSightB33015
+from ossdbs.electrodes import ELECTRODE_MODELS, MedtronicSenSightB33015
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_microelectrode.py b/tests/electrode_tests/test_microelectrode.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import MicroElectrode
+from ossdbs.electrodes import ELECTRODE_MODELS, MicroElectrode
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_microprobescustomrodent.py b/tests/electrode_tests/test_microprobescustomrodent.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import MicroProbesRodentElectrode
+from ossdbs.electrodes import ELECTRODE_MODELS, MicroProbesRodentElectrode
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_microprobessnex100.py b/tests/electrode_tests/test_microprobessnex100.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import MicroProbesSNEX100
+from ossdbs.electrodes import ELECTRODE_MODELS, MicroProbesSNEX100
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()
diff --git a/tests/electrode_tests/test_neuropaceDL344_10.py b/tests/electrode_tests/test_neuropaceDL344_10.py
@@ -1,6 +1,6 @@
 import pytest
 
-from ossdbs.electrodes import NeuroPaceDL344_10
+from ossdbs.electrodes import ELECTRODE_MODELS, NeuroPaceDL344_10
 
 from .test_electrodes import TestElectrode
 
@@ -29,3 +29,7 @@ def test_electrode_volume(self, electrode, electrode_name):
     def test_contacts_volume(self, electrode, electrode_name):
         """Test volume of all the contacts."""
         self.check_contacts_volume(electrode, electrode_name)
+
+    def test_custom_exists(self, electrode_name):
+        customname = electrode_name + "Custom"
+        assert customname in ELECTRODE_MODELS.keys()