Make sure 3 eta scenarios use 3 eta Hcal numbering.
Merge pull request #3985 from ianna/hcal-phase2-numbering

Hcal Phase 2 Numbering