Rework mapping to ASin in analyzer space

Tidying Up Trig mapping functions