Sat Apr 28 17:01:52 CDT 2018

6 files changed, 9 insertions, 11 deletions

diff --git a/utils/fr.py b/utils/fr.py
index a82e081..b2a1274 100644
--- a/utils/fr.py
+++ b/utils/fr.py
@@ -9,7 +9,6 @@ Useful functions for the BSM flavour ratio analysis
 
 from __future__ import absolute_import, division
 
-import argparse
 from functools import partial
 
 import numpy as np
@@ -354,7 +353,7 @@ def params_to_BSMu(theta, dim, energy, mass_eigenvalues=MASS_EIGENVALUES,
     if np.shape(sm_u) != (3, 3):
         raise ValueError(
             'Input matrix should be a square and dimension 3, '
-            'got\n{0}'.format(ham)
+            'got\n{0}'.format(sm_u)
         )
 
     if fix_mixing and fix_mixing_almost:
diff --git a/utils/gf.py b/utils/gf.py
index 17ac029..0770401 100644
--- a/utils/gf.py
+++ b/utils/gf.py
@@ -9,9 +9,10 @@ Useful GolemFit wrappers for the BSM flavour ratio analysis
 
 from __future__ import absolute_import, division
 
-import socket
 from functools import partial
 
+import numpy as np
+
 import GolemFitPy as gf
 
 from utils.enums import DataType, SteeringCateg
diff --git a/utils/likelihood.py b/utils/likelihood.py
index 6387a1e..9629b65 100644
--- a/utils/likelihood.py
+++ b/utils/likelihood.py
@@ -14,8 +14,6 @@ from functools import partial
 import numpy as np
 from scipy.stats import multivariate_normal, rv_continuous
 
-import GolemFitPy as gf
-
 from utils import fr as fr_utils
 from utils import gf as gf_utils
 from utils.enums import EnergyDependance, Likelihood, ParamTag, PriorsCateg
@@ -89,6 +87,10 @@ def triangle_llh(theta, args, asimov_paramset, llh_paramset, fitter):
     if args.energy_dependance is EnergyDependance.SPECTRAL:
         bin_centers = np.sqrt(args.binning[:-1]*args.binning[1:])
         bin_width = np.abs(np.diff(args.binning))
+        if args.likelihood in [Likelihood.GOLEMFIT, Likelihood.GF_FREQ]:
+            if 'astroDeltaGamma' in hypo_paramset.names:
+                args.spectral_index = hypo_paramset['astroDeltaGamma'].value
+                print 'args.spectral_index', args.spectral_index
 
     if args.fix_source_ratio:
         if args.energy_dependance is EnergyDependance.MONO:
diff --git a/utils/misc.py b/utils/misc.py
index 970c693..cad03bc 100644
--- a/utils/misc.py
+++ b/utils/misc.py
@@ -14,7 +14,6 @@ import errno
 import multiprocessing
 
 import argparse
-from collections import Sequence
 from operator import attrgetter
 
 import numpy as np
diff --git a/utils/multinest.py b/utils/multinest.py
index 005a43a..9dd0742 100644
--- a/utils/multinest.py
+++ b/utils/multinest.py
@@ -16,7 +16,7 @@ import numpy as np
 from pymultinest import analyse, run
 
 from utils import likelihood
-from utils.misc import gen_outfile_name, make_dir, parse_bool
+from utils.misc import gen_outfile_name, make_dir
 
 
 def CubePrior(cube, ndim, n_params):
diff --git a/utils/plot.py b/utils/plot.py
index 0c431cf..0160da4 100644
--- a/utils/plot.py
+++ b/utils/plot.py
@@ -10,7 +10,6 @@ Plotting functions for the BSM flavour ratio analysis
 from __future__ import absolute_import, division
 
 import os
-import argparse
 
 import numpy as np
 import matplotlib as mpl
@@ -19,9 +18,7 @@ from matplotlib import rc
 from matplotlib import pyplot as plt
 from matplotlib.offsetbox import AnchoredText
 
-import getdist
-from getdist import plots
-from getdist import mcsamples
+from getdist import plots, mcsamples
 
 from utils import misc as misc_utils
 from utils.enums import EnergyDependance, Likelihood, ParamTag, StatCateg