Calculation of small-angle scattering from models for surfactant systems