diff options
| -rwxr-xr-x | fr.py | 4 | ||||
| -rwxr-xr-x | sens.py | 4 | ||||
| -rw-r--r-- | submitter/mcmc_dag.py | 5 | ||||
| -rw-r--r-- | submitter/mcmc_submit.sub | 4 | ||||
| -rw-r--r-- | submitter/sens_submit.sub | 2 | ||||
| -rw-r--r-- | utils/fr.py | 4 | ||||
| -rw-r--r-- | utils/likelihood.py | 17 |
7 files changed, 20 insertions, 20 deletions
@@ -83,10 +83,6 @@ def process_args(args): args.binning = np.logspace( np.log10(args.binning[0]), np.log10(args.binning[1]), args.binning[2]+1 ) - if args.likelihood is Likelihood.GOLEMFIT: - print 'GolemFit selected with spectral index energy dependance, ' \ - 'will attempt to use the astroDeltaGamma systematic to fold ' \ - 'in the spectral index.' if not args.fix_scale: args.scale = fr_utils.estimate_scale(args) @@ -92,10 +92,6 @@ def process_args(args): args.binning = np.logspace( np.log10(args.binning[0]), np.log10(args.binning[1]), args.binning[2]+1 ) - if args.likelihood is Likelihood.GOLEMFIT: - print 'GolemFit selected with spectral index energy dependance, ' \ - 'will attempt to use the astroDeltaGamma systematic to fold ' \ - 'in the spectral index.' if not args.fix_scale: args.scale = fr_utils.estimate_scale(args) diff --git a/submitter/mcmc_dag.py b/submitter/mcmc_dag.py index 827ab9e..7f6eae6 100644 --- a/submitter/mcmc_dag.py +++ b/submitter/mcmc_dag.py @@ -11,7 +11,7 @@ fix_sfr_mfr = [ (1, 1, 1, 1, 2, 0), (1, 1, 1, 1, 0, 0), (1, 1, 1, 0, 1, 0), - (1, 1, 1, 0, 0, 1), + # (1, 1, 1, 0, 0, 1), # (1, 1, 0, 1, 2, 0), # (1, 1, 0, 1, 0, 0), # (1, 1, 0, 0, 1, 0), @@ -43,7 +43,8 @@ GLOBAL_PARAMS.update(dict( energy_dependance = 'spectral', spectral_index = -2, fix_mixing = 'False', - fix_mixing_almost = 'False' + fix_mixing_almost = 'False', + fold_index = 'False' )) # Likelihood diff --git a/submitter/mcmc_submit.sub b/submitter/mcmc_submit.sub index 2032cb6..f006350 100644 --- a/submitter/mcmc_submit.sub +++ b/submitter/mcmc_submit.sub @@ -1,5 +1,5 @@ Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/fr.py -Arguments = "--ast $(ast) --burnin $(burnin) --data $(data) --dimension $(dimension) --fix-mixing $(fix_mixing) --fix-source-ratio $(fix_source_ratio) --likelihood $(likelihood) --measured-ratio $(mr0) $(mr1) $(mr2) --no-bsm $(no_bsm) --nsteps $(nsteps) --nwalkers $(nwalkers) --outfile $(outfile) --plot-angles $(plot_angles) --plot-elements $(plot_elements) --run-mcmc $(run_mcmc) --scale-region $(scale_region) --seed $(seed) --sigma-ratio $(sigma_ratio) --source-ratio $(sr0) $(sr1) $(sr2) --threads $(threads) --energy-dependance $(energy_dependance) --spectral-index $(spectral_index) --binning $(binning) --fix-mixing-almost $(fix_mixing_almost)" +Arguments = "--ast $(ast) --burnin $(burnin) --data $(data) --dimension $(dimension) --fix-mixing $(fix_mixing) --fix-source-ratio $(fix_source_ratio) --likelihood $(likelihood) --measured-ratio $(mr0) $(mr1) $(mr2) --no-bsm $(no_bsm) --nsteps $(nsteps) --nwalkers $(nwalkers) --outfile $(outfile) --plot-angles $(plot_angles) --plot-elements $(plot_elements) --run-mcmc $(run_mcmc) --scale-region $(scale_region) --seed $(seed) --sigma-ratio $(sigma_ratio) --source-ratio $(sr0) $(sr1) $(sr2) --threads $(threads) --energy-dependance $(energy_dependance) --spectral-index $(spectral_index) --binning $(binning) --fix-mixing-almost $(fix_mixing_almost) --fold-index $(fold_index)" # All logs will go to a single file log = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).log @@ -16,7 +16,7 @@ getenv = True # +TransferOutput="" Transfer_output_files = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/metaouts/ -request_memory = 1GB +request_memory = 2GB request_cpus = 1 Universe = vanilla diff --git a/submitter/sens_submit.sub b/submitter/sens_submit.sub index 57a2588..44ec0a3 100644 --- a/submitter/sens_submit.sub +++ b/submitter/sens_submit.sub @@ -1,5 +1,5 @@ Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/sens.py -Arguments = "--ast $(ast) --data $(data) --dimension $(dimension) --fix-mixing $(fix_mixing) --fix-source-ratio $(fix_source_ratio) --likelihood $(likelihood) --measured-ratio $(mr0) $(mr1) $(mr2) --no-bsm $(no_bsm) --outfile $(outfile) --scale-region $(scale_region) --seed $(seed) --sigma-ratio $(sigma_ratio) --source-ratio $(sr0) $(sr1) $(sr2) --threads $(threads) --energy-dependance $(energy_dependance) --spectral-index $(spectral_index) --binning $(binning) --fix-mixing-almost $(fix_mixing_almost) --sens-run $(sens_run) --run-method $(run_method) --stat-method $(stat_method) --sens-bins $(sens_bins) --sens-eval-bin $(sens_eval_bin) --mn-live-points $(mn_live_points) --mn-tolerance $(mn_tolerance) --mn-output $(mn_output) --plot-statistic $(plot_statistic)" +Arguments = "--ast $(ast) --data $(data) --dimension $(dimension) --fix-mixing $(fix_mixing) --fix-source-ratio $(fix_source_ratio) --likelihood $(likelihood) --measured-ratio $(mr0) $(mr1) $(mr2) --no-bsm $(no_bsm) --outfile $(outfile) --scale-region $(scale_region) --seed $(seed) --sigma-ratio $(sigma_ratio) --source-ratio $(sr0) $(sr1) $(sr2) --threads $(threads) --energy-dependance $(energy_dependance) --spectral-index $(spectral_index) --binning $(binning) --fix-mixing-almost $(fix_mixing_almost) --sens-run $(sens_run) --run-method $(run_method) --stat-method $(stat_method) --sens-bins $(sens_bins) --sens-eval-bin $(sens_eval_bin) --mn-live-points $(mn_live_points) --mn-tolerance $(mn_tolerance) --mn-output $(mn_output) --plot-statistic $(plot_statistic) --fold-index $(fold_index)" # All logs will go to a single file log = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).log diff --git a/utils/fr.py b/utils/fr.py index b2a1274..51d5b6a 100644 --- a/utils/fr.py +++ b/utils/fr.py @@ -242,6 +242,10 @@ def fr_argparse(parser): help='Spectral index for spectral energy dependance' ) parser.add_argument( + '--fold-index', default='True', type=parse_bool, + help='Fold in the spectral index when using GolemFit' + ) + parser.add_argument( '--binning', default=[1e4, 1e7, 5], type=float, nargs=3, help='Binning for spectral energy dependance' ) diff --git a/utils/likelihood.py b/utils/likelihood.py index 70b54c9..cd1ead8 100644 --- a/utils/likelihood.py +++ b/utils/likelihood.py @@ -87,9 +87,9 @@ def triangle_llh(theta, args, asimov_paramset, llh_paramset, fitter): if args.energy_dependance is EnergyDependance.SPECTRAL: bin_centers = np.sqrt(args.binning[:-1]*args.binning[1:]) bin_width = np.abs(np.diff(args.binning)) - if args.likelihood in [Likelihood.GOLEMFIT, Likelihood.GF_FREQ]: - if 'astroDeltaGamma' in hypo_paramset.names: - args.spectral_index = -hypo_paramset['astroDeltaGamma'].value + if args.likelihood in [Likelihood.GOLEMFIT, Likelihood.GF_FREQ] \ + and args.fold_index: + args.spectral_index = -hypo_paramset['astroDeltaGamma'].value if args.fix_source_ratio: if args.energy_dependance is EnergyDependance.MONO: @@ -163,15 +163,18 @@ def triangle_llh(theta, args, asimov_paramset, llh_paramset, fitter): for idx, param in enumerate(hypo_paramset.from_tag(ParamTag.BESTFIT)): param.value = flavour_angles[idx] + print 'llh_paramset', llh_paramset if args.likelihood is Likelihood.FLAT: - return 1. + llh = 1. elif args.likelihood is Likelihood.GAUSSIAN: fr_bf = args.measured_ratio - return multi_gaussian(fr, fr_bf, args.sigma_ratio) + llh = multi_gaussian(fr, fr_bf, args.sigma_ratio) elif args.likelihood is Likelihood.GOLEMFIT: - return gf_utils.get_llh(fitter, hypo_paramset) + llh = gf_utils.get_llh(fitter, hypo_paramset) elif args.likelihood is Likelihood.GF_FREQ: - return gf_utils.get_llh_freq(fitter, hypo_paramset) + lhh = gf_utils.get_llh_freq(fitter, hypo_paramset) + print 'llh', llh + return llh def ln_prob(theta, args, asimov_paramset, llh_paramset, fitter): |