L1t updates 7 2 x rebased

Rebase of PR #5201 
Updates for L1 Trigger Emulation for 2015 running.
This and other lines seem to have compilation caused errors in the gcc491 CMSSW_7_2_X_2014-09-08-1400 IB:

https://cmssdt.cern.ch/SDT/cgi-bin/buildlogs/slc6_amd64_gcc491/CMSSW_7_2_X_2014-09-08-1400/DataFormats/L1TCalorimeter