Fix eta-phi indices
Fix eta-phi indices
Merge pull request #898 from kodolova/Fix-eta-phi

Calibration bug fix -- Fix eta phi indices to be within range.

Related to https://hypernews.cern.ch/HyperNews/CMS/get/swReleases/3946.html