Hcal geometry

* Migrate code changes from CVS
* Remove obsolete file