diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/fr.py | 7 | ||||
| -rw-r--r-- | utils/llh.py (renamed from utils/likelihood.py) | 0 | ||||
| -rw-r--r-- | utils/mn.py (renamed from utils/multinest.py) | 4 | ||||
| -rw-r--r-- | utils/param.py | 68 |
4 files changed, 43 insertions, 36 deletions
diff --git a/utils/fr.py b/utils/fr.py index d899d42..7c05f85 100644 --- a/utils/fr.py +++ b/utils/fr.py @@ -347,8 +347,11 @@ def fr_to_angles(ratios): cphi2 = fr2 sphi2 = (1.0 - cphi2) - spsi2 = fr1 / sphi2 - cpsi2 = fr0 / sphi2 + if sphi2 == 0.: + return (0., 0.) + else: + spsi2 = fr1 / sphi2 + cpsi2 = fr0 / sphi2 sphi4 = sphi2**2 c2psi = COS(ACOS(SQRT(cpsi2))*2) diff --git a/utils/likelihood.py b/utils/llh.py index f4404c4..f4404c4 100644 --- a/utils/likelihood.py +++ b/utils/llh.py diff --git a/utils/multinest.py b/utils/mn.py index fdd87cd..48ccc26 100644 --- a/utils/multinest.py +++ b/utils/mn.py @@ -15,7 +15,7 @@ import numpy as np from pymultinest import analyse, run -from utils import likelihood +from utils import llh as llh_utils from utils.misc import gen_identifier, make_dir, solve_ratio @@ -37,7 +37,7 @@ def lnProb(cube, ndim, n_params, mn_paramset, llh_paramset, asimov_paramset, llh_paramset[pm].value = mn_paramset[pm].value theta = llh_paramset.values # print 'llh_paramset', llh_paramset - llh = likelihood.ln_prob( + llh = llh_utils.ln_prob( theta=theta, args=args, asimov_paramset=asimov_paramset, diff --git a/utils/param.py b/utils/param.py index 62f59b1..8c17541 100644 --- a/utils/param.py +++ b/utils/param.py @@ -230,43 +230,47 @@ def get_paramsets(args, nuisance_paramset): for parm in llh_paramset: parm.value = args.__getattribute__(parm.name) tag = ParamTag.BESTFIT - flavour_angles = fr_to_angles(args.measured_ratio) + try: + flavour_angles = fr_to_angles(args.measured_ratio) + except: + flavour_angles = fr_to_angles(args.injected_ratio) asimov_paramset.extend([ Param(name='astroFlavorAngle1', value=flavour_angles[0], ranges=[0., 1.], std=0.2, tag=tag), Param(name='astroFlavorAngle2', value=flavour_angles[1], ranges=[-1., 1.], std=0.2, tag=tag), ]) asimov_paramset = ParamSet(asimov_paramset) - if args.fix_mixing is MixingScenario.NONE and not args.fix_mixing_almost: - tag = ParamTag.MMANGLES - llh_paramset.extend([ - Param(name='np_s_12^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{12}^2', tag=tag), - Param(name='np_c_13^4', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{c}_{13}^4', tag=tag), - Param(name='np_s_23^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{23}^2', tag=tag), - Param(name='np_dcp', value=np.pi, ranges=[0., 2*np.pi], std=0.2, tex=r'\tilde{\delta_{CP}}', tag=tag) - ]) - if args.fix_mixing_almost: - tag = ParamTag.MMANGLES - llh_paramset.extend([ - Param(name='np_s_23^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{23}^4', tag=tag) - ]) - if not args.fix_scale: - tag = ParamTag.SCALE - if hasattr(args, 'dimension'): - llh_paramset.append( - Param(name='logLam', value=np.log10(args.scale), ranges=np.log10(args.scale_region), std=3, - tex=r'{\rm log}_{10}\left (\Lambda^{-1}'+get_units(args.dimension)+r'\right )', tag=tag) - ) - elif hasattr(args, 'dimensions'): - llh_paramset.append( - Param(name='logLam', value=np.log10(args.scale), ranges=np.log10(args.scale_region), std=3, - tex=r'{\rm log}_{10}\left (\Lambda^{-1} / GeV^{-d+4}\right )', tag=tag) - ) - if not args.fix_source_ratio: - tag = ParamTag.SRCANGLES - llh_paramset.extend([ - Param(name='s_phi4', value=0.5, ranges=[0., 1.], std=0.2, tex=r'sin^4(\phi)', tag=tag), - Param(name='c_2psi', value=0.5, ranges=[0., 1.], std=0.2, tex=r'cos(2\psi)', tag=tag) - ]) + if hasattr(args, 'fix_source_ratio'): + if args.fix_mixing is MixingScenario.NONE and not args.fix_mixing_almost: + tag = ParamTag.MMANGLES + llh_paramset.extend([ + Param(name='np_s_12^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{12}^2', tag=tag), + Param(name='np_c_13^4', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{c}_{13}^4', tag=tag), + Param(name='np_s_23^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{23}^2', tag=tag), + Param(name='np_dcp', value=np.pi, ranges=[0., 2*np.pi], std=0.2, tex=r'\tilde{\delta_{CP}}', tag=tag) + ]) + if args.fix_mixing_almost: + tag = ParamTag.MMANGLES + llh_paramset.extend([ + Param(name='np_s_23^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{23}^4', tag=tag) + ]) + if not args.fix_scale: + tag = ParamTag.SCALE + if hasattr(args, 'dimension'): + llh_paramset.append( + Param(name='logLam', value=np.log10(args.scale), ranges=np.log10(args.scale_region), std=3, + tex=r'{\rm log}_{10}\left (\Lambda^{-1}'+get_units(args.dimension)+r'\right )', tag=tag) + ) + elif hasattr(args, 'dimensions'): + llh_paramset.append( + Param(name='logLam', value=np.log10(args.scale), ranges=np.log10(args.scale_region), std=3, + tex=r'{\rm log}_{10}\left (\Lambda^{-1} / GeV^{-d+4}\right )', tag=tag) + ) + if not args.fix_source_ratio: + tag = ParamTag.SRCANGLES + llh_paramset.extend([ + Param(name='s_phi4', value=0.5, ranges=[0., 1.], std=0.2, tex=r'sin^4(\phi)', tag=tag), + Param(name='c_2psi', value=0.5, ranges=[0., 1.], std=0.2, tex=r'cos(2\psi)', tag=tag) + ]) llh_paramset = ParamSet(llh_paramset) return asimov_paramset, llh_paramset |