shape better

now using angle_n
calculates eta and wavelength dependence