Photoluminescence and magnetophotoluminescence of circular andelliptical InAs/GaAs quantum dots