Skip to content

Commit 0bb0096

Browse files
committed
(CompCor) try using an OrderedDict for metadata
1 parent 66c7540 commit 0bb0096

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

nipype/algorithms/confounds.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
absolute_import)
99
from builtins import range
1010

11+
# Py2 compat: http://python-future.org/compatible_idioms.html#collections-counter-and-ordereddict
12+
from future import standard_library
13+
standard_library.install_aliases()
14+
from collections import OrderedDict
15+
1116
import os
1217
import os.path as op
1318

@@ -1230,7 +1235,7 @@ def compute_noise_components(imgseries, mask_images, components_criterion=0.5,
12301235
Numpy array containing the requested set of noise components
12311236
basis: numpy array
12321237
Numpy array containing the (non-constant) filter regressors
1233-
metadata: dict(numpy array)
1238+
metadata: OrderedDict{str: numpy array}
12341239
Dictionary of eigenvalues, fractional explained variances, and
12351240
cumulative explained variances.
12361241
"""
@@ -1296,13 +1301,12 @@ def compute_noise_components(imgseries, mask_images, components_criterion=0.5,
12961301
num_components = int(components_criterion)
12971302
if components is None:
12981303
components = u[:, :num_components]
1299-
metadata = {
1300-
'mask': np.array([i] * num_components),
1301-
'singular_value': s[:num_components],
1302-
'variance_explained': variance_explained[:num_components],
1303-
'cumulative_variance_explained':
1304-
cumulative_variance_explained[:num_components]
1305-
}
1304+
metadata = OrderedDict()
1305+
metadata['mask'] = np.array([i] * num_components)
1306+
metadata['singular_value'] = s[:num_components]
1307+
metadata['variance_explained'] = variance_explained[:num_components]
1308+
metadata['cumulative_variance_explained'] = (
1309+
cumulative_variance_explained[:num_components])
13061310
else:
13071311
components = np.hstack((components, u[:, :num_components]))
13081312
metadata['mask'] = np.hstack((metadata['mask'],

0 commit comments

Comments
 (0)