Added function mapping:eval_z to evaluate in terms of zeta instead of r.