Following !25698 (merged) some further updates were needed to allow ATLAS-P2-ITK-22-XX-XX geometries to be built, due to new structures being used in the services.
In future Xml versions and geometry code updates, the different services shapes (TUBE/TUBS/CONE) will be properly separated such that no attempts will be made to retrieve parameters for shapes where they are not defined.