Added in the relevent CaloParams
Merge branch 'l1t-devel-CMSSW_7_1_0_pre6' of github.com:cms-l1t-offline/cmssw into mydevel-branch-pre6