BeamPipeGeoModel: service pointer migration

Plus some code cleanup

ATEAM-1020

Merge request reports

Loading