Calib: Improved QuadEnergy fit constraints