Added calculation and application of JEC and JER