Commit fa332e37 authored by Whitney Armstrong's avatar Whitney Armstrong

Merge branch 'new_calorimeter' into 'master'

New calorimeter detector

See merge request !21
parents 44e22193 e5e81f7d
Pipeline #79 passed with stage
in 42 seconds