Weak lensing shear and aperture mass from linear to non-linear scales