E/gamma particle based isolation.
Additionally, implement some comments from previous code review.