revised geometry, fully parametrized and including HCAL possibility

No match.