modified EnergyScaleCorrection to use also Et dependent corrections
Merge branch 'EtScaleCorrection' into newMaster