Separate the calorimeter into preshower and shower detectors

they should also have independent hit collections