move golemfit test to another repo and slightly reluctantly use american style flavor spelling consistently

7 files changed, 32 insertions, 32 deletions

diff --git a/scripts/contour.py b/scripts/contour.py
index 60b117f..4785117 100644
--- a/scripts/contour.py
+++ b/scripts/contour.py
@@ -5,7 +5,7 @@
 # date   : November 26, 2018
 
 """
-HESE flavour ratio contour
+HESE flavor ratio contour
 """
 
 from __future__ import absolute_import, division
@@ -68,15 +68,15 @@ def get_paramsets(args, nuisance_paramset):
     llh_paramset = ParamSet(llh_paramset)
 
     if args.data is not DataType.REAL:
-        flavour_angles = fr_utils.fr_to_angles(args.injected_ratio)
+        flavor = fr_utils.fr_to_angles(args.injected_ratio)
     else:
-        flavour_angles = fr_utils.fr_to_angles([1, 1, 1])
+        flavor = fr_utils.fr_to_angles([1, 1, 1])
 
     tag = ParamTag.BESTFIT
     asimov_paramset.extend(gf_nuisance)
     asimov_paramset.extend([
-        Param(name='astroFlavorAngle1', value=flavour_angles[0], ranges=[ 0., 1.], std=0.2, tag=tag),
-        Param(name='astroFlavorAngle2', value=flavour_angles[1], ranges=[-1., 1.], std=0.2, tag=tag),
+        Param(name='astroFlavorAngle1', value=flavor[0], ranges=[ 0., 1.], std=0.2, tag=tag),
+        Param(name='astroFlavorAngle2', value=flavor[1], ranges=[-1., 1.], std=0.2, tag=tag),
     ])
     asimov_paramset = ParamSet(asimov_paramset)
 
@@ -105,12 +105,12 @@ def process_args(args):
 def parse_args(args=None):
     """Parse command line arguments"""
     parser = argparse.ArgumentParser(
-        description="BSM flavour ratio analysis",
+        description="BSM flavor ratio analysis",
         formatter_class=misc_utils.SortingHelpFormatter,
     )
     parser.add_argument(
         '--injected-ratio', type=float, nargs=3, default=[1, 1, 1],
-        help='Set the central value for the injected flavour ratio at IceCube'
+        help='Set the central value for the injected flavor ratio at IceCube'
     )
     parser.add_argument(
         '--seed', type=misc_utils.seed_parse, default='26',
diff --git a/scripts/fr.py b/scripts/fr.py
index 25cc1f8..c8c96e3 100644
--- a/scripts/fr.py
+++ b/scripts/fr.py
@@ -5,7 +5,7 @@
 # date   : March 17, 2018
 
 """
-HESE BSM flavour ratio MCMC analysis script
+HESE BSM flavor ratio MCMC analysis script
 """
 
 from __future__ import absolute_import, division
@@ -90,14 +90,14 @@ def get_paramsets(args, nuisance_paramset):
 
     tag = ParamTag.BESTFIT
     if args.data is not DataType.REAL:
-        flavour_angles = fr_utils.fr_to_angles(args.injected_ratio)
+        flavor_angles = fr_utils.fr_to_angles(args.injected_ratio)
     else:
-        flavour_angles = fr_utils.fr_to_angles([1, 1, 1])
+        flavor_angles = fr_utils.fr_to_angles([1, 1, 1])
 
     asimov_paramset.extend(gf_nuisance)
     asimov_paramset.extend([
-        Param(name='astroFlavorAngle1', value=flavour_angles[0], ranges=[ 0., 1.], std=0.2, tag=tag),
-        Param(name='astroFlavorAngle2', value=flavour_angles[1], ranges=[-1., 1.], std=0.2, tag=tag),
+        Param(name='astroFlavorAngle1', value=flavor_angles[0], ranges=[ 0., 1.], std=0.2, tag=tag),
+        Param(name='astroFlavorAngle2', value=flavor_angles[1], ranges=[-1., 1.], std=0.2, tag=tag),
     ])
     asimov_paramset = ParamSet(asimov_paramset)
 
@@ -135,7 +135,7 @@ def process_args(args):
 def parse_args(args=None):
     """Parse command line arguments"""
     parser = argparse.ArgumentParser(
-        description="BSM flavour ratio analysis",
+        description="BSM flavor ratio analysis",
         formatter_class=misc_utils.SortingHelpFormatter,
     )
     parser.add_argument(
diff --git a/scripts/mc_texture.py b/scripts/mc_texture.py
index 9e3f0eb..0a96741 100644
--- a/scripts/mc_texture.py
+++ b/scripts/mc_texture.py
@@ -76,10 +76,10 @@ def get_paramsets(args, nuisance_paramset):
     llh_paramset = ParamSet(llh_paramset)
 
     tag = ParamTag.BESTFIT
-    flavour_angles = fr_utils.fr_to_angles([1, 1, 1])
+    flavor_angles = fr_utils.fr_to_angles([1, 1, 1])
     asimov_paramset.extend([
-        Param(name='astroFlavorAngle1', value=flavour_angles[0], ranges=[ 0., 1.], std=0.2, tag=tag),
-        Param(name='astroFlavorAngle2', value=flavour_angles[1], ranges=[-1., 1.], std=0.2, tag=tag),
+        Param(name='astroFlavorAngle1', value=flavor_angles[0], ranges=[ 0., 1.], std=0.2, tag=tag),
+        Param(name='astroFlavorAngle2', value=flavor_angles[1], ranges=[-1., 1.], std=0.2, tag=tag),
     ])
     asimov_paramset = ParamSet(asimov_paramset)
 
@@ -109,7 +109,7 @@ def process_args(args):
 def parse_args(args=None):
     """Parse command line arguments"""
     parser = argparse.ArgumentParser(
-        description="BSM flavour ratio analysis",
+        description="BSM flavor ratio analysis",
         formatter_class=misc_utils.SortingHelpFormatter,
     )
     parser.add_argument(
diff --git a/scripts/mc_unitary.py b/scripts/mc_unitary.py
index 0f0e8f4..4e8598d 100644
--- a/scripts/mc_unitary.py
+++ b/scripts/mc_unitary.py
@@ -58,11 +58,11 @@ def get_paramsets(args, nuisance_paramset):
     hypo_paramset = ParamSet(hypo_paramset)
 
     tag = ParamTag.BESTFIT
-    flavour_angles = fr_utils.fr_to_angles(args.source_ratio)
+    flavor_angles = fr_utils.fr_to_angles(args.source_ratio)
 
     asimov_paramset.extend([
-        Param(name='astroFlavorAngle1', value=flavour_angles[0], ranges=[ 0., 1.], std=0.2, tag=tag),
-        Param(name='astroFlavorAngle2', value=flavour_angles[1], ranges=[-1., 1.], std=0.2, tag=tag),
+        Param(name='astroFlavorAngle1', value=flavor_angles[0], ranges=[ 0., 1.], std=0.2, tag=tag),
+        Param(name='astroFlavorAngle2', value=flavor_angles[1], ranges=[-1., 1.], std=0.2, tag=tag),
     ])
     asimov_paramset = ParamSet(asimov_paramset)
 
@@ -86,12 +86,12 @@ def process_args(args):
 def parse_args(args=None):
     """Parse command line arguments"""
     parser = argparse.ArgumentParser(
-        description="BSM flavour ratio analysis",
+        description="BSM flavor ratio analysis",
         formatter_class=misc_utils.SortingHelpFormatter,
     )
     parser.add_argument(
         '--source-ratio', type=float, nargs=3, default=[1, 2, 0],
-        help='Set the source flavour ratio'
+        help='Set the source flavor ratio'
     )
     parser.add_argument(
         '--seed', type=misc_utils.seed_parse, default='26',
diff --git a/scripts/mc_x.py b/scripts/mc_x.py
index 875c40b..5d4a934 100644
--- a/scripts/mc_x.py
+++ b/scripts/mc_x.py
@@ -90,7 +90,7 @@ def process_args(args):
 def parse_args(args=None):
     """Parse command line arguments"""
     parser = argparse.ArgumentParser(
-        description="BSM flavour ratio analysis",
+        description="BSM flavor ratio analysis",
         formatter_class=misc_utils.SortingHelpFormatter,
     )
     parser.add_argument(
diff --git a/scripts/plot_sens.py b/scripts/plot_sens.py
index 2c827ca..a7b9b28 100644
--- a/scripts/plot_sens.py
+++ b/scripts/plot_sens.py
@@ -5,7 +5,7 @@
 # date   : April 28, 2018
 
 """
-HESE BSM flavour ratio analysis plotting script
+HESE BSM flavor ratio analysis plotting script
 """
 
 from __future__ import absolute_import, division
@@ -97,7 +97,7 @@ def process_args(args):
 def parse_args(args=None):
     """Parse command line arguments"""
     parser = argparse.ArgumentParser(
-        description="HESE BSM flavour ratio analysis plotting script",
+        description="HESE BSM flavor ratio analysis plotting script",
         formatter_class=SortingHelpFormatter,
     )
     parser.add_argument(
@@ -119,7 +119,7 @@ def parse_args(args=None):
     )
     parser.add_argument(
         '--source-ratios', type=int, nargs='*', default=None,
-        required=False, help='Set the source flavour ratios'
+        required=False, help='Set the source flavor ratios'
     )
     parser.add_argument(
         '--x-segments', type=int, default=None,
diff --git a/scripts/sens.py b/scripts/sens.py
index 5198016..39c336d 100644
--- a/scripts/sens.py
+++ b/scripts/sens.py
@@ -5,7 +5,7 @@
 # date   : March 17, 2018
 
 """
-HESE BSM flavour ratio analysis script
+HESE BSM flavor ratio analysis script
 """
 
 from __future__ import absolute_import, division
@@ -94,14 +94,14 @@ def get_paramsets(args, nuisance_paramset):
 
     tag = ParamTag.BESTFIT
     if args.data is not DataType.REAL:
-        flavour_angles = fr_utils.fr_to_angles(args.injected_ratio)
+        flavor_angles = fr_utils.fr_to_angles(args.injected_ratio)
     else:
-        flavour_angles = fr_utils.fr_to_angles([1, 1, 1])
+        flavor_angles = fr_utils.fr_to_angles([1, 1, 1])
 
     asimov_paramset.extend(gf_nuisance)
     asimov_paramset.extend([
-        Param(name='astroFlavorAngle1', value=flavour_angles[0], ranges=[ 0., 1.], std=0.2, tag=tag),
-        Param(name='astroFlavorAngle2', value=flavour_angles[1], ranges=[-1., 1.], std=0.2, tag=tag),
+        Param(name='astroFlavorAngle1', value=flavor_angles[0], ranges=[ 0., 1.], std=0.2, tag=tag),
+        Param(name='astroFlavorAngle2', value=flavor_angles[1], ranges=[-1., 1.], std=0.2, tag=tag),
     ])
     asimov_paramset = ParamSet(asimov_paramset)
 
@@ -144,7 +144,7 @@ def process_args(args):
 def parse_args(args=None):
     """Parse command line arguments"""
     parser = argparse.ArgumentParser(
-        description="BSM flavour ratio analysis",
+        description="BSM flavor ratio analysis",
         formatter_class=misc_utils.SortingHelpFormatter,
     )
     parser.add_argument(