Before revision:  Here we analyze the dynamics of heterogeneous populations of quadratic integrate-and-fire (QIF) neurons with both chemical and electrical coupling.
After revision:  Here we introduce a novel firing rate model that exactly describes the mean field dynamics of heterogeneous populations of quadratic integrate-and-fire (QIF) neurons with both chemical and electrical coupling.