Merge branch 'refactor' of github.com:ShiveshM/flavour_ratio into refactor

5 files changed, 21 insertions, 14 deletions

diff --git a/fig2.py b/fig2.py
index c6692f3..a284e9d 100755
--- a/fig2.py
+++ b/fig2.py
@@ -84,7 +84,8 @@ def main():
     n_params = len(paramset)
     print n_params
 
-    chains = np.load('/data/user/smandalia/flavour_ratio/data/contour_emcee/golemfit/real/_GOLEMFIT_REAL_emcee_.npy')
+    chains = np.load('/data/user/smandalia/flavour_ratio/data/contour/contour_REAL.npy')
+    # chains = np.load('/data/user/smandalia/flavour_ratio/data/contour_emcee/golemfit/real/more_sys_flat/_GOLEMFIT_REAL_emcee_.npy')
 
     print chains
     flavour_angles = chains[:,-2:]
@@ -94,9 +95,11 @@ def main():
 
     nbins = 25
 
+    ax_labels = [r'$f_{e}$', r'$f_{\mu}$', r'$f_{\tau}$']
+
     fig = plt.figure(figsize=(8, 8))
     ax = fig.add_subplot(111)
-    tax = plot_utils.get_tax(ax, scale=nbins)
+    tax = plot_utils.get_tax(ax, scale=nbins, ax_labels=ax_labels)
 
     plot_utils.flavour_contour(
         frs = flavour_ratios,
diff --git a/sens.py b/sens.py
index 6ecbea7..db3859b 100755
--- a/sens.py
+++ b/sens.py
@@ -229,7 +229,7 @@ def main():
         )
         llh = '{0}'.format(args.likelihood).split('.')[1]
         data = '{0}'.format(args.data).split('.')[1]
-        src_string = solve_ratio(args.source_ratio)
+        src_string = misc_utils.solve_ratio(args.source_ratio)
         prefix = args.mn_output + '/DIM{0}/{1}/{2}/s{3}/{4}'.format(
             args.dimension, data, llh, src_string, identifier
         )
@@ -252,10 +252,14 @@ def main():
             stat_arr[idx_sc] = np.array([scale, stat])
 
         # Cleanup.
-        for f in glob.glob(prefix + '*'):
-            os.remove(f)
         if reset_range is not None:
             scale_prm.ranges = reset_range
+        try:
+            for f in glob.glob(prefix + '*'):
+                os.remove(f)
+        except:
+            print 'got error trying to cleanup, continuing'
+            pass
 
     misc_utils.make_dir(outfile)
     print 'Saving to {0}'.format(outfile+'.npy')
diff --git a/submitter/contour_dag.py b/submitter/contour_dag.py
index 8b3c11c..49c0fa9 100644
--- a/submitter/contour_dag.py
+++ b/submitter/contour_dag.py
@@ -31,8 +31,8 @@ GLOBAL_PARAMS.update(dict(
 # Emcee
 GLOBAL_PARAMS.update(dict(
     run_mcmc = 'True',
-    burnin   = 200,
-    nsteps   = 1000,
+    burnin   = 2000,
+    nsteps   = 10000,
     nwalkers = 60,
     mcmc_seed_type = 'uniform'
 ))
diff --git a/submitter/contour_submit.sub b/submitter/contour_submit.sub
index 35106a6..45bef9e 100644
--- a/submitter/contour_submit.sub
+++ b/submitter/contour_submit.sub
@@ -9,7 +9,7 @@ error  = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/
 getenv = True
 # environment = "X509_USER_PROXY=x509up_u14830" 
 
-request_memory = 3GB
+request_memory = 8GB
 request_cpus = 12
 
 initialdir = /home/smandalia/condor
diff --git a/utils/plot.py b/utils/plot.py
index 954c24b..c7c94a5 100644
--- a/utils/plot.py
+++ b/utils/plot.py
@@ -38,7 +38,7 @@ import shapely.geometry as geometry
 
 from utils.enums import DataType, str_enum
 from utils.enums import Likelihood, ParamTag, StatCateg, Texture
-from utils.misc import get_units, make_dir, solve_ratio
+from utils.misc import get_units, make_dir, solve_ratio, interval
 from utils.fr import angles_to_u, angles_to_fr, SCALE_BOUNDARIES
 
 
@@ -863,9 +863,9 @@ def get_tax(ax, scale, ax_labels):
     tax.clear_matplotlib_ticks()
 
     # Set ticks
-    # ticks = np.linspace(0, 1, 6)
-    # tax.ticks(ticks=ticks, locations=ticks*scale, axis='blr', linewidth=1,
-    #           offset=0.03, fontsize=fontsize, tick_formats='%.1f')
+    ticks = np.linspace(0, 1, 6)
+    tax.ticks(ticks=ticks, locations=ticks*scale, axis='blr', linewidth=1,
+              offset=0.03, fontsize=fontsize, tick_formats='%.1f')
     tax.ticks()
 
     tax._redraw_labels()
@@ -1021,8 +1021,8 @@ def flavour_contour(frs, ax, nbins, coverage, **kwargs):
         ev_polygon.T[0], ev_polygon.T[1], label=r'{0}\%'.format(int(coverage)),
         **kwargs
     )
-    ax.scatter(points.T[0], points.T[1], marker='o', s=2, alpha=1, color=color,
-               zorder=3)
+    ax.scatter(points.T[0], points.T[1], marker='o', s=2, alpha=1, zorder=3,
+              **kwargs)
 
 def plot_source_ternary(data, outfile, outformat, args):
     """Ternary plot in the source flavour space for each operator texture."""