New geometry. Added calorimeters folder to save old calorimeter geometry