Add example notebooks to show how to use GolemFlavor

7 files changed, 11 insertions, 15 deletions

diff --git a/scripts/contour.py b/scripts/contour.py
index 4785117..162b465 100644
--- a/scripts/contour.py
+++ b/scripts/contour.py
@@ -94,7 +94,7 @@ def nuisance_argparse(parser):
 def process_args(args):
     """Process the input args."""
     if args.data is not DataType.REAL:
-        args.injected_ratio = fr_utils.normalise_fr(args.injected_ratio)
+        args.injected_ratio = fr_utils.normalize_fr(args.injected_ratio)
 
     args.likelihood = Likelihood.GOLEMFIT
 
@@ -224,7 +224,6 @@ def main():
             nwalkers = args.nwalkers,
             burnin   = args.burnin,
             nsteps   = args.nsteps,
-            args     = args,
             threads  = args.mcmc_threads
         )
         mcmc_utils.save_chains(samples, outfile)
diff --git a/scripts/fr.py b/scripts/fr.py
index c8c96e3..a63948a 100644
--- a/scripts/fr.py
+++ b/scripts/fr.py
@@ -115,9 +115,9 @@ def nuisance_argparse(parser):
 
 def process_args(args):
     """Process the input args."""
-    args.source_ratio = fr_utils.normalise_fr(args.source_ratio)
+    args.source_ratio = fr_utils.normalize_fr(args.source_ratio)
     if args.data is not DataType.REAL:
-        args.injected_ratio = fr_utils.normalise_fr(args.injected_ratio)
+        args.injected_ratio = fr_utils.normalize_fr(args.injected_ratio)
 
     args.binning = np.logspace(
         np.log10(args.binning[0]), np.log10(args.binning[1]), args.binning[2]+1
@@ -202,7 +202,6 @@ def main():
             nwalkers = args.nwalkers,
             burnin   = args.burnin,
             nsteps   = args.nsteps,
-            args     = args,
             threads  = args.mcmc_threads
         )
         mcmc_utils.save_chains(samples, outfile)
diff --git a/scripts/mc_texture.py b/scripts/mc_texture.py
index 0a96741..d2f38bc 100644
--- a/scripts/mc_texture.py
+++ b/scripts/mc_texture.py
@@ -99,7 +99,7 @@ def process_args(args):
     """Process the input args."""
     if args.texture is Texture.NONE:
         raise ValueError('Must assume a BSM texture')
-    args.source_ratio = fr_utils.normalise_fr(args.source_ratio)
+    args.source_ratio = fr_utils.normalize_fr(args.source_ratio)
 
     args.binning = np.logspace(
         np.log10(args.binning[0]), np.log10(args.binning[1]), args.binning[2]+1
@@ -210,7 +210,6 @@ def main():
             nwalkers = args.nwalkers,
             burnin   = args.burnin,
             nsteps   = args.nsteps,
-            args     = args,
             threads  = args.threads
         )
 
diff --git a/scripts/mc_unitary.py b/scripts/mc_unitary.py
index 4e8598d..349ec24 100644
--- a/scripts/mc_unitary.py
+++ b/scripts/mc_unitary.py
@@ -80,7 +80,7 @@ def nuisance_argparse(parser):
 
 def process_args(args):
     """Process the input args."""
-    args.source_ratio = fr_utils.normalise_fr(args.source_ratio)
+    args.source_ratio = fr_utils.normalize_fr(args.source_ratio)
 
 
 def parse_args(args=None):
@@ -183,7 +183,6 @@ def main():
             nwalkers = args.nwalkers,
             burnin   = args.burnin,
             nsteps   = args.nsteps,
-            args     = args,
             threads  = args.threads
         )
 
diff --git a/scripts/mc_x.py b/scripts/mc_x.py
index 16c9c3d..e7c8b57 100644
--- a/scripts/mc_x.py
+++ b/scripts/mc_x.py
@@ -184,7 +184,7 @@ def main():
         )
 
         nsamples = len(samples)
-        srcs = [fr_utils.normalise_fr((x, 1-x, 0)) for x in samples.T[-1]]
+        srcs = [fr_utils.normalize_fr((x, 1-x, 0)) for x in samples.T[-1]]
         mmxs = map(fr_utils.angles_to_u, samples.T[:-1].T)
         frs = np.array(
             [fr_utils.u_to_fr(srcs[i], mmxs[i]) for i in range(nsamples)],
diff --git a/scripts/plot_sens.py b/scripts/plot_sens.py
index a7b9b28..e999728 100644
--- a/scripts/plot_sens.py
+++ b/scripts/plot_sens.py
@@ -33,7 +33,7 @@ MASK_X = (0.3, 0.7)
 def process_args(args):
     """Process the input args."""
     if args.data is not DataType.REAL:
-        args.injected_ratio = fr_utils.normalise_fr(args.injected_ratio)
+        args.injected_ratio = fr_utils.normalize_fr(args.injected_ratio)
 
     # Anon points
     anon = []
@@ -73,7 +73,7 @@ def process_args(args):
 
         srs = [args.source_ratios[3*x:3*x+3]
                for x in range(int(len(args.source_ratios)/3))]
-        args.source_ratios = map(fr_utils.normalise_fr, srs)
+        args.source_ratios = map(fr_utils.normalize_fr, srs)
     elif args.x_segments is not None:
         x_array = np.linspace(0, 1, args.x_segments)
         sources = []
@@ -275,7 +275,7 @@ def main():
                 outfile   = baseoutfile + '/hese_x_DIM{0}'.format(dim),
                 outformat = ['png', 'pdf'],
                 args      = argsc,
-                normalise = True
+                normalize = True
             )
 
     if args.plot_table:
diff --git a/scripts/sens.py b/scripts/sens.py
index 39c336d..0d564bd 100644
--- a/scripts/sens.py
+++ b/scripts/sens.py
@@ -119,9 +119,9 @@ def nuisance_argparse(parser):
 
 def process_args(args):
     """Process the input args."""
-    args.source_ratio = fr_utils.normalise_fr(args.source_ratio)
+    args.source_ratio = fr_utils.normalize_fr(args.source_ratio)
     if args.data is not DataType.REAL:
-        args.injected_ratio = fr_utils.normalise_fr(args.injected_ratio)
+        args.injected_ratio = fr_utils.normalize_fr(args.injected_ratio)
 
     args.binning = np.logspace(
         np.log10(args.binning[0]), np.log10(args.binning[1]), args.binning[2]+1