A generalized uniform GTD ray solution for the diffraction by a perfectly-conducting wedge with convex faces /