Enhanced model for determining the number of graphene layers and their distribution from X-ray diffraction data