diff options
| author | shivesh <s.p.mandalia@qmul.ac.uk> | 2018-11-20 23:29:35 -0600 |
|---|---|---|
| committer | shivesh <s.p.mandalia@qmul.ac.uk> | 2018-11-20 23:29:35 -0600 |
| commit | 4d9b6c29734e4dcc854dd13f77a537c78b1c42a0 (patch) | |
| tree | e618b4ed45758eee0e5f8e211bb5411ec16f3948 /utils | |
| parent | c93fdd6d39f8adf059a61ac7e1bc017699e8bfa7 (diff) | |
| download | GolemFlavor-4d9b6c29734e4dcc854dd13f77a537c78b1c42a0.tar.gz GolemFlavor-4d9b6c29734e4dcc854dd13f77a537c78b1c42a0.zip | |
bug in fr_to_angles
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/fr.py | 17 |
1 files 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)) |