restored commit no. 4
implemented switch between time dilution schemes
implemented time dilution scheme switch and merged branch testing