Merge branch 'lcapriot_ECAL' into 'master'

ECAL&HCAL geometry

See merge request !190
7 jobs for master in 13 minutes and 4 seconds (queued for 1 second)