Merge branch 'filter_iterator' into 'master'
Use filter iterator instead of filter_partons
See merge request hej/HEJ!49