Fix overlaps with new beampipe.
Merge pull request #2702 from ianna/overlaps-with-new-beampipe

Geometry -- Fix overlaps with new beampipe.