7 0 x calorimeter pre mixing digitization fixes

Code for the "correct" version of PreMixing.  Yes, there are a lot of changes...