Skip to content

ftype and format for range #944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JanWeldert wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ftype and format for range #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pisa/core/param.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
from pisa.utils.comparisons import FTYPE_PREC
from pisa.utils.callable import Funct
from pisa.utils.resources import find_resource
from pisa.utils.format import format_num

__all__ = [
'Param',
Expand Down Expand Up @@ -893,7 +894,7 @@ def tabulate(self, tablefmt="plain"):
table.append([p.name, p.value, p.nominal_value, p.range, p.prior, p.units, p.is_fixed])
else:
if p.range is not None:
range_fmt = [r.m for r in p.range]
range_fmt = [float(format_num(r.m, sigfigs=6)) for r in p.range]
else:
range_fmt = None
if p.prior is not None:
Expand Down
4 changes: 2 additions & 2 deletions pisa/utils/config_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
import numpy as np
from uncertainties import ufloat, ufloat_fromstr

from pisa import ureg
from pisa import ureg, FTYPE
from pisa.utils.fileio import from_file
from pisa.utils.format import split
from pisa.utils.hash import hash_obj
Expand Down Expand Up @@ -511,7 +511,7 @@ def parse_param(config, section, selector, fullname, pname, value):
if 'sigma' in range_:
sigma = value.s * value.units # pylint: disable=unused-variable
range_ = range_.replace('[', 'np.array([')
range_ = range_.replace(']', '])')
range_ = range_.replace(']', '], dtype=FTYPE)')
# Strip out uncertainties from value itself (as we will rely on the
# prior from here on out)
kwargs['range'] = eval(range_).to(value.units) # pylint: disable=eval-used
Expand Down