Changes for calo decoding

Jean-Francois Marchandrequested to merge
jmarchan-codeFromDaniel into master

Changes related to the calo decoding from Daniel, initially part of !1145 (merged)

Merge request reports