Hopefully fix indexing error

lukassnoek · Feb 26, 2017 · 14d9870 · 14d9870
1 parent e465e6a
commit 14d9870
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/skbold/core/mvp.py b/skbold/core/mvp.py
@@ -154,7 +154,7 @@ def update_mask(self, mask, threshold=0):
                 i = it
 
             fids = np.unique(self.featureset_id)
-            posidx = np.where(i == fids)[0]
+            posidx = np.where(i == fids)[0][0]
             tmp = np.zeros(self.data_shape[posidx]).ravel()
             fidx = self.featureset_id == i
             tmp[self.voxel_idx[fidx]] = 1

diff --git a/skbold/core/mvp_between.py b/skbold/core/mvp_between.py
@@ -659,7 +659,7 @@ def write_4D(self, path=None, return_nimg=False):
 
         nimgs = []
         for i, fid in enumerate(fids):
-            pos_idx = np.where(i == fids)[0]
+            pos_idx = np.where(i == fids)[0][0]
             s = self.data_shape[pos_idx]
             to_write = np.zeros((np.prod(s), self.X.shape[0]))
             X_to_write = self.X[:, self.featureset_id == fid]

diff --git a/skbold/postproc/mvp_results.py b/skbold/postproc/mvp_results.py
@@ -174,7 +174,7 @@ def write(self, feature_viz=True, confmat=True, to_tstat=True,
 
         for i in fids:
 
-            pos_idx = np.where(i == fids)[0]
+            pos_idx = np.where(i == fids)[0][0]
             img = np.zeros(self.data_shape[pos_idx]).ravel()
             subset = values[self.featureset_id == i]
 
@@ -190,7 +190,7 @@ def write(self, feature_viz=True, confmat=True, to_tstat=True,
                     img = np.zeros(self.data_shape[pos_idx]).ravel()
 
             else:
-                pos_idx = np.where(i == fids)[0]
+                pos_idx = np.where(i == fids)[0][0]
                 img[self.voxel_idx[self.featureset_id == i]] = subset
                 img = nib.Nifti1Image(img.reshape(self.data_shape[pos_idx]),
                                       affine=self.affine[pos_idx])

diff --git a/skbold/utils/parse_roi_labels.py b/skbold/utils/parse_roi_labels.py
@@ -64,7 +64,7 @@ def parse_roi_labels(atlas_type='Talairach', lateralized=False, debug=False):
     else:
         xml = op.join(roidata_root, atlas_type, atlas_type + '.xml')
 
-    with open(xml, 'rb') as fin:
+    with open(xml, 'r') as fin:
         doc = fin.readlines()
 
     if atlas_type == 'Talairach':