Demo analysis now works with multiple hits

The demo analysis is now able to cope with multiple hits per channel.
Only restriction is that there as many leading as trailing edges.