From c2c427177af69b0a08874a4466c95f2f6aa94c44 Mon Sep 17 00:00:00 2001 From: shivesh Date: Fri, 11 May 2018 19:15:44 -0500 Subject: Fri May 11 19:15:44 CDT 2018 --- plot_sens.py | 6 ++++-- submitter/sens_dag.py | 12 +++++++----- utils/plot.py | 6 +++--- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/plot_sens.py b/plot_sens.py index 8357ffc..2e3b1c6 100755 --- a/plot_sens.py +++ b/plot_sens.py @@ -232,7 +232,8 @@ def main(): elif args.likelihood is Likelihood.GAUSSIAN: infile += '/gaussian/' # infile += '/DIM{0}/fix_ifr/HESESim'.format(dim) - infile += '/DIM{0}/fix_ifr/'.format(dim) + # infile += '/DIM{0}/fix_ifr/'.format(dim) + infile += '/DIM{0}/fix_ifr/data'.format(dim) if args.likelihood is Likelihood.GAUSSIAN: infile += '{0}/'.format(str(args.sigma_ratio).replace('.', '_')) infile += 'fr_stat/{0}/{1}/fr_stat'.format(args.stat_method, args.run_method) \ @@ -279,7 +280,8 @@ def main(): _, scale_region = fr_utils.estimate_scale(argsc) argsc.scale_region = scale_region # infile = base_infile + '/DIM{0}/fix_ifrHESESim/'.format(dim) - infile = base_infile + '/DIM{0}/fix_ifr/'.format(dim) + # infile = base_infile + '/DIM{0}/fix_ifr/'.format(dim) + infile = base_infile + '/DIM{0}/fix_ifr/data'.format(dim) if args.likelihood is Likelihood.GAUSSIAN: infile += '{0}/'.format(str(args.sigma_ratio).replace('.', '_')) infile += 'fr_stat/' diff --git a/submitter/sens_dag.py b/submitter/sens_dag.py index e02a671..666a0dd 100644 --- a/submitter/sens_dag.py +++ b/submitter/sens_dag.py @@ -41,13 +41,14 @@ GLOBAL_PARAMS.update(dict( )) # FR -dimension = [6] -# dimension = [3, 6] +# dimension = [3] +dimension = [3, 6] # dimension = [4, 5, 7, 8] # dimension = [3, 4, 5, 6, 7, 8] GLOBAL_PARAMS.update(dict( threads = 1, - binning = '6e4 1e7 5', + # binning = '6e4 1e7 5', + binning = '1e5 1e7 5', no_bsm = 'False', scale_region = "1E10", energy_dependance = 'spectral', @@ -74,7 +75,7 @@ GLOBAL_PARAMS.update(dict( plot_statistic = 'True' )) -outfile = 'dagman_FR_SENS_{0}_{1}_{2}_sim.submit'.format( +outfile = 'dagman_FR_SENS_{0}_{1}_{2}_data_100TeV.submit'.format( GLOBAL_PARAMS['stat_method'], GLOBAL_PARAMS['run_method'], GLOBAL_PARAMS['likelihood'] ) golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit' @@ -98,8 +99,9 @@ with open(outfile, 'w') as f: print 'frs', frs # output = outchain_head + '/fix_ifr/' # output = outchain_head + '/fix_ifr/HESESim' - output = outchain_head + '/fix_ifr/sim' + # output = outchain_head + '/fix_ifr/sim' # output = outchain_head + '/fix_ifr/data' + output = outchain_head + '/fix_ifr/data/100TeV/' if GLOBAL_PARAMS['likelihood'].lower() == 'gaussian': output += '{0}/'.format(str(GLOBAL_PARAMS['sigma_ratio']).replace('.', '_')) output += 'fr_stat' diff --git a/utils/plot.py b/utils/plot.py index fec8066..a51b0f1 100644 --- a/utils/plot.py +++ b/utils/plot.py @@ -405,8 +405,8 @@ def plot_sens_fixed_angle(data, outfile, outformat, args): print 'limit = {0}'.format(lim) label = '[{0}, {1}, {2}]'.format(*misc_utils.solve_ratio(src)) if lim < yranges[0]: yranges[0] = lim - # if lim > yranges[1]: yranges[1] = lim+5 - if lim > yranges[1]: yranges[1] = lim + if lim > yranges[1]: yranges[1] = lim+5 + # if lim > yranges[1]: yranges[1] = lim line = plt.Line2D( (ian+1-0.1, ian+1+0.1), (lim, lim), lw=3, color=colour[isrc], label=label ) @@ -420,7 +420,7 @@ def plot_sens_fixed_angle(data, outfile, outformat, args): ) try: - # yranges = (myround(yranges[0], up=True), myround(yranges[1], down=True)) + yranges = (myround(yranges[0], up=True), myround(yranges[1], down=True)) ax.set_ylim(yranges) except: pass -- cgit v1.2.3