diff --git a/fsl/utils/transform.py b/fsl/utils/transform.py index 4fe7fe8e4cfd33e97c4e4cd72db90081c5ce8582..6ff409b272a54962f8f09742c4ef8046a4c4aea3 100644 --- a/fsl/utils/transform.py +++ b/fsl/utils/transform.py @@ -555,10 +555,10 @@ def flirtMatrixToSform(flirtMat, srcImage, refImage): :arg refImage: Reference :class:`.Image` """ - srcScaledVoxelMat = srcImage.voxelsToScaledVoxels() - refScaledVoxelMat = refImage.voxelsToScaledVoxels() + srcScaledVoxelMat = srcImage.voxToScaledVoxMat + refInvScaledVoxelMat = refImage.voxToScaledVoxMat + refInvScaledVoxelMat = refImage.scaledVoxToVoxMat refVoxToWorldMat = refImage.voxToWorldMat - refInvScaledVoxelMat = invert(refScaledVoxelMat) return concat(refVoxToWorldMat, refInvScaledVoxelMat, @@ -581,15 +581,15 @@ def sformToFlirtMatrix(srcImage, refImage, srcXform=None): :attr:`.Nifti.voxToWorldMat` """ - srcScaledVoxelsToVoxelsMat = invert(srcImage.voxelsToScaledVoxels()) - srcVoxToWorldMat = srcImage.voxToWorldMat - refWorldToVoxMat = invert(refImage.voxToWorldMat) - refVoxelsToScaledVoxelsMat = refImage.voxelsToScaledVoxels() + srcScaledVoxToVoxMat = srcImage.scaledVoxToVoxMat + srcVoxToWorldMat = srcImage.voxToWorldMat + refWorldToVoxMat = refImage.worldToVoxMat + refVoxToScaledVoxMat = refImage.voxToScaledVoxMat if srcXform is not None: srcVoxToWorldMat = srcXform - return concat(refVoxelsToScaledVoxelsMat, + return concat(refVoxToScaledVoxMat, refWorldToVoxMat, srcVoxToWorldMat, - srcScaledVoxelsToVoxelsMat) + srcScaledVoxToVoxMat)