AFP_GeoModel: code cleanup

Frank Winklmeierrequested to merge
fwinkl/athena:afp_geomodel into main

Remove commented code, use ATH macros.

Merge request reports