ensure correct replacements for ECAL

Fixing a bug that only affected the "new mixing" (which is not default yet).
Removing the obsolete mixSimCaloHits (never used).