diff options
| author | Shivesh Mandalia <shivesh.mandalia@outlook.com> | 2020-02-29 01:22:24 +0000 |
|---|---|---|
| committer | Shivesh Mandalia <shivesh.mandalia@outlook.com> | 2020-02-29 01:22:24 +0000 |
| commit | 7b32b3e2c437f65f6ac946d16463691e7496be29 (patch) | |
| tree | e218432fd38dac1f3015bb496ce5dd3ec87098c4 /golemflavor | |
| parent | f1d78098408199d0f49396e2beb46b4536da4aca (diff) | |
| download | GolemFlavor-7b32b3e2c437f65f6ac946d16463691e7496be29.tar.gz GolemFlavor-7b32b3e2c437f65f6ac946d16463691e7496be29.zip | |
Minor fixes
Diffstat (limited to 'golemflavor')
| -rw-r--r-- | golemflavor/fr.py | 5 | ||||
| -rw-r--r-- | golemflavor/misc.py | 5 | ||||
| -rw-r--r-- | golemflavor/plot.py | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/golemflavor/fr.py b/golemflavor/fr.py index 6692609..9171972 100644 --- a/golemflavor/fr.py +++ b/golemflavor/fr.py @@ -162,6 +162,11 @@ def angles_to_u(bsm_angles): return u +def flat_angles_to_u(x): + """Convert from angles to mixing elements.""" + return abs(angles_to_u(x)).astype(np.float32).flatten().tolist() + + def cardano_eqn(ham): """Diagonalise the effective Hamiltonian 3x3 matrix into the form h_{eff} = UE_{eff}U^{dagger} using the procedure in PRD91, 052003 (2015). diff --git a/golemflavor/misc.py b/golemflavor/misc.py index d83bb99..57fe6f7 100644 --- a/golemflavor/misc.py +++ b/golemflavor/misc.py @@ -212,11 +212,6 @@ def interval(arr, percentile=68.): return sarr[curr_low], center, sarr[curr_up] -def flat_angles_to_u(x): - """Convert from angles to mixing elements.""" - return abs(angles_to_u(x)).astype(np.float32).flatten().tolist() - - def myround(x, base=2, up=False, down=False): if up == down and up is True: assert 0 if up: return int(base * np.round(float(x)/base-0.5)) diff --git a/golemflavor/plot.py b/golemflavor/plot.py index caaed47..110032f 100644 --- a/golemflavor/plot.py +++ b/golemflavor/plot.py @@ -48,7 +48,8 @@ from scipy.spatial import Delaunay from golemflavor.enums import DataType, str_enum from golemflavor.enums import Likelihood, ParamTag, StatCateg, Texture from golemflavor.misc import get_units, make_dir, solve_ratio, interval -from golemflavor.fr import angles_to_u, angles_to_fr, SCALE_BOUNDARIES +from golemflavor.fr import angles_to_u, flat_angles_to_u, angles_to_fr +from golemflavor.fr import SCALE_BOUNDARIES BAYES_K = 1. # Strong degree of belief. @@ -528,7 +529,7 @@ def chainer_plot(infile, outfile, outformat, args, llh_paramset, fig_text=None, trns_ranges = np.array(ranges)[nu_index,].tolist() trns_axes_labels = np.array(axes_labels)[nu_index,].tolist() - if args.fix_mixing is not MixingScenario.NONE: + if args.fix_mixing is not Texture.NONE: trns_axes_labels += \ [r'\mid \tilde{U}_{e1} \mid' , r'\mid \tilde{U}_{e2} \mid' , r'\mid \tilde{U}_{e3} \mid' , \ r'\mid \tilde{U}_{\mu1} \mid' , r'\mid \tilde{U}_{\mu2} \mid' , r'\mid \tilde{U}_{\mu3} \mid' , \ |