begin contour.py and rename some util files

1 files changed, 36 insertions, 32 deletions

diff --git a/utils/param.py b/utils/param.py
index 62f59b1..8c17541 100644
--- a/utils/param.py
+++ b/utils/param.py
@@ -230,43 +230,47 @@ def get_paramsets(args, nuisance_paramset):
     for parm in llh_paramset:
         parm.value = args.__getattribute__(parm.name)
     tag = ParamTag.BESTFIT
-    flavour_angles = fr_to_angles(args.measured_ratio)
+    try:
+        flavour_angles = fr_to_angles(args.measured_ratio)
+    except:
+        flavour_angles = fr_to_angles(args.injected_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),
     ])
     asimov_paramset = ParamSet(asimov_paramset)
 
-    if args.fix_mixing is MixingScenario.NONE and not args.fix_mixing_almost:
-        tag = ParamTag.MMANGLES
-        llh_paramset.extend([
-            Param(name='np_s_12^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{12}^2', tag=tag),
-            Param(name='np_c_13^4', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{c}_{13}^4', tag=tag),
-            Param(name='np_s_23^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{23}^2', tag=tag),
-            Param(name='np_dcp', value=np.pi, ranges=[0., 2*np.pi], std=0.2, tex=r'\tilde{\delta_{CP}}', tag=tag)
-        ])
-    if args.fix_mixing_almost:
-        tag = ParamTag.MMANGLES
-        llh_paramset.extend([
-            Param(name='np_s_23^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{23}^4', tag=tag)
-        ])
-    if not args.fix_scale:
-        tag = ParamTag.SCALE
-        if hasattr(args, 'dimension'):
-            llh_paramset.append(
-                Param(name='logLam', value=np.log10(args.scale), ranges=np.log10(args.scale_region), std=3,
-                      tex=r'{\rm log}_{10}\left (\Lambda^{-1}'+get_units(args.dimension)+r'\right )', tag=tag)
-            )
-        elif hasattr(args, 'dimensions'):
-            llh_paramset.append(
-                Param(name='logLam', value=np.log10(args.scale), ranges=np.log10(args.scale_region), std=3,
-                      tex=r'{\rm log}_{10}\left (\Lambda^{-1} / GeV^{-d+4}\right )', tag=tag)
-            )
-    if not args.fix_source_ratio:
-        tag = ParamTag.SRCANGLES
-        llh_paramset.extend([
-            Param(name='s_phi4', value=0.5, ranges=[0., 1.], std=0.2, tex=r'sin^4(\phi)', tag=tag),
-            Param(name='c_2psi', value=0.5, ranges=[0., 1.], std=0.2, tex=r'cos(2\psi)', tag=tag)
-        ])
+    if hasattr(args, 'fix_source_ratio'):
+        if args.fix_mixing is MixingScenario.NONE and not args.fix_mixing_almost:
+            tag = ParamTag.MMANGLES
+            llh_paramset.extend([
+                Param(name='np_s_12^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{12}^2', tag=tag),
+                Param(name='np_c_13^4', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{c}_{13}^4', tag=tag),
+                Param(name='np_s_23^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{23}^2', tag=tag),
+                Param(name='np_dcp', value=np.pi, ranges=[0., 2*np.pi], std=0.2, tex=r'\tilde{\delta_{CP}}', tag=tag)
+            ])
+        if args.fix_mixing_almost:
+            tag = ParamTag.MMANGLES
+            llh_paramset.extend([
+                Param(name='np_s_23^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{23}^4', tag=tag)
+            ])
+        if not args.fix_scale:
+            tag = ParamTag.SCALE
+            if hasattr(args, 'dimension'):
+                llh_paramset.append(
+                    Param(name='logLam', value=np.log10(args.scale), ranges=np.log10(args.scale_region), std=3,
+                          tex=r'{\rm log}_{10}\left (\Lambda^{-1}'+get_units(args.dimension)+r'\right )', tag=tag)
+                )
+            elif hasattr(args, 'dimensions'):
+                llh_paramset.append(
+                    Param(name='logLam', value=np.log10(args.scale), ranges=np.log10(args.scale_region), std=3,
+                          tex=r'{\rm log}_{10}\left (\Lambda^{-1} / GeV^{-d+4}\right )', tag=tag)
+                )
+        if not args.fix_source_ratio:
+            tag = ParamTag.SRCANGLES
+            llh_paramset.extend([
+                Param(name='s_phi4', value=0.5, ranges=[0., 1.], std=0.2, tex=r'sin^4(\phi)', tag=tag),
+                Param(name='c_2psi', value=0.5, ranges=[0., 1.], std=0.2, tex=r'cos(2\psi)', tag=tag)
+            ])
     llh_paramset = ParamSet(llh_paramset)
     return asimov_paramset, llh_paramset