diff options
| author | shivesh <s.p.mandalia@qmul.ac.uk> | 2018-05-06 22:55:11 -0500 |
|---|---|---|
| committer | shivesh <s.p.mandalia@qmul.ac.uk> | 2018-05-06 22:55:11 -0500 |
| commit | 57accb5441e1586cd42b19ee7236bef7be0b9548 (patch) | |
| tree | 1da9cab50bc4c25239d32acf316fae34c0eb1bf5 | |
| parent | 932a8691e16eb904e3eec61daae08d72c2039f10 (diff) | |
| download | GolemFlavor-57accb5441e1586cd42b19ee7236bef7be0b9548.tar.gz GolemFlavor-57accb5441e1586cd42b19ee7236bef7be0b9548.zip | |
Sun May 6 22:55:11 CDT 2018
| -rwxr-xr-x | plot_sens.py | 11 | ||||
| -rw-r--r-- | submitter/sens_dag.py | 12 | ||||
| -rw-r--r-- | utils/gf.py | 2 | ||||
| -rw-r--r-- | utils/likelihood.py | 2 |
4 files changed, 15 insertions, 12 deletions
diff --git a/plot_sens.py b/plot_sens.py index 0c862eb..279d66a 100755 --- a/plot_sens.py +++ b/plot_sens.py @@ -331,27 +331,30 @@ def main(): if args.plot: print 'Plotting sensitivities' - basename = args.infile + '{0}/{1}'.format(args.likelihood, args.stat_method) + if args.likelihood in [Likelihood.GOLEMFIT, Likelihood.GF_FREQ]: + basename = args.infile + 'golemfit/{1}'.format(args.likelihood, args.stat_method) + elif args.likelihood is Likelihood.GAUSSIAN: + basename = args.infile + 'gaussian/{1}'.format(args.likelihood, args.stat_method) baseoutfile = basename[:5]+basename[5:].replace('data', 'plots') if args.run_method is SensitivityCateg.FULL: plot_utils.plot_sens_full( data = data, - outfile = basename + '/FULL', + outfile = baseoutfile + '/FULL', outformat = ['png'], args = args, ) elif args.run_method in fixed_angle_categ: plot_utils.plot_sens_fixed_angle( data = data, - outfile = basename + '/FIXED_ANGLE', + outfile = baseoutfile + '/FIXED_ANGLE', outformat = ['png'], args = args, ) elif args.run_method in corr_angles_categ: plot_utils.plot_sens_corr_angle( data = data, - outfile = basename + '/CORR_ANGLE', + outfile = baseoutfile + '/CORR_ANGLE', outformat = ['png'], args = args, ) diff --git a/submitter/sens_dag.py b/submitter/sens_dag.py index 00be770..d0b4752 100644 --- a/submitter/sens_dag.py +++ b/submitter/sens_dag.py @@ -24,11 +24,11 @@ fix_sfr_mfr = [ GLOBAL_PARAMS = {} # Bayes Factor -sens_eval_bin = 'all' # set to 'all' to run normally +sens_eval_bin = 'true' # set to 'all' to run normally GLOBAL_PARAMS.update(dict( sens_run = 'True', - run_method = 'full', # full, fixed_angle, corr_angle - stat_method = 'frequentist', + run_method = 'fixed_angle', # full, fixed_angle, corr_angle + stat_method = 'bayesian', sens_bins = 40, seed = 'None' )) @@ -41,8 +41,8 @@ GLOBAL_PARAMS.update(dict( )) # FR -# dimension = [3, 6] -dimension = [4, 5, 7, 8] +dimension = [3, 6] +# dimension = [4, 5, 7, 8] # dimension = [3, 4, 5, 6, 7, 8] GLOBAL_PARAMS.update(dict( threads = 1, @@ -58,7 +58,7 @@ GLOBAL_PARAMS.update(dict( # Likelihood GLOBAL_PARAMS.update(dict( - likelihood = 'gaussian', + likelihood = 'golemfit', sigma_ratio = '0.01' )) diff --git a/utils/gf.py b/utils/gf.py index 098faa9..aa075b6 100644 --- a/utils/gf.py +++ b/utils/gf.py @@ -94,7 +94,7 @@ def get_llh(fitter, params): def get_llh_freq(fitter, params): - print 'setting to {0}'.format(params) + # print 'setting to {0}'.format(params) fitparams = gf.FitParameters(gf.sampleTag.HESE) for parm in params: fitparams.__setattr__(parm.name, float(parm.value)) diff --git a/utils/likelihood.py b/utils/likelihood.py index c2822a1..ebc3539 100644 --- a/utils/likelihood.py +++ b/utils/likelihood.py @@ -175,7 +175,7 @@ def triangle_llh(theta, args, asimov_paramset, llh_paramset, fitter): elif args.likelihood is Likelihood.GOLEMFIT: llh = gf_utils.get_llh(fitter, hypo_paramset) elif args.likelihood is Likelihood.GF_FREQ: - lhh = gf_utils.get_llh_freq(fitter, hypo_paramset) + llh = gf_utils.get_llh_freq(fitter, hypo_paramset) return llh |