Thu May 24 15:23:00 CDT 2018

3 files changed, 23 insertions, 16 deletions

diff --git a/plot_sens.py b/plot_sens.py
index a9704fe..2d7e20b 100755
--- a/plot_sens.py
+++ b/plot_sens.py
@@ -302,9 +302,9 @@ def main():
                     for idx_scen in xrange(len(st_paramset_arr)):
                         print '|||| SCENARIO = {0}'.format(idx_scen)
                         outfile = baseoutfile + '_SCEN{0}'.format(idx_scen)
-                        if idx_scen == 0: label = r'$\mathcal{O}_{12}=\frac{\pi}{4}$'
-                        elif idx_scen == 1: label = r'$\mathcal{O}_{13}=\frac{\pi}{4}$'
-                        elif idx_scen == 2: label = r'$\mathcal{O}_{23}=\frac{\pi}{4}$'
+                        if idx_scen == 0: label = r'$\mathcal{O}_{12}=\pi/4$'
+                        elif idx_scen == 1: label = r'$\mathcal{O}_{13}=\pi/4$'
+                        elif idx_scen == 2: label = r'$\mathcal{O}_{23}=\pi/4$'
                         plot_utils.plot_statistic(
                             data        = data[idim][isrc][idx_scen],
                             outfile     = outfile,
@@ -355,12 +355,12 @@ def main():
                 outformat = ['png'],
                 args      = args,
             )
-            plot_utils.plot_sens_fixed_angle(
-                data      = data,
-                outfile   = baseoutfile + '/FIXED_ANGLE',
-                outformat = ['png'],
-                args      = args,
-            )
+            # plot_utils.plot_sens_fixed_angle(
+            #     data      = data,
+            #     outfile   = baseoutfile + '/FIXED_ANGLE',
+            #     outformat = ['png'],
+            #     args      = args,
+            # )
         elif args.run_method in corr_angles_categ:
             plot_utils.plot_sens_corr_angle(
                 data      = data,
diff --git a/sens.py b/sens.py
index f8c8b56..5b79d0d 100755
--- a/sens.py
+++ b/sens.py
@@ -357,9 +357,9 @@ def main():
             for idx_scen in xrange(len(st_paramset_arr)):
                 print '|||| SCENARIO = {0}'.format(idx_scen)
                 outfile = baseoutfile + '_SCEN{0}'.format(idx_scen)
-                if idx_scen == 0: label = r'$\mathcal{O}_{12}=\frac{\pi}{4}$'
-                elif idx_scen == 1: label = r'$\mathcal{O}_{13}=\frac{\pi}{4}$'
-                elif idx_scen == 2: label = r'$\mathcal{O}_{23}=\frac{\pi}{4}$'
+                if idx_scen == 0: label = r'$\mathcal{O}_{12}=\pi/4$'
+                elif idx_scen == 1: label = r'$\mathcal{O}_{13}=\pi/4$'
+                elif idx_scen == 2: label = r'$\mathcal{O}_{23}=\pi/4$'
                 plot_utils.plot_statistic(
                     data        = data[idx_scen],
                     outfile     = outfile,
diff --git a/utils/plot.py b/utils/plot.py
index 350fa82..98f71b4 100644
--- a/utils/plot.py
+++ b/utils/plot.py
@@ -264,7 +264,7 @@ def myround(x, base=2, up=False, down=False):
 def plot_statistic(data, outfile, outformat, args, scale_param, label=None):
     """Make MultiNest factor or LLH value plot."""
     print 'Making Statistic plot'
-    fig_text = '\n' + gen_figtext(args)
+    fig_text = gen_figtext(args)
     if label is not None: fig_text += '\n' + label
 
     print 'data', data
@@ -538,7 +538,7 @@ def plot_sens_fixed_angle_pretty(data, outfile, outformat, args):
     ax.tick_params(axis='x', labelsize=16)
 
     legend_elements.append(
-        Patch(facecolor=col, alpha=alpha+0.1, edgecolor='k', label='max sensitivity')
+        Patch(facecolor=col, alpha=alpha+0.1, edgecolor='k', label='maximum reach')
     )
     legend_elements.append(
         Patch(facecolor='none', hatch='\\\\', edgecolor='k', label='IceCube arXiv:1709.03434')
@@ -576,7 +576,14 @@ def plot_sens_fixed_angle(data, outfile, outformat, args):
     xticks = [r'$\mathcal{O}_{e\mu}$', r'$\mathcal{O}_{e\tau}$', r'$\mathcal{O}_{\mu\tau}$']
     argsc = deepcopy(args)
 
-    LV_atmo_90pc_limits = dict(np.genfromtxt('./misc/LV_atmo_90pc_limits.txt'))
+    LV_atmo_90pc_limits = {
+        3: (2E-24, 1E-1),
+        4: (2.7E-28, 3.16E-25),
+        5: (1.5E-32, 1.12E-27),
+        6: (9.1E-37, 2.82E-30),
+        7: (3.6E-41, 1.77E-32),
+        8: (1.4E-45, 1.00E-34)
+    }
     ylims = {
         3 : (-28, -22), 4 : (-34, -25), 5 : (-42, -28), 6 : (-48, -33),
         7 : (-54, -37), 8 : (-61, -40)
@@ -645,7 +652,7 @@ def plot_sens_fixed_angle(data, outfile, outformat, args):
                     arrowprops={'arrowstyle': '<-', 'lw': 1.5, 'color':colour[isrc]}
                 )
                 if ian == 2:
-                    lim = np.log10(LV_atmo_90pc_limits[dim])
+                    lim = np.log10(LV_atmo_90pc_limits[dim][0])
                     ax.add_patch(patches.Rectangle(
                         (ian+1-xoff, lim), 2*xoff, 100, fill=True,
                         facecolor='orange', alpha=0.3, linewidth=1, edgecolor='k'