various changes, concerning rt energy correlation
fixed conflict in MWD.cxx