Update lineshapes

Rewrite elastic and compton peaks and update test files.
There are actually '+'s here in the code.