Sat 13 Apr 14:17:02 CDT 2019

6 files changed, 10 insertions, 21 deletions

diff --git a/utils/gf.py b/utils/gf.py
index b0071f5..d0c62ca 100644
--- a/utils/gf.py
+++ b/utils/gf.py
@@ -126,7 +126,6 @@ def setup_fitter(args, asimov_paramset):
 
 
 def get_llh(params):
-    # print 'params', params
     fitparams = gf.FitParameters(gf.sampleTag.MagicTau)
     for parm in params:
         fitparams.__setattr__(parm.name, float(parm.value))
diff --git a/utils/llh.py b/utils/llh.py
index d80e374..9821695 100644
--- a/utils/llh.py
+++ b/utils/llh.py
@@ -9,6 +9,7 @@ Likelihood functions for the BSM flavour ratio analysis
 
 from __future__ import absolute_import, division
 
+from copy import deepcopy
 from functools import partial
 
 import numpy as np
@@ -144,10 +145,12 @@ def triangle_llh(theta, args, asimov_paramset, llh_paramset):
 
 
 def ln_prob(theta, args, asimov_paramset, llh_paramset):
-    lp = lnprior(theta, paramset=llh_paramset)
+    dc_asimov_paramset = deepcopy(asimov_paramset)
+    dc_llh_paramset = deepcopy(llh_paramset)
+    lp = lnprior(theta, paramset=dc_llh_paramset)
     if not np.isfinite(lp):
         return -np.inf
     return lp + triangle_llh(
-        theta, args=args, asimov_paramset=asimov_paramset,
-        llh_paramset=llh_paramset
+        theta, args=args, asimov_paramset=dc_asimov_paramset,
+        llh_paramset=dc_llh_paramset
     )
diff --git a/utils/mcmc.py b/utils/mcmc.py
index e5bd8da..a807cb7 100644
--- a/utils/mcmc.py
+++ b/utils/mcmc.py
@@ -73,7 +73,7 @@ def mcmc_argparse(parser):
         help='Type of distrbution to make the initial MCMC seed'
     )
     parser.add_argument(
-        '--plot-angles', type=parse_bool, default='True',
+        '--plot-angles', type=parse_bool, default='False',
         help='Plot MCMC triangle in the angles space'
     )
     parser.add_argument(
diff --git a/utils/misc.py b/utils/misc.py
index e5fedb9..630aaf6 100644
--- a/utils/misc.py
+++ b/utils/misc.py
@@ -120,6 +120,7 @@ def make_dir(outfile):
         else:
             raise
 
+
 def remove_option(parser, arg):
     for action in parser._actions:
         if (vars(action)['option_strings']
diff --git a/utils/mn.py b/utils/mn.py
index 563b3c8..335df96 100644
--- a/utils/mn.py
+++ b/utils/mn.py
@@ -60,8 +60,7 @@ def mn_argparse(parser):
     )
 
 
-def mn_evidence(mn_paramset, llh_paramset, asimov_paramset, args,
-                identifier='mn'):
+def mn_evidence(mn_paramset, llh_paramset, asimov_paramset, args, prefix='mn'):
     """Run the MultiNest algorithm to calculate the evidence."""
     n_params = len(mn_paramset)
 
@@ -76,12 +75,6 @@ def mn_evidence(mn_paramset, llh_paramset, asimov_paramset, args,
         args            = args,
     )
 
-    llh = '{0}'.format(args.likelihood).split('.')[1]
-    data = '{0}'.format(args.data).split('.')[1]
-    src_string = solve_ratio(args.source_ratio)
-    prefix = args.mn_output + '/DIM{0}/{1}/{2}/s{3}/{4}'.format(
-        args.dimension, data, llh, src_string, identifier
-    )
     make_dir(prefix)
     print 'Running evidence calculation for {0}'.format(prefix)
     run(
diff --git a/utils/param.py b/utils/param.py
index 558018e..2378758 100644
--- a/utils/param.py
+++ b/utils/param.py
@@ -125,14 +125,7 @@ class ParamSet(Sequence):
             return self._by_name[i]
 
     def __getattr__(self, attr):
-        try:
-            return super(ParamSet, self).__getattribute__(attr)
-        except AttributeError:
-            t, v, tb = sys.exc_info()
-            try:
-                return self[attr]
-            except KeyError:
-                raise t, v, tb
+        return super(ParamSet, self).__getattribute__(attr)
 
     def __iter__(self):
         return iter(self._params)