Added hooks in _limapar_set for user local macros
Updated limampx.mac for the energy calibration attributes
Merge commit '2e81e42e00ce35200bfe63b12319ff55757f6e15'