diff options
Diffstat (limited to 'submitter')
| -rw-r--r-- | submitter/mcmc_dag.py | 24 | ||||
| -rw-r--r-- | submitter/sens_dag.py | 31 | ||||
| -rw-r--r-- | submitter/sens_submit.sub | 2 |
3 files changed, 30 insertions, 27 deletions
diff --git a/submitter/mcmc_dag.py b/submitter/mcmc_dag.py index 79f9b6d..2866887 100644 --- a/submitter/mcmc_dag.py +++ b/submitter/mcmc_dag.py @@ -9,9 +9,9 @@ full_scan_mfr = [ 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, 1, 0, 0), + # (1, 1, 1, 0, 1, 0), + # (1, 1, 1, 0, 0, 1), # (1, 1, 0, 1, 2, 0), # (1, 1, 0, 1, 0, 0), # (1, 1, 0, 0, 1, 0), @@ -26,10 +26,10 @@ GLOBAL_PARAMS = {} # MCMC GLOBAL_PARAMS.update(dict( run_mcmc = 'True', - burnin = 2500, - nsteps = 10000, + burnin = 250, + nsteps = 1000, nwalkers = 60, - seed = 'None', + seed = 25, mcmc_seed_type = 'uniform' )) @@ -90,9 +90,9 @@ with open(outfile, 'w') as f: f.write('VARS\tjob{0}\tsr0="{1}"\n'.format(job_number, frs[3])) f.write('VARS\tjob{0}\tsr1="{1}"\n'.format(job_number, frs[4])) f.write('VARS\tjob{0}\tsr2="{1}"\n'.format(job_number, frs[5])) - for key in GLOBAL_PARAMS.keys(): - f.write('VARS\tjob{0}\tmr0="{1}"\n'.format(job_number, GLOBAL_PARAMS[key])) - f.write('VARS\tjob{0}\toutfile="{1}"\n'.format(job_number, outfile)) + for key in GLOBAL_PARAMS.iterkeys(): + f.write('VARS\tjob{0}\t{1}="{2}"\n'.format(job_number, key, GLOBAL_PARAMS[key])) + f.write('VARS\tjob{0}\toutfile="{1}"\n'.format(job_number, outchains)) job_number += 1 for frs in full_scan_mfr: @@ -110,7 +110,7 @@ with open(outfile, 'w') as f: f.write('VARS\tjob{0}\tsr0="{1}"\n'.format(job_number, 0)) f.write('VARS\tjob{0}\tsr1="{1}"\n'.format(job_number, 0)) f.write('VARS\tjob{0}\tsr2="{1}"\n'.format(job_number, 0)) - for key in GLOBAL_PARAMS.keys(): - f.write('VARS\tjob{0}\tmr0="{1}"\n'.format(job_number, GLOBAL_PARAMS[key])) - f.write('VARS\tjob{0}\toutfile="{1}"\n'.format(job_number, outfile)) + for key in GLOBAL_PARAMS.iterkeys(): + f.write('VARS\tjob{0}\t{1}="{2}"\n'.format(job_number, key, GLOBAL_PARAMS[key])) + f.write('VARS\tjob{0}\toutfile="{1}"\n'.format(job_number, outchains)) job_number += 1 diff --git a/submitter/sens_dag.py b/submitter/sens_dag.py index 2cecfe9..63aaaba 100644 --- a/submitter/sens_dag.py +++ b/submitter/sens_dag.py @@ -9,9 +9,9 @@ full_scan_mfr = [ 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, 1, 0, 0), + # (1, 1, 1, 0, 1, 0), + # (1, 1, 1, 0, 0, 1), # (1, 1, 0, 1, 2, 0), # (1, 1, 0, 1, 0, 0), # (1, 1, 0, 0, 1, 0), @@ -24,12 +24,13 @@ fix_sfr_mfr = [ GLOBAL_PARAMS = {} # Bayes Factor +sens_eval_bin = 'all' # set to 'all' to run normally GLOBAL_PARAMS.update(dict( sens_run = 'True', - run_method = 'full', - stat_method = 'bayesian', + run_method = 'corr_angle', + stat_method = 'frequentist', sens_bins = 10, - sens_eval_bin = 'all' # set to 'all' to run normally + seed = 'None' )) # MultiNest @@ -69,11 +70,13 @@ GLOBAL_PARAMS.update(dict( plot_statistic = 'True' )) -outfile = 'dagman_FR_SENS.submit' +outfile = 'dagman_FR_SENS_{0}_{1}.submit'.format( + GLOBAL_PARAMS['stat_method'], GLOBAL_PARAMS['run_method'] +) golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit' condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/sens_submit.sub' -if GLOBAL_PARAMS['sens_eval_bin'].lower() != 'all': +if sens_eval_bin.lower() != 'all': if GLOBAL_PARAMS['run_method'].lower() == 'corr_angle': sens_runs = GLOBAL_PARAMS['sens_bins']**2 else: @@ -105,9 +108,9 @@ with open(outfile, 'w') as f: f.write('VARS\tjob{0}\tsr1="{1}"\n'.format(job_number, frs[4])) f.write('VARS\tjob{0}\tsr2="{1}"\n'.format(job_number, frs[5])) f.write('VARS\tjob{0}\tsens_eval_bin="{1}"\n'.format(job_number, r)) - for key in GLOBAL_PARAMS.keys(): - f.write('VARS\tjob{0}\tmr0="{1}"\n'.format(job_number, GLOBAL_PARAMS[key])) - f.write('VARS\tjob{0}\toutfile="{1}"\n'.format(job_number, outfile)) + for key in GLOBAL_PARAMS.iterkeys(): + f.write('VARS\tjob{0}\t{1}="{2}"\n'.format(job_number, key, GLOBAL_PARAMS[key])) + f.write('VARS\tjob{0}\toutfile="{1}"\n'.format(job_number, output)) job_number += 1 for frs in full_scan_mfr: @@ -128,7 +131,7 @@ with open(outfile, 'w') as f: f.write('VARS\tjob{0}\tsr1="{1}"\n'.format(job_number, 0)) f.write('VARS\tjob{0}\tsr2="{1}"\n'.format(job_number, 0)) f.write('VARS\tjob{0}\tsens_eval_bin="{1}"\n'.format(job_number, r)) - for key in GLOBAL_PARAMS.keys(): - f.write('VARS\tjob{0}\tmr0="{1}"\n'.format(job_number, GLOBAL_PARAMS[key])) - f.write('VARS\tjob{0}\toutfile="{1}"\n'.format(job_number, outfile)) + for key in GLOBAL_PARAMS.iterkeys(): + f.write('VARS\tjob{0}\t{1}="{2}"\n'.format(job_number, key, GLOBAL_PARAMS[key])) + f.write('VARS\tjob{0}\toutfile="{1}"\n'.format(job_number, output)) job_number += 1 diff --git a/submitter/sens_submit.sub b/submitter/sens_submit.sub index 1a02608..57a2588 100644 --- a/submitter/sens_submit.sub +++ b/submitter/sens_submit.sub @@ -1,4 +1,4 @@ -Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/fr.py +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)" # All logs will go to a single file |
