Corrected the conversion functions (from theta to z, etc.) with the
proper variable names for the beta_rel, energy...