Skip to content

Commit c21006a

Browse files
committed
RF: Remove deprecated nibabel image methods
1 parent cf6bcba commit c21006a

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

nipype/algorithms/confounds.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ def _run_interface(self, runtime):
398398
if len(mask_images) == 0:
399399
img = nb.Nifti1Image(np.ones(imgseries.shape[:3], dtype=np.bool),
400400
affine=imgseries.affine,
401-
header=imgseries.get_header())
401+
header=imgseries.header)
402402
mask_images = [img]
403403

404404
mask_images = self._process_masks(mask_images, imgseries.get_data())
@@ -501,7 +501,7 @@ def _process_masks(self, mask_images, timeseries=None):
501501
mask_data = np.zeros_like(mask)
502502
mask_data[mask != 0] = tSTD >= threshold_std
503503
out_image = nb.Nifti1Image(mask_data, affine=img.affine,
504-
header=img.get_header())
504+
header=img.header)
505505

506506
# save mask
507507
mask_file = os.path.abspath('mask_{:03d}.nii.gz'.format(i))
@@ -561,7 +561,7 @@ def _run_interface(self, runtime):
561561
header = img.header.copy()
562562
vollist = [nb.load(filename, mmap=NUMPY_MMAP) for filename in self.inputs.in_file]
563563
data = np.concatenate([vol.get_data().reshape(
564-
vol.get_shape()[:3] + (-1,)) for vol in vollist], axis=3)
564+
vol.shape[:3] + (-1,)) for vol in vollist], axis=3)
565565
data = np.nan_to_num(data)
566566

567567
if data.dtype.kind == 'i':
@@ -570,18 +570,18 @@ def _run_interface(self, runtime):
570570

571571
if isdefined(self.inputs.regress_poly):
572572
data = regress_poly(self.inputs.regress_poly, data, remove_mean=False)
573-
img = nb.Nifti1Image(data, img.get_affine(), header)
573+
img = nb.Nifti1Image(data, img.affine, header)
574574
nb.save(img, op.abspath(self.inputs.detrended_file))
575575

576576
meanimg = np.mean(data, axis=3)
577577
stddevimg = np.std(data, axis=3)
578578
tsnr = np.zeros_like(meanimg)
579579
tsnr[stddevimg > 1.e-3] = meanimg[stddevimg > 1.e-3] / stddevimg[stddevimg > 1.e-3]
580-
img = nb.Nifti1Image(tsnr, img.get_affine(), header)
580+
img = nb.Nifti1Image(tsnr, img.affine, header)
581581
nb.save(img, op.abspath(self.inputs.tsnr_file))
582-
img = nb.Nifti1Image(meanimg, img.get_affine(), header)
582+
img = nb.Nifti1Image(meanimg, img.affine, header)
583583
nb.save(img, op.abspath(self.inputs.mean_file))
584-
img = nb.Nifti1Image(stddevimg, img.get_affine(), header)
584+
img = nb.Nifti1Image(stddevimg, img.affine, header)
585585
nb.save(img, op.abspath(self.inputs.stddev_file))
586586
return runtime
587587

@@ -872,7 +872,7 @@ def combine_mask_files(mask_files, mask_method=None, mask_index=None):
872872
if mask is None:
873873
mask = img.get_data() > 0
874874
np.logical_or(mask, img.get_data() > 0, mask)
875-
img = nb.Nifti1Image(mask, img.affine, header=img.get_header())
875+
img = nb.Nifti1Image(mask, img.affine, header=img.header)
876876
return [img]
877877

878878
if mask_method == 'intersect':
@@ -882,7 +882,7 @@ def combine_mask_files(mask_files, mask_method=None, mask_index=None):
882882
if mask is None:
883883
mask = img.get_data() > 0
884884
np.logical_and(mask, img.get_data() > 0, mask)
885-
img = nb.Nifti1Image(mask, img.affine, header=img.get_header())
885+
img = nb.Nifti1Image(mask, img.affine, header=img.header)
886886
return [img]
887887

888888

nipype/interfaces/dipy/reconstruction.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ def _run_interface(self, runtime):
7474
import gc
7575

7676
img = nb.load(self.inputs.in_file)
77-
hdr = img.get_header().copy()
78-
affine = img.get_affine()
77+
hdr = img.header.copy()
78+
affine = img.affine
7979
data = img.get_data()
8080
gtab = self._get_gradient_table()
8181

@@ -210,14 +210,14 @@ def _run_interface(self, runtime):
210210

211211
img = nb.load(self.inputs.in_file)
212212
imref = nb.four_to_three(img)[0]
213-
affine = img.get_affine()
213+
affine = img.affine
214214

215215
if isdefined(self.inputs.in_mask):
216216
msk = nb.load(self.inputs.in_mask).get_data()
217217
msk[msk > 0] = 1
218218
msk[msk < 0] = 0
219219
else:
220-
msk = np.ones(imref.get_shape())
220+
msk = np.ones(imref.shape)
221221

222222
data = img.get_data().astype(np.float32)
223223
gtab = self._get_gradient_table()
@@ -326,15 +326,15 @@ def _run_interface(self, runtime):
326326

327327
img = nb.load(self.inputs.in_file)
328328
imref = nb.four_to_three(img)[0]
329-
affine = img.get_affine()
329+
affine = img.affine
330330

331331
if isdefined(self.inputs.in_mask):
332332
msk = nb.load(self.inputs.in_mask).get_data()
333333
else:
334-
msk = np.ones(imref.get_shape())
334+
msk = np.ones(imref.shape)
335335

336336
data = img.get_data().astype(np.float32)
337-
hdr = imref.get_header().copy()
337+
hdr = imref.header.copy()
338338

339339
gtab = self._get_gradient_table()
340340
resp_file = np.loadtxt(self.inputs.response)
@@ -359,7 +359,7 @@ def _run_interface(self, runtime):
359359
if self.inputs.save_fods:
360360
sphere = get_sphere('symmetric724')
361361
fods = csd_fit.odf(sphere)
362-
nb.Nifti1Image(fods.astype(np.float32), img.get_affine(),
362+
nb.Nifti1Image(fods.astype(np.float32), img.affine,
363363
None).to_filename(self._gen_filename('fods'))
364364

365365
return runtime

nipype/interfaces/dipy/tensors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def _run_interface(self, runtime):
127127
# Load the 4D image files
128128
img = nb.load(self.inputs.in_file)
129129
data = img.get_data()
130-
affine = img.get_affine()
130+
affine = img.affine
131131

132132
# Load the gradient strengths and directions
133133
gtab = self._get_gradient_table()

nipype/interfaces/dipy/tracks.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ def _run_interface(self, runtime):
177177

178178
img = nb.load(self.inputs.in_file)
179179
imref = nb.four_to_three(img)[0]
180-
affine = img.get_affine()
180+
affine = img.affine
181181

182182
data = img.get_data().astype(np.float32)
183-
hdr = imref.get_header().copy()
183+
hdr = imref.header.copy()
184184
hdr.set_data_dtype(np.float32)
185185
hdr['data_type'] = 16
186186

@@ -222,7 +222,7 @@ def _run_interface(self, runtime):
222222
msk[msk > 0] = 1
223223
msk[msk < 0] = 0
224224
else:
225-
msk = np.ones(imref.get_shape())
225+
msk = np.ones(imref.shape)
226226

227227
gfa = peaks.gfa * msk
228228
seeds = self.inputs.num_seeds

0 commit comments

Comments
 (0)