Phase2 hgc02

Merged updates from Valery and myself for HGCal geometry