Clean up the HCal numbering code and add one additional functionality
Merge pull request #4050 from bsunanda/Phase2-hcx1

Phase2 hcx1