From 2d642abb5a5dcbc80b647c076177aedf13662123 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Tue, 11 Feb 2025 12:34:48 +0000
Subject: [PATCH] TEST: Replace voxToScaledVox with getAffine
---
fsl/tests/test_image.py | 12 ++++++------
fsl/tests/test_transform/test_nonlinear.py | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/fsl/tests/test_image.py b/fsl/tests/test_image.py
index f33bbefad..8f2fe9b93 100644
--- a/fsl/tests/test_image.py
+++ b/fsl/tests/test_image.py
@@ -1055,11 +1055,11 @@ def _test_Image_5D(imgtype):
img = None
-def test_Image_voxToScaledVox_analyze(): _test_Image_voxToScaledVox(0)
-def test_Image_voxToScaledVox_nifti1(): _test_Image_voxToScaledVox(1)
-def test_Image_voxToScaledVox_nifti2(): _test_Image_voxToScaledVox(2)
+def test_Image_voxToFSL_analyze(): _test_Image_voxToFSL(0)
+def test_Image_voxToFSL_nifti1(): _test_Image_voxToFSL(1)
+def test_Image_voxToFSL_nifti2(): _test_Image_voxToFSL(2)
-def _test_Image_voxToScaledVox(imgtype):
+def _test_Image_voxToFSL(imgtype):
dims = [(10, 10, 10)]
pixdims = [(-1, 1, 1),
@@ -1088,8 +1088,8 @@ def _test_Image_voxToScaledVox(imgtype):
expected = expect(imgtype, dim, pixdim)
invexpected = npla.inv(expected)
- assert np.all(np.isclose(expected, img.voxToScaledVoxMat))
- assert np.all(np.isclose(invexpected, img.scaledVoxToVoxMat))
+ assert np.all(np.isclose(expected, img.getAffine('voxel', 'fsl')))
+ assert np.all(np.isclose(invexpected, img.getAffine('fsl', 'voxel')))
img = None
diff --git a/fsl/tests/test_transform/test_nonlinear.py b/fsl/tests/test_transform/test_nonlinear.py
index 682a7fae9..e2c02d2f3 100644
--- a/fsl/tests/test_transform/test_nonlinear.py
+++ b/fsl/tests/test_transform/test_nonlinear.py
@@ -84,7 +84,7 @@ def _random_affine_field():
np.arange(ref.shape[2]), indexing='ij')
rvoxels = np.vstack((rx.flatten(), ry.flatten(), rz.flatten())).T
- rcoords = affine.transform(rvoxels, ref.voxToScaledVoxMat)
+ rcoords = affine.transform(rvoxels, ref.getAffine('voxel', 'fsl'))
scoords = affine.transform(rcoords, xform)
field = np.zeros(list(ref.shape[:3]) + [3])
@@ -162,7 +162,7 @@ def test_convertDeformationSpace():
np.random.randint(0, basefield.shape[1], 5),
np.random.randint(0, basefield.shape[2], 5)]
refcoords = np.array(refcoords, dtype=int).T
- refcoords = affine.transform(refcoords, ref.voxToScaledVoxMat)
+ refcoords = affine.transform(refcoords, ref.getAffine('voxel', 'fsl'))
srccoords = basefield.transform(refcoords)
field = nonlinear.convertDeformationSpace(basefield, from_, to)
@@ -190,9 +190,9 @@ def test_DeformationField_transform():
np.arange(ref.shape[1]),
np.arange(ref.shape[2]), indexing='ij')
rvoxels = np.vstack((rx.flatten(), ry.flatten(), rz.flatten())).T
- rcoords = affine.transform(rvoxels, ref.voxToScaledVoxMat)
+ rcoords = affine.transform(rvoxels, ref.getAffine('voxel', 'fsl'))
scoords = affine.transform(rcoords, xform)
- svoxels = affine.transform(scoords, src.scaledVoxToVoxMat)
+ svoxels = affine.transform(scoords, src.getAffine('fsl', 'voxel'))
absfield = np.zeros(list(ref.shape[:3]) + [3])
absfield[:] = scoords.reshape(*it.chain(ref.shape, [3]))
@@ -217,9 +217,9 @@ def test_DeformationField_transform():
# test out of bounds are returned as nan
rvoxels = np.array([[-1, -1, -1],
[ 0, 0, 0]])
- rcoords = affine.transform(rvoxels, ref.voxToScaledVoxMat)
+ rcoords = affine.transform(rvoxels, ref.getAffine('voxel', 'fsl'))
scoords = affine.transform(rcoords, xform)
- svoxels = affine.transform(scoords, src.scaledVoxToVoxMat)
+ svoxels = affine.transform(scoords, src.getAffine('fsl', 'voxel'))
got = relfield.transform(rcoords)
assert np.all(np.isnan(got[0, :]))
--
GitLab