From 4d9b6c29734e4dcc854dd13f77a537c78b1c42a0 Mon Sep 17 00:00:00 2001 From: shivesh Date: Tue, 20 Nov 2018 23:29:35 -0600 Subject: bug in fr_to_angles --- utils/fr.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/utils/fr.py b/utils/fr.py index 09a69bf..d899d42 100644 --- a/utils/fr.py +++ b/utils/fr.py @@ -343,12 +343,17 @@ def fr_to_angles(ratios): TODO(shivesh) """ fr0, fr1, fr2 = normalise_fr(ratios) - sphi4 = (fr2 - 1.0)**2 - if (fr2 - 1.0) == 0: - c2psi = 0 - else: - c2psi = (fr1*2.0 + fr2 - 1.0) * (fr2 - 1.0) - return sphi4, c2psi + + cphi2 = fr2 + sphi2 = (1.0 - cphi2) + + spsi2 = fr1 / sphi2 + cpsi2 = fr0 / sphi2 + + sphi4 = sphi2**2 + c2psi = COS(ACOS(SQRT(cpsi2))*2) + + return map(float, (sphi4, c2psi)) NUFIT_U = angles_to_u((0.307, (1-0.02195)**2, 0.565, 3.97935)) -- cgit v1.2.3