Skip to content

Commit 530143e

Browse files
committed
RF: Purge get_data() from interfaces.cmtk
1 parent 68382d2 commit 530143e

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

nipype/interfaces/cmtk/cmtk.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ def cmat(
201201
stats["orig_n_fib"] = len(fib)
202202

203203
roi = nb.load(roi_file, mmap=NUMPY_MMAP)
204-
roiData = roi.get_data()
204+
# Preserve on-disk type unless scaled
205+
roiData = np.asanyarray(roi.dataobj)
205206
roiVoxelSize = roi.header.get_zooms()
206207
(endpoints, endpointsmm) = create_endpoints_array(fib, roiVoxelSize)
207208

@@ -432,9 +433,7 @@ def cmat(
432433

433434
fiberlabels_fname = op.abspath(endpoint_name + "_filtered_fiberslabel.npy")
434435
iflogger.info("Storing all fiber labels (with orphans) as %s", fiberlabels_fname)
435-
np.save(
436-
fiberlabels_fname, np.array(fiberlabels, dtype=np.int32),
437-
)
436+
np.save(fiberlabels_fname, np.array(fiberlabels, dtype=np.int32))
438437

439438
fiberlabels_noorphans_fname = op.abspath(endpoint_name + "_final_fiberslabels.npy")
440439
iflogger.info(
@@ -840,7 +839,8 @@ def _run_interface(self, runtime):
840839
aparcpath, aparcname, aparcext = split_filename(aparc_aseg_file)
841840
iflogger.info("Using Aparc+Aseg file: %s", aparcname + aparcext)
842841
niiAPARCimg = nb.load(aparc_aseg_file, mmap=NUMPY_MMAP)
843-
niiAPARCdata = niiAPARCimg.get_data()
842+
# Preserve on-disk type
843+
niiAPARCdata = np.asanyarray(niiAPARCimg.dataobj)
844844
niiDataLabels = np.unique(niiAPARCdata)
845845
numDataLabels = np.size(niiDataLabels)
846846
iflogger.info("Number of labels in image: %s", numDataLabels)
@@ -1057,7 +1057,8 @@ def create_nodes(roi_file, resolution_network_file, out_filename):
10571057
G = nx.Graph()
10581058
gp = nx.read_graphml(resolution_network_file)
10591059
roi_image = nb.load(roi_file, mmap=NUMPY_MMAP)
1060-
roiData = roi_image.get_data()
1060+
# Preserve on-disk type unless scaled
1061+
roiData = np.asanyarray(roi_image.dataobj)
10611062
for u, d in gp.nodes(data=True):
10621063
G.add_node(int(u), **d)
10631064
xyz = tuple(

nipype/interfaces/cmtk/parcellation.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ def create_roi(subject_id, subjects_dir, fs_dir, parcellation_name, dilation):
345345
parval = cmp_config._get_lausanne_parcellation("Lausanne2008")[parcellation_name]
346346
pgpath = parval["node_information_graphml"]
347347
aseg = nb.load(op.join(fs_dir, "mri", "aseg.nii.gz"))
348-
asegd = aseg.get_data()
348+
asegd = np.asanyarray(aseg.dataobj)
349349

350350
# identify cortical voxels, right (3) and left (42) hemispheres
351351
idxr = np.where(asegd == 3)
@@ -420,7 +420,7 @@ def create_roi(subject_id, subjects_dir, fs_dir, parcellation_name, dilation):
420420
runCmd(mri_cmd, log)
421421

422422
tmp = nb.load(op.join(output_dir, "tmp.nii.gz"))
423-
tmpd = tmp.get_data()
423+
tmpd = np.asanyarray(tmp.dataobj)
424424

425425
# find voxel and set them to intensityvalue in rois
426426
idx = np.where(tmpd == 1)
@@ -478,7 +478,7 @@ def create_wm_mask(subject_id, subjects_dir, fs_dir, parcellation_name):
478478
]
479479
# load ribbon as basis for white matter mask
480480
fsmask = nb.load(op.join(fs_dir, "mri", "ribbon.nii.gz"))
481-
fsmaskd = fsmask.get_data()
481+
fsmaskd = np.asanyarray(fsmask.dataobj)
482482

483483
wmmask = np.zeros(fsmaskd.shape)
484484
# extract right and left white matter
@@ -490,7 +490,7 @@ def create_wm_mask(subject_id, subjects_dir, fs_dir, parcellation_name):
490490

491491
# remove subcortical nuclei from white matter mask
492492
aseg = nb.load(op.join(fs_dir, "mri", "aseg.nii.gz"))
493-
asegd = aseg.get_data()
493+
asegd = np.asanyarray(aseg.dataobj)
494494

495495
# need binary erosion function
496496
imerode = nd.binary_erosion
@@ -583,7 +583,7 @@ def create_wm_mask(subject_id, subjects_dir, fs_dir, parcellation_name):
583583

584584
# ADD voxels from 'cc_unknown.nii.gz' dataset
585585
ccun = nb.load(op.join(fs_dir, "label", "cc_unknown.nii.gz"))
586-
ccund = ccun.get_data()
586+
ccund = np.asanyarray(ccun.dataobj)
587587
idx = np.where(ccund != 0)
588588
iflogger.info("Add corpus callosum and unknown to wm mask")
589589
wmmask[idx] = 1
@@ -594,7 +594,7 @@ def create_wm_mask(subject_id, subjects_dir, fs_dir, parcellation_name):
594594
parcellation_name,
595595
)
596596
roi = nb.load(op.join(op.curdir, "ROI_%s.nii.gz" % parcellation_name))
597-
roid = roi.get_data()
597+
roid = np.asanyarray(roi.dataobj)
598598
assert roid.shape[0] == wmmask.shape[0]
599599
pg = nx.read_graphml(pgpath)
600600
for brk, brv in pg.nodes(data=True):

0 commit comments

Comments
 (0)