with dEdx calculation included