Phase2 he25

Change default for GEM11
Correct some of the Hcal affiliations