diff options
Diffstat (limited to 'golemflavor')
| -rw-r--r-- | golemflavor/misc.py | 1 | ||||
| -rw-r--r-- | golemflavor/mn.py | 2 | ||||
| -rw-r--r-- | golemflavor/param.py | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/golemflavor/misc.py b/golemflavor/misc.py index 9743b1a..c3293dc 100644 --- a/golemflavor/misc.py +++ b/golemflavor/misc.py @@ -16,6 +16,7 @@ from fractions import gcd import argparse from operator import attrgetter +from functools import reduce import numpy as np diff --git a/golemflavor/mn.py b/golemflavor/mn.py index a18a1e8..b559197 100644 --- a/golemflavor/mn.py +++ b/golemflavor/mn.py @@ -31,7 +31,7 @@ def lnProb(cube, ndim, n_params, mn_paramset, llh_paramset, asimov_paramset, 'params\ncube={0}\nmn_paramset]{1}'.format(cube, mn_paramset) ) pranges = mn_paramset.ranges - for i in xrange(ndim): + for i in range(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 diff --git a/golemflavor/param.py b/golemflavor/param.py index 59a7c59..4de5a7b 100644 --- a/golemflavor/param.py +++ b/golemflavor/param.py @@ -8,6 +8,7 @@ Param class and functions for the BSM flavor ratio analysis """ from __future__ import absolute_import, division +from six import string_types import sys @@ -121,7 +122,7 @@ class ParamSet(Sequence): def __getitem__(self, i): if isinstance(i, int): return self._params[i] - elif isinstance(i, basestring): + elif isinstance(i, string_types): return self._by_name[i] def __getattr__(self, attr): |