diff options
| author | shivesh <s.p.mandalia@qmul.ac.uk> | 2018-03-19 18:37:56 -0500 |
|---|---|---|
| committer | shivesh <s.p.mandalia@qmul.ac.uk> | 2018-03-19 18:37:56 -0500 |
| commit | a6ced28fe29f5dc82108f14e310a0c6b5f04b3c7 (patch) | |
| tree | 3af32e2953c79d64c11ca1d6e4ba98e300476fc7 /submitter | |
| parent | 38df6facfecb16cc24f829770aff77d24050f7f4 (diff) | |
| download | GolemFlavor-a6ced28fe29f5dc82108f14e310a0c6b5f04b3c7.tar.gz GolemFlavor-a6ced28fe29f5dc82108f14e310a0c6b5f04b3c7.zip | |
bug fixes
Diffstat (limited to 'submitter')
| -rw-r--r-- | submitter/make_dag.py | 10 | ||||
| -rw-r--r-- | submitter/submit.sub | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/submitter/make_dag.py b/submitter/make_dag.py index ccd1fee..daddb65 100644 --- a/submitter/make_dag.py +++ b/submitter/make_dag.py @@ -75,7 +75,7 @@ with open(outfile, 'w') as f: for en in energy: print 'energy {0:.0E}'.format(en) - outchain_head = '/data/user/smandalia/flavour_ratio/data/DIM{0}/{1:.0E}'.format(dim, en) + outchain_head = '/data/user/smandalia/flavour_ratio/data/{0}/DIM{1}/{2:.0E}'.format(likelihood, dim, en) for sig in sigma_ratio: print 'sigma', sig @@ -109,11 +109,15 @@ with open(outfile, 'w') as f: f.write('VARS\tjob{0}\tconvNorm="{1}"\n'.format(job_number, convNorm)) f.write('VARS\tjob{0}\tmuonNorm="{1}"\n'.format(job_number, muonNorm)) f.write('VARS\tjob{0}\tpromptNorm="{1}"\n'.format(job_number, promptNorm)) + f.write('VARS\tjob{0}\tdata="{1}"\n'.format(job_number, data)) + f.write('VARS\tjob{0}\tpriors="{1}"\n'.format(job_number, priors)) f.write('VARS\tjob{0}\taft="{1}"\n'.format(job_number, aft)) f.write('VARS\tjob{0}\tast="{1}"\n'.format(job_number, ast)) f.write('VARS\tjob{0}\taxs="{1}"\n'.format(job_number, axs)) f.write('VARS\tjob{0}\tplot_angles="{1}"\n'.format(job_number, plot_angles)) f.write('VARS\tjob{0}\tplot_elements="{1}"\n'.format(job_number, plot_elements)) + f.write('VARS\tjob{0}\tseed="{1}"\n'.format(job_number, seed)) + f.write('VARS\tjob{0}\tthreads="{1}"\n'.format(job_number, threads)) job_number += 1 for frs in full_scan_mfr: @@ -146,9 +150,13 @@ with open(outfile, 'w') as f: f.write('VARS\tjob{0}\tconvNorm="{1}"\n'.format(job_number, convNorm)) f.write('VARS\tjob{0}\tmuonNorm="{1}"\n'.format(job_number, muonNorm)) f.write('VARS\tjob{0}\tpromptNorm="{1}"\n'.format(job_number, promptNorm)) + f.write('VARS\tjob{0}\tdata="{1}"\n'.format(job_number, data)) + f.write('VARS\tjob{0}\tpriors="{1}"\n'.format(job_number, priors)) f.write('VARS\tjob{0}\taft="{1}"\n'.format(job_number, aft)) f.write('VARS\tjob{0}\tast="{1}"\n'.format(job_number, ast)) f.write('VARS\tjob{0}\taxs="{1}"\n'.format(job_number, axs)) f.write('VARS\tjob{0}\tplot_angles="{1}"\n'.format(job_number, plot_angles)) f.write('VARS\tjob{0}\tplot_elements="{1}"\n'.format(job_number, plot_elements)) + f.write('VARS\tjob{0}\tseed="{1}"\n'.format(job_number, seed)) + f.write('VARS\tjob{0}\tthreads="{1}"\n'.format(job_number, threads)) job_number += 1 diff --git a/submitter/submit.sub b/submitter/submit.sub index 07c0a85..b57c64c 100644 --- a/submitter/submit.sub +++ b/submitter/submit.sub @@ -1,10 +1,10 @@ -Executable = /home/smandalia/Documents/flavour_ratio/mcmc_scan.py +Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/fr.py Arguments = "--aft $(aft) --ast $(ast) --astroDeltaGamma $(astroDeltaGamma) --astroNorm $(astroNorm) --axs $(axs) --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) --priors $(priors) --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)" # All logs will go to a single file -log = /home/smandalia/Documents/flavour_ratio/submitter/logs/job_$(Cluster).log -output = /home/smandalia/Documents/flavour_ratio/submitter/logs/job_$(Cluster).out -error = /home/smandalia/Documents/flavour_ratio/submitter/logs/job_$(Cluster).err +log = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).log +output = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).out +error = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).err getenv = True # environment = "X509_USER_PROXY=x509up_u14830" |