Changes to CaloParams, based on Jims point 8.