Commit 13228e8

authored

Merge pull request #3713 from man-shu/fix/merge_rois_zero_d_array

[FIX] Set length to 1 when np.squeeze returns a 0D array

2 parents a9af62d + d5dbb3a commit 13228e8Copy full SHA for 13228e8

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1490,14 +1490,13 @@ def merge_rois(in_files, in_idxs, in_ref, dtype=None, out_file=None):`
`1490`	`1490`
`1491`	`1491`	`for cname, iname in zip(in_files, in_idxs):`
`1492`	`1492`	`f = np.load(iname)`
`1493`		`- idxs = np.squeeze(f["arr_0"])`
	`1493`	`+ idxs = np.atleast_1d(np.squeeze(f["arr_0"]))`
	`1494`	`+ nels = len(idxs)`
`1494`	`1495`
`1495`	`1496`	`for d, fname in enumerate(nii):`
`1496`	`1497`	`data = np.asanyarray(nb.load(fname).dataobj).reshape(-1)`
`1497`	`1498`	`cdata = nb.load(cname).dataobj[..., d].reshape(-1)`
`1498`		`- nels = len(idxs)`
`1499`		`- idata = (idxs,)`
`1500`		`- data[idata] = cdata[0:nels]`
	`1499`	`+ data[idxs] = cdata[:nels]`
`1501`	`1500`	`nb.Nifti1Image(data.reshape(rsh[:3]), aff, hdr).to_filename(fname)`
`1502`	`1501`
`1503`	`1502`	`imgs = [nb.load(im) for im in nii]`

Comments

(0)