From 08b7980611d47aa90dc50a18bc02976e670ab720 Mon Sep 17 00:00:00 2001 From: Shivesh Mandalia Date: Fri, 28 Feb 2020 18:50:52 +0000 Subject: rename utils to golemflavor everywhere --- golemflavor/fr.py | 4 ++-- golemflavor/gf.py | 6 +++--- golemflavor/llh.py | 8 ++++---- golemflavor/mcmc.py | 4 ++-- golemflavor/misc.py | 4 ++-- golemflavor/mn.py | 4 ++-- golemflavor/param.py | 4 ++-- golemflavor/plot.py | 8 ++++---- 8 files changed, 21 insertions(+), 21 deletions(-) (limited to 'golemflavor') diff --git a/golemflavor/fr.py b/golemflavor/fr.py index bf0fb56..67726ab 100644 --- a/golemflavor/fr.py +++ b/golemflavor/fr.py @@ -13,8 +13,8 @@ from functools import partial import numpy as np -from utils.enums import ParamTag, Texture -from utils.misc import enum_parse, parse_bool +from golemflavor.enums import ParamTag, Texture +from golemflavor.misc import enum_parse, parse_bool import mpmath as mp mp.mp.dps = 100 # Computation precision diff --git a/golemflavor/gf.py b/golemflavor/gf.py index de21cc5..b3249e1 100644 --- a/golemflavor/gf.py +++ b/golemflavor/gf.py @@ -19,9 +19,9 @@ except: print 'Running without GolemFit' pass -from utils.enums import DataType, Likelihood, SteeringCateg -from utils.misc import enum_parse, parse_bool, thread_factors -from utils.param import ParamSet +from golemflavor.enums import DataType, Likelihood, SteeringCateg +from golemflavor.misc import enum_parse, parse_bool, thread_factors +from golemflavor.param import ParamSet FITTER = None diff --git a/golemflavor/llh.py b/golemflavor/llh.py index 5a0eea7..b48bf4f 100644 --- a/golemflavor/llh.py +++ b/golemflavor/llh.py @@ -16,10 +16,10 @@ import numpy as np import scipy 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, StatCateg -from utils.misc import enum_parse, gen_identifier, parse_bool +from golemflavor import fr as fr_utils +from golemflavor import gf as gf_utils +from golemflavor.enums import Likelihood, ParamTag, PriorsCateg, StatCateg +from golemflavor.misc import enum_parse, gen_identifier, parse_bool def GaussianBoundedRV(loc=0., sigma=1., lower=-np.inf, upper=np.inf): diff --git a/golemflavor/mcmc.py b/golemflavor/mcmc.py index 49e5022..14006fa 100644 --- a/golemflavor/mcmc.py +++ b/golemflavor/mcmc.py @@ -16,8 +16,8 @@ import tqdm import numpy as np -from utils.enums import MCMCSeedType -from utils.misc import enum_parse, make_dir, parse_bool +from golemflavor.enums import MCMCSeedType +from golemflavor.misc import enum_parse, make_dir, parse_bool def mcmc(p0, ln_prob, ndim, nwalkers, burnin, nsteps, args, threads=1): diff --git a/golemflavor/misc.py b/golemflavor/misc.py index 630aaf6..8899323 100644 --- a/golemflavor/misc.py +++ b/golemflavor/misc.py @@ -19,8 +19,8 @@ from operator import attrgetter import numpy as np -from utils.enums import str_enum -from utils.enums import DataType, Likelihood, Texture +from golemflavor.enums import str_enum +from golemflavor.enums import DataType, Likelihood, Texture class SortingHelpFormatter(argparse.HelpFormatter): diff --git a/golemflavor/mn.py b/golemflavor/mn.py index e3a4a09..66d456f 100644 --- a/golemflavor/mn.py +++ b/golemflavor/mn.py @@ -15,8 +15,8 @@ import numpy as np from pymultinest import analyse, run -from utils import llh as llh_utils -from utils.misc import gen_identifier, make_dir, parse_bool, solve_ratio +from golemflavor import llh as llh_utils +from golemflavor.misc import gen_identifier, make_dir, parse_bool, solve_ratio def CubePrior(cube, ndim, n_params): diff --git a/golemflavor/param.py b/golemflavor/param.py index 2378758..941f265 100644 --- a/golemflavor/param.py +++ b/golemflavor/param.py @@ -16,8 +16,8 @@ from copy import deepcopy import numpy as np -from utils.fr import fr_to_angles -from utils.enums import DataType, Likelihood, ParamTag, PriorsCateg +from golemflavor.fr import fr_to_angles +from golemflavor.enums import DataType, Likelihood, ParamTag, PriorsCateg class Param(object): diff --git a/golemflavor/plot.py b/golemflavor/plot.py index d19a52e..c91f70b 100644 --- a/golemflavor/plot.py +++ b/golemflavor/plot.py @@ -45,10 +45,10 @@ import shapely.geometry as geometry from shapely.ops import cascaded_union, polygonize from scipy.spatial import Delaunay -from utils.enums import DataType, str_enum -from utils.enums import Likelihood, ParamTag, StatCateg, Texture -from utils.misc import get_units, make_dir, solve_ratio, interval -from utils.fr import angles_to_u, angles_to_fr, SCALE_BOUNDARIES +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 BAYES_K = 1. # Strong degree of belief. -- cgit v1.2.3