diff --git a/figures/Schmidt2017/Fig8_laminar_paths.eps b/figures/Schmidt2017/Fig8_laminar_paths.eps
index 0e95e2e639b24b590c7c13b56ea409524816b403..121dc2e431835caf63bc1e8cab1cb76755491062 100644
--- a/figures/Schmidt2017/Fig8_laminar_paths.eps
+++ b/figures/Schmidt2017/Fig8_laminar_paths.eps
@@ -2,7 +2,7 @@
%%BoundingBox: -1 -1 492 377
%%HiResBoundingBox: -1 -1 491.394 376.241
%%Creator: PyX 0.14.1
-%%CreationDate: Wed Mar 21 11:29:28 2018
+%%CreationDate: Thu Mar 29 10:27:39 2018
%%EndComments
%%BeginProlog
%%BeginResource: BeginEPSF
@@ -1524,7 +1524,7 @@ W
[0.298 0.4471 0.6902] sc
/DeviceRGB {} cs
[0.298 0.4471 0.6902] sc
-20.850127 65.394 20.177541 28.532903 re
+20.850127 65.394 20.177541 43.250233 re
f
Q
q
@@ -1534,7 +1534,7 @@ W
[0.298 0.4471 0.6902] sc
/DeviceRGB {} cs
[0.298 0.4471 0.6902] sc
-46.072054 65.394 20.177542 28.532903 re
+46.072054 65.394 20.177542 45.36 re
f
Q
q
@@ -1544,7 +1544,11 @@ W
[0.298 0.4471 0.6902] sc
/DeviceRGB {} cs
[0.298 0.4471 0.6902] sc
-71.293981 65.394 20.177542 45.36 re
+71.293981 65.394 m
+91.471523 65.394 l
+91.471523 65.394 l
+71.293981 65.394 l
+h
f
Q
q
@@ -1554,7 +1558,7 @@ W
[0.298 0.4471 0.6902] sc
/DeviceRGB {} cs
[0.298 0.4471 0.6902] sc
-96.515908 65.394 20.177542 7.316129 re
+96.515908 65.394 20.177542 10.548837 re
f
Q
q
@@ -1609,7 +1613,7 @@ W
[0.298 0.4471 0.6902] sc
/DeviceRGB {} cs
[0.298 0.4471 0.6902] sc
-218.702134 65.394 20.177542 20.011765 re
+218.702134 65.394 20.177542 19.44 re
f
Q
q
@@ -1619,7 +1623,11 @@ W
[0.298 0.4471 0.6902] sc
/DeviceRGB {} cs
[0.298 0.4471 0.6902] sc
-243.924061 65.394 20.177542 13.341176 re
+243.924061 65.394 m
+264.101603 65.394 l
+264.101603 65.394 l
+243.924061 65.394 l
+h
f
Q
q
@@ -1629,7 +1637,7 @@ W
[0.298 0.4471 0.6902] sc
/DeviceRGB {} cs
[0.298 0.4471 0.6902] sc
-269.145988 65.394 20.177542 8.004706 re
+269.145988 65.394 20.177542 7.128 re
f
Q
q
@@ -1684,7 +1692,7 @@ W
[0.298 0.4471 0.6902] sc
/DeviceRGB {} cs
[0.298 0.4471 0.6902] sc
-395.503419 65.394 25.487421 16.632 re
+395.503419 65.394 25.487421 16.827097 re
f
Q
q
@@ -1694,7 +1702,11 @@ W
[0.298 0.4471 0.6902] sc
/DeviceRGB {} cs
[0.298 0.4471 0.6902] sc
-427.362696 65.394 25.487421 0.756 re
+427.362696 65.394 m
+452.850117 65.394 l
+452.850117 65.394 l
+427.362696 65.394 l
+h
f
Q
q
@@ -1704,7 +1716,7 @@ W
[0.298 0.4471 0.6902] sc
/DeviceRGB {} cs
[0.298 0.4471 0.6902] sc
-459.221972 65.394 25.487421 3.78 re
+459.221972 65.394 25.487421 4.023871 re
f
Q
q
@@ -18366,16 +18378,16 @@ Q
f
/DeviceRGB {} cs
[0.5 0.5 0.5] sc
-1320.93 1096.39 m
+1320.91 1096.39 m
1346.46 1105.51 l
-1320.93 1114.63 l
-1331.14 1105.51 l
+1320.91 1114.63 l
+1331.13 1105.51 l
f
-1.64364 w
+1.6521 w
/DeviceRGB {} CS
[0.5 0.5 0.5] SC
439.371 1105.51 m
-743.246 1105.51 1042.58 1105.51 1331.14 1105.51 c
+743.246 1105.51 1042.58 1105.51 1331.13 1105.51 c
S
1087.42 729.531 m
1346.46 822.047 l
@@ -18386,58 +18398,59 @@ f
439.371 1105.51 m
757.738 1105.51 1028.09 822.047 1191.04 822.047 c
S
-1303.68 523.301 m
+1303.58 523.266 m
1346.46 538.582 l
-1303.68 553.859 l
-1320.79 538.582 l
+1303.58 553.895 l
+1320.73 538.582 l
f
-7.80722 w
+7.84169 w
439.371 1105.51 m
-797.715 1105.51 988.113 538.582 1320.79 538.582 c
+797.715 1105.51 988.113 538.582 1320.73 538.582 c
S
-1316.33 244.355 m
+1316.28 244.34 m
1346.46 255.117 l
-1316.33 265.875 l
-1328.38 255.117 l
+1316.28 265.891 l
+1328.35 255.117 l
f
-3.28727 w
+3.30441 w
439.371 1105.51 m
-855.898 1105.51 929.926 255.117 1328.38 255.117 c
+855.898 1105.51 929.926 255.117 1328.35 255.117 c
S
-1299.07 805.121 m
+1298.95 805.078 m
1346.46 822.047 l
-1299.07 838.969 l
-1318.03 822.047 l
+1298.95 839.012 l
+1317.95 822.047 l
f
-9.45076 w
+9.494 w
439.371 538.582 m
-757.738 538.582 1028.09 822.047 1318.03 822.047 c
+757.738 538.582 1028.09 822.047 1317.95 822.047 c
S
-1319.78 529.055 m
+1319.76 529.047 m
1346.46 538.582 l
-1319.78 548.105 l
-1330.45 538.582 l
+1319.76 548.117 l
+1330.44 538.582 l
f
-2.0545 w
+2.06306 w
439.371 538.582 m
-743.246 538.582 1042.58 538.582 1330.45 538.582 c
+743.246 538.582 1042.58 538.582 1330.44 538.582 c
S
-1322.08 813.34 m
+1320.91 812.922 m
1346.46 822.047 l
-1322.08 830.75 l
-1331.83 822.047 l
+1320.91 831.168 l
+1331.13 822.047 l
f
-1.23268 w
+1.6521 w
439.371 255.117 m
-797.715 255.117 988.113 822.047 1331.83 822.047 c
+797.715 255.117 988.113 822.047 1331.13 822.047 c
S
-1322.08 529.875 m
+1322.07 529.871 m
1346.46 538.582 l
-1322.08 547.285 l
-1331.83 538.582 l
+1322.07 547.289 l
+1331.82 538.582 l
f
+1.23696 w
439.371 255.117 m
-757.738 255.117 1028.09 538.582 1331.83 538.582 c
+757.738 255.117 1028.09 538.582 1331.82 538.582 c
S
1324.38 247.234 m
1346.46 255.117 l
@@ -34070,23 +34083,22 @@ Q
f
/DeviceRGB {} cs
[0.5 0.5 0.5] sc
-1313.63 810.32 m
+1301.72 806.07 m
1346.46 822.047 l
-1313.63 833.77 l
-1326.76 822.047 l
+1301.72 838.02 l
+1319.62 822.047 l
f
-4.25176 w
+8.50361 w
/DeviceRGB {} CS
[0.5 0.5 0.5] SC
439.371 1105.51 m
-757.738 1105.51 1028.09 822.047 1326.76 822.047 c
+757.738 1105.51 1028.09 822.047 1319.62 822.047 c
S
1301.72 522.605 m
1346.46 538.582 l
1301.72 554.555 l
1319.62 538.582 l
f
-8.50361 w
439.371 1105.51 m
797.715 1105.51 988.113 538.582 1319.62 538.582 c
S
@@ -34126,14 +34138,14 @@ f
439.371 538.582 m
757.738 538.582 1028.09 255.117 1329.14 255.117 c
S
-1214.42 774.887 m
+1226.32 779.141 m
1346.46 822.047 l
-1214.42 869.203 l
-1267.23 822.047 l
+1226.32 864.949 l
+1274.38 822.047 l
f
-39.6847 w
+35.4329 w
439.371 255.117 m
-797.715 255.117 988.113 822.047 1267.23 822.047 c
+797.715 255.117 988.113 822.047 1274.38 822.047 c
S
1087.42 446.07 m
1346.46 538.582 l
@@ -49769,16 +49781,16 @@ Q
f
/DeviceRGB {} cs
[0.5 0.5 0.5] sc
-1315.07 1094.3 m
+1315.04 1094.29 m
1346.46 1105.51 l
-1315.07 1116.72 l
-1327.63 1105.51 l
+1315.04 1116.73 l
+1327.6 1105.51 l
f
-3.73699 w
+3.74994 w
/DeviceRGB {} CS
[0.5 0.5 0.5] SC
439.371 1105.51 m
-743.246 1105.51 1042.58 1105.51 1327.63 1105.51 c
+743.246 1105.51 1042.58 1105.51 1327.6 1105.51 c
S
1087.42 729.531 m
1346.46 822.047 l
@@ -49789,39 +49801,39 @@ f
439.371 1105.51 m
757.738 1105.51 1028.09 822.047 1191.04 822.047 c
S
-1313.33 526.75 m
+1313.28 526.73 m
1346.46 538.582 l
-1313.33 550.414 l
-1326.58 538.582 l
+1313.28 550.43 l
+1326.55 538.582 l
f
-4.35985 w
+4.37719 w
439.371 1105.51 m
-797.715 1105.51 988.113 538.582 1326.58 538.582 c
+797.715 1105.51 988.113 538.582 1326.55 538.582 c
S
-1307.22 241.105 m
+1307.15 241.078 m
1346.46 255.117 l
-1307.22 269.129 l
-1322.92 255.117 l
+1307.15 269.152 l
+1322.87 255.117 l
f
-6.53978 w
+6.56578 w
439.371 1105.51 m
-855.898 1105.51 929.926 255.117 1322.92 255.117 c
+855.898 1105.51 929.926 255.117 1322.87 255.117 c
S
-1314.2 810.523 m
+1314.15 810.508 m
1346.46 822.047 l
-1314.2 833.566 l
-1327.1 822.047 l
+1314.15 833.582 l
+1327.07 822.047 l
f
-4.04842 w
+4.06575 w
439.371 538.582 m
-757.738 538.582 1028.09 822.047 1327.1 822.047 c
+757.738 538.582 1028.09 822.047 1327.07 822.047 c
S
-1322.92 530.176 m
+1322.91 530.172 m
1346.46 538.582 l
-1322.92 546.988 l
+1322.91 546.992 l
1332.33 538.582 l
f
-0.934197 w
+0.93858 w
439.371 538.582 m
743.246 538.582 1042.58 538.582 1332.33 538.582 c
S
@@ -49834,14 +49846,14 @@ f
439.371 538.582 m
757.738 538.582 1028.09 255.117 1333.38 255.117 c
S
-1316.82 811.457 m
+1315.91 811.133 m
1346.46 822.047 l
-1316.82 832.633 l
-1328.67 822.047 l
+1315.91 832.957 l
+1328.13 822.047 l
f
-3.11412 w
+3.43851 w
439.371 255.117 m
-797.715 255.117 988.113 822.047 1328.67 822.047 c
+797.715 255.117 988.113 822.047 1328.13 822.047 c
S
1324.66 530.797 m
1346.46 538.582 l
@@ -81117,43 +81129,43 @@ Q
f
/DeviceRGB {} cs
[0.5 0.5 0.5] sc
-1181.41 763.102 m
+1169.97 759.016 m
1346.46 822.047 l
-1181.41 880.988 l
-1247.43 822.047 l
+1169.97 885.074 l
+1240.57 822.047 l
f
-51.4713 w
+55.5587 w
/DeviceRGB {} CS
[0.5 0.5 0.5] SC
439.371 1105.51 m
-757.738 1105.51 1028.09 822.047 1247.43 822.047 c
+757.738 1105.51 1028.09 822.047 1240.57 822.047 c
S
-1175.15 477.402 m
+1173.14 476.684 m
1346.46 538.582 l
-1175.15 599.762 l
-1243.68 538.582 l
+1173.14 600.477 l
+1242.47 538.582 l
f
-53.7074 w
+54.4254 w
439.371 1105.51 m
-797.715 1105.51 988.113 538.582 1243.68 538.582 c
+797.715 1105.51 988.113 538.582 1242.47 538.582 c
S
-1306.74 240.93 m
+1306.48 240.84 m
1346.46 255.117 l
-1306.74 269.301 l
-1322.63 255.117 l
+1306.48 269.391 l
+1322.47 255.117 l
f
-6.71283 w
+6.80369 w
439.371 1105.51 m
-855.898 1105.51 929.926 255.117 1322.63 255.117 c
+855.898 1105.51 929.926 255.117 1322.47 255.117 c
S
-1184.55 764.223 m
+1185.85 764.684 m
1346.46 822.047 l
-1184.55 879.867 l
-1249.31 822.047 l
+1185.85 879.406 l
+1250.09 822.047 l
f
-50.3511 w
+49.8881 w
439.371 538.582 m
-757.738 538.582 1028.09 822.047 1249.31 822.047 c
+757.738 538.582 1028.09 822.047 1250.09 822.047 c
S
1087.42 446.07 m
1346.46 538.582 l
@@ -81164,41 +81176,41 @@ f
439.371 538.582 m
743.246 538.582 1042.58 538.582 1191.04 538.582 c
S
-1319.27 245.406 m
+1319.19 245.379 m
1346.46 255.117 l
-1319.27 264.824 l
-1330.14 255.117 l
+1319.19 264.855 l
+1330.09 255.117 l
f
-2.23621 w
+2.2665 w
439.371 538.582 m
-757.738 538.582 1028.09 255.117 1330.14 255.117 c
+757.738 538.582 1028.09 255.117 1330.09 255.117 c
S
-1181.41 763.102 m
+1182.68 763.551 m
1346.46 822.047 l
-1181.41 880.988 l
-1247.43 822.047 l
+1182.68 880.539 l
+1248.19 822.047 l
f
-51.4713 w
+51.0215 w
439.371 255.117 m
-797.715 255.117 988.113 822.047 1247.43 822.047 c
+797.715 255.117 988.113 822.047 1248.19 822.047 c
S
-1093.7 448.309 m
+1090.59 447.203 m
1346.46 538.582 l
-1093.7 628.852 l
-1194.8 538.582 l
+1090.59 629.961 l
+1192.94 538.582 l
f
-82.7995 w
+83.9068 w
439.371 255.117 m
-757.738 255.117 1028.09 538.582 1194.8 538.582 c
+757.738 255.117 1028.09 538.582 1192.94 538.582 c
S
-1306.74 240.93 m
+1306.48 240.84 m
1346.46 255.117 l
-1306.74 269.301 l
-1322.63 255.117 l
+1306.48 269.391 l
+1322.47 255.117 l
f
-6.71283 w
+6.80369 w
439.371 255.117 m
-743.246 255.117 1042.58 255.117 1322.63 255.117 c
+743.246 255.117 1042.58 255.117 1322.47 255.117 c
S
q
1417.32 1050.23 m
diff --git a/figures/Schmidt2017/Fig8_laminar_paths.py b/figures/Schmidt2017/Fig8_laminar_paths.py
index f285db45c8713d9f39d8c553ee41d0f01e494638..6199ec28dfe24143861ced814b245412a3afed82 100644
--- a/figures/Schmidt2017/Fig8_laminar_paths.py
+++ b/figures/Schmidt2017/Fig8_laminar_paths.py
@@ -28,7 +28,7 @@ SLN_completed = proc['SLN_completed']
SLN_Data_FV91 = proc['SLN_Data_FV91']
arch_types = proc['architecture_completed']
-par = {'g': -4.}
+par = {'connection_params': {'g': -4.}}
M = MultiAreaModel(par, theory=True, simulation=False)
gain_matrix = M.K_matrix[:, :-1] * np.absolute(M.J_matrix[:, :-1])
@@ -176,7 +176,7 @@ for target_area in area_list:
source_areas=[source_area],
complete_area_list=area_list,
external=False)
- pM = path_length_matrix[indices]
+ pM = path_length_matrix[indices[:, :-1]]
pM = pM.reshape(
(len(M.structure[target_area]), len(M.structure[source_area])))
imin = np.unravel_index(np.argmin(pM), pM.shape)