Gem21 services geometry

* Fix for GE2/1 numbering from Marcello
* Extend coverage
* Bugfix in GE21L positioning in negative Z