Merge branch 'dev' of github.com:freesurfer/freesurfer into dev

ayendiki · Mar 18, 2021 · 979d9bb · 979d9bb
2 parents 99a2637 + eab311c
commit 979d9bb
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 37 deletions.
diff --git a/python/freesurfer/lookups.py b/python/freesurfer/lookups.py
@@ -1622,42 +1622,42 @@ def dkt():
     """
     """
     lut = LookupTable()
-    lut.add(0,  'unknown'                  [ 25,   5,  25])
-    lut.add(1,  'bankssts'                 [ 25, 100,  40])
-    lut.add(2,  'caudalanteriorcingulate'  [125, 100, 160])
-    lut.add(3,  'caudalmiddlefrontal'      [100,  25,   0])
-    lut.add(4,  'corpuscallosum'           [120,  70,  50])
-    lut.add(5,  'cuneus'                   [220,  20, 100])
-    lut.add(6,  'entorhinal'               [220,  20,  10])
-    lut.add(7,  'fusiform'                 [180, 220, 140])
-    lut.add(8,  'inferiorparietal'         [220,  60, 220])
-    lut.add(9,  'inferiortemporal'         [180,  40, 120])
-    lut.add(10, 'isthmuscingulate'         [140,  20, 140])
-    lut.add(11, 'lateraloccipital'         [ 20,  30, 140])
-    lut.add(12, 'lateralorbitofrontal'     [ 35,  75,  50])
-    lut.add(13, 'lingual'                  [225, 140, 140])
-    lut.add(14, 'medialorbitofrontal'      [200,  35,  75])
-    lut.add(15, 'middletemporal'           [160, 100,  50])
-    lut.add(16, 'parahippocampal'          [ 20, 220,  60])
-    lut.add(17, 'paracentral'              [ 60, 220,  60])
-    lut.add(18, 'parsopercularis'          [220, 180, 140])
-    lut.add(19, 'parsorbitalis'            [ 20, 100,  50])
-    lut.add(20, 'parstriangularis'         [220,  60,  20])
-    lut.add(21, 'pericalcarine'            [120, 100,  60])
-    lut.add(22, 'postcentral'              [220,  20,  20])
-    lut.add(23, 'posteriorcingulate'       [220, 180, 220])
-    lut.add(24, 'precentral'               [ 60,  20, 220])
-    lut.add(25, 'precuneus'                [160, 140, 180])
-    lut.add(26, 'rostralanteriorcingulate' [ 80,  20, 140])
-    lut.add(27, 'rostralmiddlefrontal'     [ 75,  50, 125])
-    lut.add(28, 'superiorfrontal'          [ 20, 220, 160])
-    lut.add(29, 'superiorparietal'         [ 20, 180, 140])
-    lut.add(30, 'superiortemporal'         [140, 220, 220])
-    lut.add(31, 'supramarginal'            [ 80, 160,  20])
-    lut.add(32, 'frontalpole'              [100,   0, 100])
-    lut.add(33, 'temporalpole'             [ 70,  20, 170])
-    lut.add(34, 'transversetemporal'       [150, 150, 200])
-    lut.add(35, 'insula'                   [255, 192,  32])
+    lut.add(0,  'unknown',                  [ 25,   5,  25])
+    lut.add(1,  'bankssts',                 [ 25, 100,  40])
+    lut.add(2,  'caudalanteriorcingulate',  [125, 100, 160])
+    lut.add(3,  'caudalmiddlefrontal',      [100,  25,   0])
+    lut.add(4,  'corpuscallosum',           [120,  70,  50])
+    lut.add(5,  'cuneus',                   [220,  20, 100])
+    lut.add(6,  'entorhinal',               [220,  20,  10])
+    lut.add(7,  'fusiform',                 [180, 220, 140])
+    lut.add(8,  'inferiorparietal',         [220,  60, 220])
+    lut.add(9,  'inferiortemporal',         [180,  40, 120])
+    lut.add(10, 'isthmuscingulate',         [140,  20, 140])
+    lut.add(11, 'lateraloccipital',         [ 20,  30, 140])
+    lut.add(12, 'lateralorbitofrontal',     [ 35,  75,  50])
+    lut.add(13, 'lingual',                  [225, 140, 140])
+    lut.add(14, 'medialorbitofrontal',      [200,  35,  75])
+    lut.add(15, 'middletemporal',           [160, 100,  50])
+    lut.add(16, 'parahippocampal',          [ 20, 220,  60])
+    lut.add(17, 'paracentral',              [ 60, 220,  60])
+    lut.add(18, 'parsopercularis',          [220, 180, 140])
+    lut.add(19, 'parsorbitalis',            [ 20, 100,  50])
+    lut.add(20, 'parstriangularis',         [220,  60,  20])
+    lut.add(21, 'pericalcarine',            [120, 100,  60])
+    lut.add(22, 'postcentral',              [220,  20,  20])
+    lut.add(23, 'posteriorcingulate',       [220, 180, 220])
+    lut.add(24, 'precentral',               [ 60,  20, 220])
+    lut.add(25, 'precuneus',                [160, 140, 180])
+    lut.add(26, 'rostralanteriorcingulate', [ 80,  20, 140])
+    lut.add(27, 'rostralmiddlefrontal',     [ 75,  50, 125])
+    lut.add(28, 'superiorfrontal',          [ 20, 220, 160])
+    lut.add(29, 'superiorparietal',         [ 20, 180, 140])
+    lut.add(30, 'superiortemporal',         [140, 220, 220])
+    lut.add(31, 'supramarginal',            [ 80, 160,  20])
+    lut.add(32, 'frontalpole',              [100,   0, 100])
+    lut.add(33, 'temporalpole',             [ 70,  20, 170])
+    lut.add(34, 'transversetemporal',       [150, 150, 200])
+    lut.add(35, 'insula',                   [255, 192,  32])
     return lut
 
 

diff --git a/python/fspython b/python/fspython
@@ -10,6 +10,7 @@ export PYTHONPATH="${FREESURFER_HOME}/python/packages"
 # futhermore, prevent local user packages from being accessed in fspython
 # since we want a very isolated environment
 export PYTHONNOUSERSITE=1
+unset PYTHONUSERBASE
 
 # run python
 if [ -e "${FREESURFER_HOME}/python/bin/python3" ]; then

diff --git a/utils/chklc.cpp b/utils/chklc.cpp
@@ -96,7 +96,7 @@ void chklc(void)
   char *crypt_gkey;
   static int first_time = 1;
 
-  sprintf(str, "S%sER%sRONT%sOR", "URF", "_F", "DO");
+  sprintf(str, "S%sER%sIDE%sOR", "URF", "_S", "DO");
   if (getenv(str) != NULL) return;
 
   cp = getenv("FREESURFER_HOME");