added T2bw option and made genH1Mass and genH2Mass variables positive