Adapted to changes in Calo code due to DD4hep integration

Sebastien Ponce requested to merge sponce_CaloTowardsDD4hep into master

Merge request reports