23.0-cppcheck-Herwig7_i

Shaun Roerequested to merge
sroe/athena:23.0-cppcheck-Herwig7_i into master

[minor] Clear cppcheck warning about invalid iteration by using a for_each algorithm. Also tidied headers slightly.

Merge request reports