diff options
| -rw-r--r-- | golemflavor/fr.py | 4 | ||||
| -rw-r--r-- | golemflavor/gf.py | 6 | ||||
| -rw-r--r-- | golemflavor/llh.py | 8 | ||||
| -rw-r--r-- | golemflavor/mcmc.py | 4 | ||||
| -rw-r--r-- | golemflavor/misc.py | 4 | ||||
| -rw-r--r-- | golemflavor/mn.py | 4 | ||||
| -rw-r--r-- | golemflavor/param.py | 4 | ||||
| -rw-r--r-- | golemflavor/plot.py | 8 | ||||
| -rw-r--r-- | scripts/__init__.py | 0 | ||||
| -rwxr-xr-x | scripts/contour.py | 20 | ||||
| -rwxr-xr-x | scripts/fr.py | 18 | ||||
| -rwxr-xr-x | scripts/mc_texture.py | 14 | ||||
| -rwxr-xr-x | scripts/mc_unitary.py | 14 | ||||
| -rwxr-xr-x | scripts/mc_x.py | 14 | ||||
| -rwxr-xr-x | scripts/plot_sens.py | 14 | ||||
| -rwxr-xr-x | scripts/sens.py | 18 | ||||
| -rwxr-xr-x | setup.py | 20 |
17 files changed, 86 insertions, 88 deletions
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. diff --git a/scripts/__init__.py b/scripts/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/scripts/__init__.py +++ /dev/null diff --git a/scripts/contour.py b/scripts/contour.py index db9a933..6f08617 100755 --- a/scripts/contour.py +++ b/scripts/contour.py @@ -17,16 +17,16 @@ from functools import partial import numpy as np -from utils import fr as fr_utils -from utils import gf as gf_utils -from utils import llh as llh_utils -from utils import misc as misc_utils -from utils import mcmc as mcmc_utils -from utils import plot as plot_utils -from utils.enums import str_enum -from utils.enums import DataType, Likelihood, MCMCSeedType, ParamTag -from utils.enums import PriorsCateg -from utils.param import Param, ParamSet +from golemflavor import fr as fr_utils +from golemflavor import gf as gf_utils +from golemflavor import llh as llh_utils +from golemflavor import misc as misc_utils +from golemflavor import mcmc as mcmc_utils +from golemflavor import plot as plot_utils +from golemflavor.enums import str_enum +from golemflavor.enums import DataType, Likelihood, MCMCSeedType, ParamTag +from golemflavor.enums import PriorsCateg +from golemflavor.param import Param, ParamSet def define_nuisance(): diff --git a/scripts/fr.py b/scripts/fr.py index 9802b55..e32d7d0 100755 --- a/scripts/fr.py +++ b/scripts/fr.py @@ -16,15 +16,15 @@ from functools import partial import numpy as np -from utils import fr as fr_utils -from utils import gf as gf_utils -from utils import llh as llh_utils -from utils import mcmc as mcmc_utils -from utils import misc as misc_utils -from utils import plot as plot_utils -from utils.enums import DataType, Likelihood, MCMCSeedType -from utils.enums import ParamTag, PriorsCateg, Texture -from utils.param import Param, ParamSet +from golemflavor import fr as fr_utils +from golemflavor import gf as gf_utils +from golemflavor import llh as llh_utils +from golemflavor import mcmc as mcmc_utils +from golemflavor import misc as misc_utils +from golemflavor import plot as plot_utils +from golemflavor.enums import DataType, Likelihood, MCMCSeedType +from golemflavor.enums import ParamTag, PriorsCateg, Texture +from golemflavor.param import Param, ParamSet def define_nuisance(): diff --git a/scripts/mc_texture.py b/scripts/mc_texture.py index b61855e..2813dc0 100755 --- a/scripts/mc_texture.py +++ b/scripts/mc_texture.py @@ -16,13 +16,13 @@ from functools import partial import numpy as np -from utils import fr as fr_utils -from utils import llh as llh_utils -from utils import mcmc as mcmc_utils -from utils import misc as misc_utils -from utils import plot as plot_utils -from utils.enums import MCMCSeedType, ParamTag, PriorsCateg, Texture -from utils.param import Param, ParamSet +from golemflavor import fr as fr_utils +from golemflavor import llh as llh_utils +from golemflavor import mcmc as mcmc_utils +from golemflavor import misc as misc_utils +from golemflavor import plot as plot_utils +from golemflavor.enums import MCMCSeedType, ParamTag, PriorsCateg, Texture +from golemflavor.param import Param, ParamSet def define_nuisance(): diff --git a/scripts/mc_unitary.py b/scripts/mc_unitary.py index 12a2db2..bbd5a28 100755 --- a/scripts/mc_unitary.py +++ b/scripts/mc_unitary.py @@ -16,13 +16,13 @@ from functools import partial import numpy as np -from utils import fr as fr_utils -from utils import llh as llh_utils -from utils import mcmc as mcmc_utils -from utils import misc as misc_utils -from utils import plot as plot_utils -from utils.enums import MCMCSeedType, ParamTag, PriorsCateg -from utils.param import Param, ParamSet +from golemflavor import fr as fr_utils +from golemflavor import llh as llh_utils +from golemflavor import mcmc as mcmc_utils +from golemflavor import misc as misc_utils +from golemflavor import plot as plot_utils +from golemflavor.enums import MCMCSeedType, ParamTag, PriorsCateg +from golemflavor.param import Param, ParamSet def define_nuisance(): diff --git a/scripts/mc_x.py b/scripts/mc_x.py index 8c5e386..04319c4 100755 --- a/scripts/mc_x.py +++ b/scripts/mc_x.py @@ -16,13 +16,13 @@ from functools import partial import numpy as np -from utils import fr as fr_utils -from utils import llh as llh_utils -from utils import mcmc as mcmc_utils -from utils import misc as misc_utils -from utils import plot as plot_utils -from utils.enums import MCMCSeedType, ParamTag, PriorsCateg -from utils.param import Param, ParamSet +from golemflavor import fr as fr_utils +from golemflavor import llh as llh_utils +from golemflavor import mcmc as mcmc_utils +from golemflavor import misc as misc_utils +from golemflavor import plot as plot_utils +from golemflavor.enums import MCMCSeedType, ParamTag, PriorsCateg +from golemflavor.param import Param, ParamSet def define_nuisance(): diff --git a/scripts/plot_sens.py b/scripts/plot_sens.py index bd8c72b..18e0c03 100755 --- a/scripts/plot_sens.py +++ b/scripts/plot_sens.py @@ -18,13 +18,13 @@ from copy import deepcopy import numpy as np import numpy.ma as ma -from utils import fr as fr_utils -from utils import llh as llh_utils -from utils import plot as plot_utils -from utils.enums import DataType, Texture -from utils.misc import enum_parse, parse_bool, parse_enum, print_args -from utils.misc import gen_identifier, SortingHelpFormatter -from utils.param import Param, ParamSet +from golemflavor import fr as fr_utils +from golemflavor import llh as llh_utils +from golemflavor import plot as plot_utils +from golemflavor.enums import DataType, Texture +from golemflavor.misc import enum_parse, parse_bool, parse_enum, print_args +from golemflavor.misc import gen_identifier, SortingHelpFormatter +from golemflavor.param import Param, ParamSet MASK_X = (0.3, 0.7) diff --git a/scripts/sens.py b/scripts/sens.py index 963a33b..6368159 100755 --- a/scripts/sens.py +++ b/scripts/sens.py @@ -20,15 +20,15 @@ import numpy as np import numpy.ma as ma from scipy.optimize import minimize -from utils import fr as fr_utils -from utils import gf as gf_utils -from utils import llh as llh_utils -from utils import misc as misc_utils -from utils import mn as mn_utils -from utils.enums import str_enum -from utils.enums import DataType, Likelihood, ParamTag -from utils.enums import PriorsCateg, StatCateg, Texture -from utils.param import Param, ParamSet +from golemflavor import fr as fr_utils +from golemflavor import gf as gf_utils +from golemflavor import llh as llh_utils +from golemflavor import misc as misc_utils +from golemflavor import mn as mn_utils +from golemflavor.enums import str_enum +from golemflavor.enums import DataType, Likelihood, ParamTag +from golemflavor.enums import PriorsCateg, StatCateg, Texture +from golemflavor.param import Param, ParamSet def define_nuisance(): @@ -58,15 +58,13 @@ setup( packages=find_packages(), install_requires=INSTALL_REQUIRES, setup_requires=['setuptools>=38.6.0'], - entry_points={ - 'console_scripts': [ - 'contour=scripts.contour::main', - 'fr=scripts.fr::main', - 'mc_texture=scripts.mc_texture::main', - 'mc_unitary=scripts.mc_unitary::main', - 'mc_x=scripts.mc_x::main', - 'plot_sens=scripts.plot_sens::main', - 'sens=scripts.sens::main' - ] - } + scripts=[ + 'scripts/contour.py', + 'scripts/fr.py', + 'scripts/mc_texture.py', + 'scripts/mc_unitary.py', + 'scripts/mc_x.py', + 'scripts/plot_sens.py', + 'scripts/sens.py' + ] ) |