Fix zero spin conversion
This fixes the issue in #588 (closed). It just needed some rearranging of the order in which the various parameters are added and calculation are performed when filling in the missing pieces of the result object.
Edited by Sylvia Biscoveanu