Update calorimeter data structures

Staged approach to add everything from !33 (closed). Next up are the calorimeter data structures.