diff --git a/fsl/transform/flirt.py b/fsl/transform/flirt.py index 9a17a27ef0b7e9feade79aaa137bf13dfc7d3b82..e1c84b7617e23eda40aac4692fe586d4942de372 100644 --- a/fsl/transform/flirt.py +++ b/fsl/transform/flirt.py @@ -79,7 +79,6 @@ def fromFlirt(xform, src, ref, from_='voxel', to='world'): :returns: ``numpy`` array of shape ``(4, 4)`` containing a matrix encoding a transformation from the source ``from_`` to the reference ``to`` coordinate systems. - """ premat = src.getAffine(from_, 'fsl') postmat = ref.getAffine('fsl', to) diff --git a/fsl/transform/nonlinear.py b/fsl/transform/nonlinear.py index ab1a9641fd0adb11057f4fd553134d27fb2d8db8..ec2cef1428f5c9cc2f816c9f9949a16041c15b9f 100644 --- a/fsl/transform/nonlinear.py +++ b/fsl/transform/nonlinear.py @@ -174,7 +174,8 @@ class DeformationField(NonLinearTransform): It is assumed that the a ``DeformationField`` is aligned with the reference image in their world coordinate systems (i.e. their ``sform`` - affines project both images into alignment). + affines project the reference image and the deformation field into + alignment). """ @@ -686,7 +687,7 @@ def applyDeformation(image, field, ref=None, order=1, mode=None, cval=None): If an alternate reference image is provided via the ``ref`` argument, the deformation field is resampled into its space, and then applied to - the input image. It is therefore assumed that an alternate ``ref``is + the input image. It is therefore assumed that an alternate ``ref`` is aligned in world coordinates with the field's actual reference image. :arg image: :class:`.Image` to be transformed diff --git a/fsl/transform/x5.py b/fsl/transform/x5.py index f14a165a03a825338a64b6216cb439b0b283387c..3c784a8b6be29e37b741038183f2ffa81a1fdaa3 100644 --- a/fsl/transform/x5.py +++ b/fsl/transform/x5.py @@ -555,9 +555,9 @@ def _readDeformation(group): :arg group: A ``h5py.Group`` object :returns: A tuple containing - - A ``numpy.arrayThe`` containing the deformation field + - A ``numpy.array`` containing the deformation field - - A ``numpy.array`` of shape ``(4, 4) `` containing the + - A ``numpy.array`` of shape ``(4, 4)`` containing the voxel to world affine for the deformation field - The deformation type - either ``'absolute'`` or diff --git a/fsl/utils/idle.py b/fsl/utils/idle.py index 1425ba191dd6d954c074369088c0a33d532dfeff..c1513708ebb401227dd1d0adb7cf9e0efd067631 100644 --- a/fsl/utils/idle.py +++ b/fsl/utils/idle.py @@ -278,7 +278,7 @@ class IdleTask(object): def _wxIdleLoop(ev): """Function which is called on ``wx.EVT_IDLE`` events, and occasionally - on ``wx.EVT_TIMER` events via the :attr:`_idleTimer`. If there + on ``wx.EVT_TIMER`` events via the :attr:`_idleTimer`. If there is a function on the :attr:`_idleQueue`, it is popped and called. .. note:: The ``wx.EVT_IDLE`` event is only triggered on user interaction diff --git a/fsl/wrappers/wrapperutils.py b/fsl/wrappers/wrapperutils.py index 373bcf08b1a0c53af416a074cc4c439cf534f792..541c383a5a7d564ab37cde61cb47eff5c9a89fdd 100644 --- a/fsl/wrappers/wrapperutils.py +++ b/fsl/wrappers/wrapperutils.py @@ -446,7 +446,7 @@ class _FileOrThing(object): Functions decorated with a ``_FileOrThing`` decorator will always return a ``dict``-like object, where the function's actual return value is - accessible via an attribute called `output`. All output arguments with a + accessible via an attribute called ``output``. All output arguments with a value of ``LOAD`` will be present as dictionary entries, with the keyword argument names used as keys. Any ``LOAD``ed output arguments which were not generated by the function will not be present in the dictionary.