fixed chi2 constraint on pedestal and time
Merge pull request #6855 from violatingcp/hcal-fixchi2

fixed chi2 constraint on pedestal and time
Merge remote branch 'origin/CMSSW_7_3_X' into CMSSW_7_0_X