Merge pull request #971 from oesteban/bug/fix969

A bugfix for #969

Author: chrisgorgo

nipype/algorithms/misc.py

@@ -1394,23 +1394,23 @@ def merge_rois(in_files, in_idxs, in_ref,
     if ndirs < 300:
         data = np.zeros((npix, ndirs))
         for cname, iname in zip(in_files, in_idxs):
-            with np.load(iname) as f:
-                idxs = np.squeeze(f['arr_0'])
+            f = np.load(iname)
+            idxs = np.squeeze(f['arr_0'])
             cdata = nb.load(cname).get_data().reshape(-1, ndirs)
             nels = len(idxs)
             idata = (idxs, )
             try:
                 data[idata, ...] = cdata[0:nels, ...]
             except:
-                print(data.shape, cdata.shape)
+                print(('Consistency between indexes and chunks was '
+                      'lost: data=%s, chunk=%s') % (str(data.shape),
+                      str(cdata.shape)))
                 raise
 
         hdr.set_data_shape(newshape)
-
         nb.Nifti1Image(data.reshape(newshape).astype(dtype),
                        aff, hdr).to_filename(out_file)
 
-
     else:
         hdr.set_data_shape(rsh[:3])
         nii = []
@@ -1420,16 +1420,17 @@ def merge_rois(in_files, in_idxs, in_ref,
             nii.append(fname)
 
         for cname, iname in zip(in_files, in_idxs):
-            with np.load(iname) as f:
-                idxs = np.squeeze(f['arr_0'])
+            f = np.load(iname)
+            idxs = np.squeeze(f['arr_0'])
 
             for d, fname in enumerate(nii):
                 data = nb.load(fname).get_data().reshape(-1)
                 cdata = nb.load(cname).get_data().reshape(-1, ndirs)[:, d]
                 nels = len(idxs)
                 idata = (idxs, )
                 data[idata] = cdata[0:nels]
-                nb.Nifti1Image(data.reshape(rsh[:3]), aff, hdr).to_filename(fname)
+                nb.Nifti1Image(data.reshape(rsh[:3]),
+                               aff, hdr).to_filename(fname)
 
         imgs = [nb.load(im) for im in nii]
         allim = nb.concat_images(imgs)