Incorporating outlier detection and replacement into a non-parametric framework for movement and distortion correction of diffusion MR images