now using EnergyCalibration and CalibrationUtility classes