Updated calorimeter geometry