report only one count in flow and distribution if different particles are used
notebook update
Merge branch 'master' into mac