move assert code out of lineshapes definitions
use lineshapes, use None instead of 'none'