merge chitao's change in dose cal