Remove hardcoding in geometry definition

Remove hardcoding in Hcal and HcalTrigger geometry definition