Two last things: it seemed that your last version did not have support for the octant, but this one does - fine. However, I do think that we should choose __radians__ as unit for the mixing angle. This is what is used in basically every `sin`/`cos` implementation I've come across so far, as well as it is the default unit in IceTray.