Various changes in compiled sources and macros to achieve consistency with mTOF presentation on Tue, Nov. 17, 2020