Update the RooDEnergyImp.cc for signal and generic MC