diff options
Diffstat (limited to 'submitter')
| -rwxr-xr-x | submitter/clean.sh | 5 | ||||
| -rw-r--r-- | submitter/make_dag.py | 55 | ||||
| -rw-r--r-- | submitter/submit.sub | 7 |
3 files changed, 48 insertions, 19 deletions
diff --git a/submitter/clean.sh b/submitter/clean.sh new file mode 100755 index 0000000..edf0eea --- /dev/null +++ b/submitter/clean.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +rm -f dagman_FR.submit.* +rm -f logs/* +rm -f metaouts/* diff --git a/submitter/make_dag.py b/submitter/make_dag.py index 735d213..641e00e 100644 --- a/submitter/make_dag.py +++ b/submitter/make_dag.py @@ -16,30 +16,30 @@ full_scan_mfr = [ ] fix_sfr_mfr = [ - (1, 1, 1, 1, 0, 0), - (1, 1, 1, 0, 1, 0), - (1, 1, 1, 0, 0, 1), (1, 1, 1, 1, 2, 0), - (1, 1, 0, 0, 1, 0), - (1, 1, 0, 1, 2, 0), - (1, 1, 0, 1, 0, 0), - (1, 0, 0, 1, 0, 0), - (0, 1, 0, 0, 1, 0), - (1, 2, 0, 0, 1, 0), - (1, 2, 0, 1, 2, 0) + # (1, 1, 0, 1, 2, 0), + # (1, 2, 0, 1, 2, 0), + # (1, 1, 1, 1, 0, 0), + # (1, 1, 0, 1, 0, 0), + # (1, 0, 0, 1, 0, 0), + # (1, 1, 1, 0, 1, 0), + # (1, 1, 0, 0, 1, 0), + # (0, 1, 0, 0, 1, 0), + # (1, 2, 0, 0, 1, 0), + # (1, 1, 1, 0, 0, 1), ] # MCMC -run_mcmc = 'True' +run_mcmc = 'False' burnin = 500 nsteps = 2000 nwalkers = 60 seed = 24 -threads = 4 +threads = 12 mcmc_seed_type = 'uniform' # FR -dimension = [4, 5, 7, 8] +dimension = [3, 6] energy = [1e6] likelihood = 'golemfit' no_bsm = 'False' @@ -66,9 +66,15 @@ promptNorm = 0. ast = 'p2_0' data = 'real' +# Bayes Factor +run_bayes_factor = 'True' +bayes_bins = 10 +bayes_live_points = 200 + # Plot -plot_angles = 'True' +plot_angles = 'False' plot_elements = 'False' +plot_bayes = 'True' outfile = 'dagman_FR.submit' golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit' @@ -86,11 +92,15 @@ with open(outfile, 'w') as f: elif energy_dependance == 'spectral': outchain_head = '/data/user/smandalia/flavour_ratio/data/{0}/DIM{1}/SI_{2}'.format(likelihood, dim, spectral_index) + bayes_output = 'None' for sig in sigma_ratio: print 'sigma', sig for frs in fix_sfr_mfr: print frs - outchains = outchain_head + '/fix_ifr/{0}/mcmc_chain'.format(str(sig).replace('.', '_')) + outchains = outchain_head + '/fix_ifr/{0}/'.format(str(sig).replace('.', '_')) + if run_bayes_factor == 'True': + bayes_output = outchains + '/bayes_factor/' + outchains += 'mcmc_chain' f.write('JOB\tjob{0}\t{1}\n'.format(job_number, condor_script)) f.write('VARS\tjob{0}\tmr0="{1}"\n'.format(job_number, frs[0])) f.write('VARS\tjob{0}\tmr1="{1}"\n'.format(job_number, frs[1])) @@ -132,11 +142,19 @@ with open(outfile, 'w') as f: f.write('VARS\tjob{0}\tbinning_1="{1}"\n'.format(job_number, binning[1])) f.write('VARS\tjob{0}\tbinning_2="{1}"\n'.format(job_number, binning[2])) f.write('VARS\tjob{0}\tfix_mixing_almost="{1}"\n'.format(job_number, fix_mixing_almost)) + f.write('VARS\tjob{0}\trun_bayes_factor="{1}"\n'.format(job_number, run_bayes_factor)) + f.write('VARS\tjob{0}\tbayes_bins="{1}"\n'.format(job_number, bayes_bins)) + f.write('VARS\tjob{0}\tbayes_output="{1}"\n'.format(job_number, bayes_output)) + f.write('VARS\tjob{0}\tbayes_live_points="{1}"\n'.format(job_number, bayes_live_points)) + f.write('VARS\tjob{0}\tplot_bayes="{1}"\n'.format(job_number, plot_bayes)) job_number += 1 # for frs in full_scan_mfr: # print frs - # outchains = outchain_head + '/full_scan/{0}/mcmc_chain'.format(str(sig).replace('.', '_')) + # outchains = outchain_head + '/full_scan/{0}'.format(str(sig).replace('.', '_')) + # if run_bayes_factor == 'True': + # bayes_output = outchains + '/bayes_factor/' + # outchains += 'mcmc_chain' # f.write('JOB\tjob{0}\t{1}\n'.format(job_number, condor_script)) # f.write('VARS\tjob{0}\tmr0="{1}"\n'.format(job_number, frs[0])) # f.write('VARS\tjob{0}\tmr1="{1}"\n'.format(job_number, frs[1])) @@ -178,4 +196,9 @@ with open(outfile, 'w') as f: # f.write('VARS\tjob{0}\tbinning_1="{1}"\n'.format(job_number, binning[1])) # f.write('VARS\tjob{0}\tbinning_2="{1}"\n'.format(job_number, binning[2])) # f.write('VARS\tjob{0}\tfix_mixing_almost="{1}"\n'.format(job_number, fix_mixing_almost)) + # f.write('VARS\tjob{0}\trun_bayes_factor="{1}"\n'.format(job_number, run_bayes_factor)) + # f.write('VARS\tjob{0}\tbayes_bins="{1}"\n'.format(job_number, bayes_bins)) + # f.write('VARS\tjob{0}\tbayes_output="{1}"\n'.format(job_number, bayes_output)) + # f.write('VARS\tjob{0}\tbayes_live_points="{1}"\n'.format(job_number, bayes_live_points)) + # f.write('VARS\tjob{0}\tplot_bayes="{1}"\n'.format(job_number, plot_bayes)) # job_number += 1 diff --git a/submitter/submit.sub b/submitter/submit.sub index b984c89..e563924 100644 --- a/submitter/submit.sub +++ b/submitter/submit.sub @@ -1,5 +1,5 @@ Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/fr.py -Arguments = "--ast $(ast) --astroDeltaGamma $(astroDeltaGamma) --astroNorm $(astroNorm) --burnin $(burnin) --convNorm $(convNorm) --data $(data) --dimension $(dimension) --energy $(energy) --fix-mixing $(fix_mixing) --fix-scale $(fix_scale) --fix-source-ratio $(fix_source_ratio) --likelihood $(likelihood) --measured-ratio $(mr0) $(mr1) $(mr2) --muonNorm $(muonNorm) --no-bsm $(no_bsm) --nsteps $(nsteps) --nwalkers $(nwalkers) --outfile $(outfile) --plot-angles $(plot_angles) --plot-elements $(plot_elements) --promptNorm $(promptNorm) --run-mcmc $(run_mcmc) --scale $(scale) --scale-region $(scale_region) --seed $(seed) --sigma-ratio $(sigma_ratio) --source-ratio $(sr0) $(sr1) $(sr2) --threads $(threads) --likelihood $(likelihood) --mcmc-seed-type $(mcmc_seed_type) --energy-dependance $(energy_dependance) --spectral-index $(spectral_index) --binning $(binning_0) $(binning_1) $(binning_2) --fix-mixing-almost $(fix_mixing_almost)" +Arguments = "--ast $(ast) --astroDeltaGamma $(astroDeltaGamma) --astroNorm $(astroNorm) --burnin $(burnin) --convNorm $(convNorm) --data $(data) --dimension $(dimension) --energy $(energy) --fix-mixing $(fix_mixing) --fix-scale $(fix_scale) --fix-source-ratio $(fix_source_ratio) --likelihood $(likelihood) --measured-ratio $(mr0) $(mr1) $(mr2) --muonNorm $(muonNorm) --no-bsm $(no_bsm) --nsteps $(nsteps) --nwalkers $(nwalkers) --outfile $(outfile) --plot-angles $(plot_angles) --plot-elements $(plot_elements) --promptNorm $(promptNorm) --run-mcmc $(run_mcmc) --scale $(scale) --scale-region $(scale_region) --seed $(seed) --sigma-ratio $(sigma_ratio) --source-ratio $(sr0) $(sr1) $(sr2) --threads $(threads) --likelihood $(likelihood) --mcmc-seed-type $(mcmc_seed_type) --energy-dependance $(energy_dependance) --spectral-index $(spectral_index) --binning $(binning_0) $(binning_1) $(binning_2) --fix-mixing-almost $(fix_mixing_almost) --run-bayes-factor $(run_bayes_factor) --bayes-bins $(bayes_bins) --bayes-output $(bayes_output) --bayes-live-points $(bayes_live_points) --plot-bayes $(plot_bayes)" # All logs will go to a single file log = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).log @@ -14,9 +14,10 @@ getenv = True # but do not try to copy outputs back (see: https://htcondor-wiki.cs.wisc.edu/index.cgi/tktview?tn=3081) # +TransferOutput="" +transfer_output_files = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/metaouts/ -request_memory = 5GB -request_cpus = 4 +request_memory = 30GB +request_cpus = 12 Universe = vanilla Notification = never |