diff options
| author | shivesh <s.p.mandalia@qmul.ac.uk> | 2019-04-10 17:24:55 -0500 |
|---|---|---|
| committer | shivesh <s.p.mandalia@qmul.ac.uk> | 2019-04-10 17:24:55 -0500 |
| commit | 0c961ab5ceacce96d09032c3594e421a6dacbf85 (patch) | |
| tree | 19b5820e70501909b8fba17436a74b8f9cbb64d1 /utils | |
| parent | 32c333652da8beb1758d8852d8b67d4eff78b657 (diff) | |
| download | GolemFlavor-0c961ab5ceacce96d09032c3594e421a6dacbf85.tar.gz GolemFlavor-0c961ab5ceacce96d09032c3594e421a6dacbf85.zip | |
fix bugs
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/llh.py | 4 | ||||
| -rw-r--r-- | utils/misc.py | 4 | ||||
| -rw-r--r-- | utils/mn.py | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/utils/llh.py b/utils/llh.py index 93587b9..d80e374 100644 --- a/utils/llh.py +++ b/utils/llh.py @@ -17,7 +17,7 @@ from scipy.stats import multivariate_normal, truncnorm from utils import fr as fr_utils from utils import gf as gf_utils -from utils.enums import Likelihood, ParamTag, PriorsCateg +from utils.enums import Likelihood, ParamTag, PriorsCateg, StatCateg from utils.misc import enum_parse, gen_identifier, parse_bool @@ -37,7 +37,7 @@ def multi_gaussian(fr, fr_bf, sigma, offset=-320): def llh_argparse(parser): parser.add_argument( '--stat-method', default='bayesian', - type=partial(misc_utils.enum_parse, c=StatCateg), choices=StatCateg, + type=partial(enum_parse, c=StatCateg), choices=StatCateg, help='Statistical method to employ' ) diff --git a/utils/misc.py b/utils/misc.py index 36d5330..abef78a 100644 --- a/utils/misc.py +++ b/utils/misc.py @@ -20,7 +20,7 @@ from operator import attrgetter import numpy as np from utils.enums import str_enum -from utils.enums import Likelihood, Texture +from utils.enums import DataType, Likelihood, Texture class SortingHelpFormatter(argparse.HelpFormatter): @@ -44,7 +44,7 @@ def gen_identifier(args): f += '_sfr_' + solve_ratio(args.source_ratio) if args.data in [DataType.ASIMOV, DataType.REALISATION]: f += '_mfr_' + solve_ratio(args.injected_ratio) - if args.Texture is not Texture.NONE: + if args.texture is not Texture.NONE: f += '_{0}'.format(str_enum(args.texture)) return f diff --git a/utils/mn.py b/utils/mn.py index c60d316..f7d5610 100644 --- a/utils/mn.py +++ b/utils/mn.py @@ -67,7 +67,6 @@ def mn_evidence(mn_paramset, llh_paramset, asimov_paramset, args, for n in mn_paramset.names: llh_paramset[n].value = mn_paramset[n].value - print 'llh_paramset', llh_paramset lnProbEval = partial( lnProb, |