Generalized for >1 calorimeters

Now works as expected with the FCC geometry.