minor

neuropsychology · Nov 27, 2019 · bd30ad3 · bd30ad3
1 parent 8671f73
commit bd30ad3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/TruScanEEGpy/convert_channels.py b/TruScanEEGpy/convert_channels.py
@@ -3,7 +3,7 @@
 """Submodule."""
 
 
-def tenfive_system_128(channel):
+def convert_to_tenfive(ch_names):
     """Convert channel names to 10-5 system
 
     This function aims to convert the channel labeling (in number) to the standardized 10-5 electrode labeling.
@@ -122,18 +122,18 @@ def tenfive_system_128(channel):
             "17" : "P8",
             "112" : "P9",
             "119" : "P10",
-            
+
             "24" : "TP9",
             "29" : "TP10",
 
-            
+
             "113" : "PPO5",
             "114" : "PPO3",
             "115" : "PPO1",
             "116" : "PPO2",
             "117" : "PPO4",
             "118" : "PPO6",
-            
+
 
             "31" : "PO9",
             "60" : "PO7",
@@ -145,7 +145,7 @@ def tenfive_system_128(channel):
 
             "121" : "POO1",
             "122" : "POO2",
-            
+
             "120" : "OPO3",
             "123" : "OPO4",
 
@@ -160,5 +160,5 @@ def tenfive_system_128(channel):
             "127" : "Iz",
             "128" : "I2"
             }
-    channel = [correspondance.get(name, name)  for name in channel]
-    return(channel)
+    ch_names = [correspondance.get(name, name)  for name in ch_names]
+    return(ch_names)
diff --git a/TruScanEEGpy/layout.py b/TruScanEEGpy/layout.py
@@ -6,7 +6,7 @@
 
 from .layouts import Path
 from .fix_channels import fix_channels_128
-from .convert_channels import tenfive_system_128
+from .convert_channels import convert_to_tenfive
 
 def layout_128(names = "index"):
     """Create layout file
@@ -30,5 +30,5 @@ def layout_128(names = "index"):
 
     # System
     if names != "index":
-        layout["Name"] = tenfive_system_128(layout["Name"])
+        layout["Name"] = convert_to_tenfive(layout["Name"])
     return(layout)
diff --git a/TruScanEEGpy/montage.py b/TruScanEEGpy/montage.py
@@ -6,7 +6,7 @@
 import numpy as np
 
 from .fix_channels import fix_channels_128
-from .convert_channels import tenfive_system_128
+
 
 def montage_mne_128(layout):
     """Create MNE montage

diff --git a/docs/.rst b/docs/.rst
diff --git a/setup.py b/setup.py
@@ -47,7 +47,7 @@ def find_version():
     include_package_data=True,
     keywords='TruScanEEGpy',
     name='TruScanEEGpy',
-    packages=find_packages(include=['TruScanEEGpy']),
+    packages=find_packages(),
     # package_data = {"TruScanEEGpy.layouts":["*.txt"]},
     setup_requires=setup_requirements,
     test_suite='pytest',