Merge pull request #76 from catalystneuro/chang_to_merge

Merge changes from Chang Lab
catalystneuro · Apr 28, 2020 · 45d0860 · 45d0860
2 parents d604c18 + 4de089b
commit 45d0860
Show file tree

Hide file tree

Showing 13 changed files with 1,899 additions and 460 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# Pycharm
+.idea/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # ecogVIS
 Timeseries visualizer and data processing tools for Electrocorticography (ECoG) signals stored in [NWB](https://neurodatawithoutborders.github.io/) files, for Python.
 
+A collaboration with the [Chang Lab](http://changlab.ucsf.edu/).
 [![codecov](https://codecov.io/gh/ben-dichter-consulting/ecogVIS/branch/master/graph/badge.svg)](https://codecov.io/gh/ben-dichter-consulting/ecogVIS)
 
 

diff --git a/ecogvis/functions/FS_colorLUT.py b/ecogvis/functions/FS_colorLUT.py
@@ -1,5 +1,5 @@
 def get_lut():
-    cmap = {'Unknown': [ 0., 0., 0.],
+    cmap = {'Unknown': [ 255., 255., 255.],
     'Left-Cerebral-Exterior': [70., 130., 180.],
     'Left-Cerebral-White-Matter': [245., 245., 245.],
     'Left-Cerebral-Cortex': [205., 62., 78.],
@@ -515,7 +515,7 @@ def get_lut():
     'wm-rh-temporalpole': [185., 185., 185.],
     'wm-rh-transversetemporal': [105., 105., 55.],
     'wm-rh-insula': [254., 191., 31.],
-    'ctx-lh-Unknown': [0., 0., 0.],
+    'ctx-lh-Unknown': [255., 255., 255.],
     'ctx-lh-Corpus_callosum': [50., 50., 50.],
     'ctx-lh-G_and_S_Insula_ONLY_AVERAGE': [180., 20., 30.],
     'ctx-lh-G_cingulate-Isthmus': [60., 25., 25.],
@@ -606,7 +606,7 @@ def get_lut():
     'ctx-lh-S_temporal_inferior': [21., 180., 180.],
     'ctx-lh-S_temporal_superior': [223., 220., 60.],
     'ctx-lh-S_temporal_transverse': [221., 60., 60.],
-    'ctx-rh-Unknown': [0., 0., 0.],
+    'ctx-rh-Unknown': [255., 255., 255.],
     'ctx-rh-Corpus_callosum': [50., 50., 50.],
     'ctx-rh-G_and_S_Insula_ONLY_AVERAGE': [180., 20., 30.],
     'ctx-rh-G_cingulate-Isthmus': [60., 25., 25.],
@@ -697,7 +697,7 @@ def get_lut():
     'ctx-rh-S_pericallosal-caudal': [25., 150., 90.],
     'ctx-rh-S_pericallosal-rostral': [25., 180., 90.],
     'ctx-rh-S_pericallosal-posterior': [25., 210., 90.],
-    'wm-lh-Unknown': [0., 0., 0.],
+    'wm-lh-Unknown': [255., 255., 255.],
     'wm-lh-Corpus_callosum': [50., 50., 50.],
     'wm-lh-G_and_S_Insula_ONLY_AVERAGE': [180., 20., 30.],
     'wm-lh-G_cingulate-Isthmus': [60., 25., 25.],
@@ -779,7 +779,7 @@ def get_lut():
     'wm-lh-S_temporal_inferior': [21., 180., 180.],
     'wm-lh-S_temporal_superior': [223., 220., 60.],
     'wm-lh-S_temporal_transverse': [221., 60., 60.],
-    'wm-rh-Unknown': [0., 0., 0.],
+    'wm-rh-Unknown': [255., 255., 255.],
     'wm-rh-Corpus_callosum': [50., 50., 50.],
     'wm-rh-G_and_S_Insula_ONLY_AVERAGE': [180., 20., 30.],
     'wm-rh-G_cingulate-Isthmus': [60., 25., 25.],
@@ -961,7 +961,7 @@ def get_lut():
     'ctx-rh-posterior-parietal': [125., 120., 55.],
     'ctx-rh-prim-sec-somatosensory': [225., 70., 105.],
     'ctx-rh-occipital': [225., 70., 15.],
-    'ctx_lh_Unknown': [0., 0., 0.],
+    'ctx_lh_Unknown': [255., 255., 255.],
     'ctx_lh_G_and_S_frontomargin': [23., 220., 60.],
     'ctx_lh_G_and_S_occipital_inf': [23., 60., 180.],
     'ctx_lh_G_and_S_paracentral': [63., 100., 60.],
@@ -1037,7 +1037,7 @@ def get_lut():
     'ctx_lh_S_temporal_inf': [21., 180., 180.],
     'ctx_lh_S_temporal_sup': [223., 220., 60.],
     'ctx_lh_S_temporal_transverse': [221., 60., 60.],
-    'ctx_rh_Unknown': [0., 0., 0.],
+    'ctx_rh_Unknown': [255., 255., 255.],
     'ctx_rh_G_and_S_frontomargin': [23., 220., 60.],
     'ctx_rh_G_and_S_occipital_inf': [23., 60., 180.],
     'ctx_rh_G_and_S_paracentral': [63., 100., 60.],
@@ -1113,7 +1113,7 @@ def get_lut():
     'ctx_rh_S_temporal_inf': [21., 180., 180.],
     'ctx_rh_S_temporal_sup': [223., 220., 60.],
     'ctx_rh_S_temporal_transverse': [221., 60., 60.],
-    'wm_lh_Unknown': [0., 0., 0.],
+    'wm_lh_Unknown': [255., 255., 255.],
     'wm_lh_G_and_S_frontomargin': [23., 220., 60.],
     'wm_lh_G_and_S_occipital_inf': [23., 60., 180.],
     'wm_lh_G_and_S_paracentral': [63., 100., 60.],
@@ -1189,7 +1189,7 @@ def get_lut():
     'wm_lh_S_temporal_inf': [21., 180., 180.],
     'wm_lh_S_temporal_sup': [223., 220., 60.],
     'wm_lh_S_temporal_transverse': [221., 60., 60.],
-    'wm_rh_Unknown': [0., 0., 0.],
+    'wm_rh_Unknown': [255., 255., 255.],
     'wm_rh_G_and_S_frontomargin': [23., 220., 60.],
     'wm_rh_G_and_S_occipital_inf': [23., 60., 180.],
     'wm_rh_G_and_S_paracentral': [63., 100., 60.],