generalize the PHCal fits for NPoints
Merge branch 'DiamondTestbeam' of https://github.com/cmsplt/DHidasPLT into DiamondTestbeam