diff options
| -rw-r--r-- | utils/mn.py | 7 | ||||
| -rw-r--r-- | utils/param.py | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/utils/mn.py b/utils/mn.py index 48ccc26..6582c80 100644 --- a/utils/mn.py +++ b/utils/mn.py @@ -30,13 +30,12 @@ def lnProb(cube, ndim, n_params, mn_paramset, llh_paramset, asimov_paramset, 'Length of MultiNest scan paramset is not the same as the input ' 'params\ncube={0}\nmn_paramset]{1}'.format(cube, mn_paramset) ) - pranges = mn_paramset.seeds + pranges = mn_paramset.ranges for i in xrange(ndim): mn_paramset[i].value = (pranges[i][1]-pranges[i][0])*cube[i] + pranges[i][0] for pm in mn_paramset.names: llh_paramset[pm].value = mn_paramset[pm].value theta = llh_paramset.values - # print 'llh_paramset', llh_paramset llh = llh_utils.ln_prob( theta=theta, args=args, @@ -44,7 +43,6 @@ def lnProb(cube, ndim, n_params, mn_paramset, llh_paramset, asimov_paramset, llh_paramset=llh_paramset, fitter=fitter ) - # print 'llh', llh return llh @@ -80,9 +78,6 @@ def mn_evidence(mn_paramset, llh_paramset, asimov_paramset, args, fitter, fitter = fitter ) - # prefix = './mnrun/DIM{0}/{1}_{2}_{3:>010}_'.format( - # args.dimension, args.likelihood, gen_identifier(args), np.random.randint(0, 2**30) - # ) llh = '{0}'.format(args.likelihood).split('.')[1] data = '{0}'.format(args.data).split('.')[1] sr1, sr2, sr3 = solve_ratio(args.source_ratio) diff --git a/utils/param.py b/utils/param.py index 8c17541..572b65a 100644 --- a/utils/param.py +++ b/utils/param.py @@ -212,6 +212,14 @@ class ParamSet(Sequence): rm_paramset.append(parm) return ParamSet(rm_paramset) + def extend(self, p): + param_sequence = self.params + if isinstance(p, Param): + param_sequence.append(p) + elif isinstance(p, ParamSet): + param_sequence.extend(p.params) + return ParamSet(param_sequence) + def get_paramsets(args, nuisance_paramset): """Make the paramsets for generating the Asmimov MC sample and also running @@ -269,8 +277,8 @@ def get_paramsets(args, nuisance_paramset): 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) + 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=[-1., 1.], std=0.2, tex=r'cos(2\psi)', tag=tag) ]) llh_paramset = ParamSet(llh_paramset) return asimov_paramset, llh_paramset |