remove "sincosl" and use "normalizedPhi" function

replacing https://github.com/cms-sw/cmssw/pull/6110