aboutsummaryrefslogtreecommitdiffstats
path: root/golemflavor
diff options
context:
space:
mode:
Diffstat (limited to 'golemflavor')
-rw-r--r--golemflavor/enums.py2
-rw-r--r--golemflavor/fr.py24
-rw-r--r--golemflavor/gf.py2
-rw-r--r--golemflavor/llh.py8
-rw-r--r--golemflavor/mcmc.py2
-rw-r--r--golemflavor/misc.py2
-rw-r--r--golemflavor/mn.py2
-rw-r--r--golemflavor/param.py2
-rw-r--r--golemflavor/plot.py20
9 files changed, 32 insertions, 32 deletions
diff --git a/golemflavor/enums.py b/golemflavor/enums.py
index e85158d..a8fb50e 100644
--- a/golemflavor/enums.py
+++ b/golemflavor/enums.py
@@ -4,7 +4,7 @@
# date : March 17, 2018
"""
-Define Enums for the BSM flavour ratio analysis
+Define Enums for the BSM flavor ratio analysis
"""
from enum import Enum
diff --git a/golemflavor/fr.py b/golemflavor/fr.py
index 9171972..6945ce4 100644
--- a/golemflavor/fr.py
+++ b/golemflavor/fr.py
@@ -4,7 +4,7 @@
# date : March 17, 2018
"""
-Useful functions for the BSM flavour ratio analysis
+Useful functions for the BSM flavor ratio analysis
"""
from __future__ import absolute_import, division, print_function
@@ -80,8 +80,8 @@ def determinant(x):
def angles_to_fr(src_angles):
- """Convert angular projection of the source flavour ratio back into the
- flavour ratio.
+ """Convert angular projection of the source flavor ratio back into the
+ flavor ratio.
Parameters
----------
@@ -90,7 +90,7 @@ def angles_to_fr(src_angles):
Returns
----------
- flavour ratios (nue, numu, nutau)
+ flavor ratios (nue, numu, nutau)
Examples
----------
@@ -238,16 +238,16 @@ def cardano_eqn(ham):
def normalise_fr(fr):
- """Normalise an input flavour combination to a flavour ratio.
+ """Normalise an input flavor combination to a flavor ratio.
Parameters
----------
fr : list, length = 3
- flavour combination
+ flavor combination
Returns
----------
- numpy ndarray flavour ratio
+ numpy ndarray flavor ratio
Examples
----------
@@ -266,7 +266,7 @@ def fr_argparse(parser):
)
parser.add_argument(
'--source-ratio', type=float, nargs=3, default=[1, 2, 0],
- help='Set the source flavour ratio for the case when you want to fix it'
+ help='Set the source flavor ratio for the case when you want to fix it'
)
parser.add_argument(
'--no-bsm', type=parse_bool, default='False',
@@ -287,7 +287,7 @@ def fr_argparse(parser):
def fr_to_angles(ratios):
- """Convert from flavour ratio into the angular projection of the flavour
+ """Convert from flavor ratio into the angular projection of the flavor
ratios.
Parameters
@@ -500,19 +500,19 @@ def test_unitarity(x, prnt=False, rse=False, epsilon=None):
def u_to_fr(source_fr, matrix):
- """Compute the observed flavour ratio assuming decoherence.
+ """Compute the observed flavor ratio assuming decoherence.
Parameters
----------
source_fr : list, length = 3
- Source flavour ratio components
+ Source flavor ratio components
matrix : numpy ndarray, dimension 3
Mixing matrix
Returns
----------
- Measured flavour ratio
+ Measured flavor ratio
Examples
----------
diff --git a/golemflavor/gf.py b/golemflavor/gf.py
index 252e706..4401428 100644
--- a/golemflavor/gf.py
+++ b/golemflavor/gf.py
@@ -4,7 +4,7 @@
# date : March 17, 2018
"""
-Useful GolemFit wrappers for the BSM flavour ratio analysis
+Useful GolemFit wrappers for the BSM flavor ratio analysis
"""
from __future__ import absolute_import, division, print_function
diff --git a/golemflavor/llh.py b/golemflavor/llh.py
index aa5d32d..14678b6 100644
--- a/golemflavor/llh.py
+++ b/golemflavor/llh.py
@@ -4,7 +4,7 @@
# date : April 04, 2018
"""
-Likelihood functions for the BSM flavour ratio analysis
+Likelihood functions for the BSM flavor ratio analysis
"""
from __future__ import absolute_import, division, print_function
@@ -87,10 +87,10 @@ def triangle_llh(theta, args, asimov_paramset, llh_paramset):
# Assigning llh_paramset values from theta happens in this function.
fr = fr_utils.flux_averaged_BSMu(theta, args, spectral_index, llh_paramset)
- flavour_angles = fr_utils.fr_to_angles(fr)
- # print('flavour_angles', map(float, flavour_angles))
+ flavor_angles = fr_utils.fr_to_angles(fr)
+ # print('flavor_angles', map(float, flavor_angles))
for idx, param in enumerate(hypo_paramset.from_tag(ParamTag.BESTFIT)):
- param.value = flavour_angles[idx]
+ param.value = flavor_angles[idx]
if args.likelihood is Likelihood.GOLEMFIT:
llh = gf_utils.get_llh(hypo_paramset)
diff --git a/golemflavor/mcmc.py b/golemflavor/mcmc.py
index 4cad6e7..a1d3e27 100644
--- a/golemflavor/mcmc.py
+++ b/golemflavor/mcmc.py
@@ -4,7 +4,7 @@
# date : March 17, 2018
"""
-Useful functions to use an MCMC for the BSM flavour ratio analysis
+Useful functions to use an MCMC for the BSM flavor ratio analysis
"""
from __future__ import absolute_import, division, print_function
diff --git a/golemflavor/misc.py b/golemflavor/misc.py
index 57fe6f7..9743b1a 100644
--- a/golemflavor/misc.py
+++ b/golemflavor/misc.py
@@ -4,7 +4,7 @@
# date : March 17, 2018
"""
-Misc functions for the BSM flavour ratio analysis
+Misc functions for the BSM flavor ratio analysis
"""
from __future__ import absolute_import, division, print_function
diff --git a/golemflavor/mn.py b/golemflavor/mn.py
index 1e6c9fc..a18a1e8 100644
--- a/golemflavor/mn.py
+++ b/golemflavor/mn.py
@@ -4,7 +4,7 @@
# date : April 19, 2018
"""
-Useful functions to use MultiNest for the BSM flavour ratio analysis
+Useful functions to use MultiNest for the BSM flavor ratio analysis
"""
from __future__ import absolute_import, division, print_function
diff --git a/golemflavor/param.py b/golemflavor/param.py
index 941f265..59a7c59 100644
--- a/golemflavor/param.py
+++ b/golemflavor/param.py
@@ -4,7 +4,7 @@
# date : April 19, 2018
"""
-Param class and functions for the BSM flavour ratio analysis
+Param class and functions for the BSM flavor ratio analysis
"""
from __future__ import absolute_import, division
diff --git a/golemflavor/plot.py b/golemflavor/plot.py
index 110032f..abc4633 100644
--- a/golemflavor/plot.py
+++ b/golemflavor/plot.py
@@ -4,7 +4,7 @@
# date : March 19, 2018
"""
-Plotting functions for the BSM flavour ratio analysis
+Plotting functions for the BSM flavor ratio analysis
"""
from __future__ import absolute_import, division, print_function
@@ -258,15 +258,15 @@ def get_tax(ax, scale, ax_labels, rot_ax_labels=False, fontsize=23):
def project(p):
- """Convert from flavour to cartesian."""
+ """Convert from flavor to cartesian."""
a, b, c = p
x = a + b/2.
y = b * np.sqrt(3)/2.
return [x, y]
-def project_toflavour(p, nbins):
- """Convert from cartesian to flavour space."""
+def project_toflavor(p, nbins):
+ """Convert from cartesian to flavor space."""
x, y = p
b = y / (np.sqrt(3)/2.)
a = x - b/2.
@@ -334,12 +334,12 @@ def alpha_shape(points, alpha):
return cascaded_union(triangles), edge_points
-def flavour_contour(frs, nbins, coverage, ax=None, smoothing=0.4,
+def flavor_contour(frs, nbins, coverage, ax=None, smoothing=0.4,
hist_smooth=0.05, plot=True, fill=False, oversample=1.,
delaunay=False, d_alpha=1.5, d_gauss=0.08, debug=False,
**kwargs):
- """Plot the flavour contour for a specified coverage."""
- # Histogram in flavour space
+ """Plot the flavor contour for a specified coverage."""
+ # Histogram in flavor space
os_nbins = nbins * oversample
H, b = np.histogramdd(
(frs[:,0], frs[:,1], frs[:,2]),
@@ -402,8 +402,8 @@ def flavour_contour(frs, nbins, coverage, ax=None, smoothing=0.4,
yi /= float(oversample)
ev_polygon = np.dstack((xi, yi))[0]
- # Remove points interpolated outside flavour triangle
- f_ev_polygon = np.array(map(lambda x: project_toflavour(x, nbins), ev_polygon))
+ # Remove points interpolated outside flavor triangle
+ f_ev_polygon = np.array(map(lambda x: project_toflavor(x, nbins), ev_polygon))
xf, yf, zf = f_ev_polygon.T
mask = np.array((xf < 0) | (yf < 0) | (zf < 0) | (xf > nbins) |
@@ -775,7 +775,7 @@ def plot_table_sens(data, outfile, outformat, args, show_lvatmo=True):
def plot_x(data, outfile, outformat, args, normalise=False):
- """Limit plot as a function of the source flavour ratio for each operator
+ """Limit plot as a function of the source flavor ratio for each operator
texture."""
print('Making X sensitivity plot')
dim = args.dimension