fix for RECO V4 geometry options
Merged HGC_RecoGeometry_Fix from repository lgray
Fix some of the geometry issues
Merge pull request #4553 from bsunanda/Phase2-hgx20

Phase2 hgx20