Toroidicity Dependence of Tokamak Edge Safety Factor and Shear