Non-parabolicity and anisotropy in the conduction band of GaAs