diff options
Diffstat (limited to 'submitter')
| -rw-r--r-- | submitter/make_dag.py | 13 | ||||
| -rw-r--r-- | submitter/submit.sub | 6 |
2 files changed, 14 insertions, 5 deletions
diff --git a/submitter/make_dag.py b/submitter/make_dag.py index be13ac8..53878a2 100644 --- a/submitter/make_dag.py +++ b/submitter/make_dag.py @@ -35,7 +35,7 @@ burnin = 500 nsteps = 2000 nwalkers = 60 seed = 24 -threads = 4 +threads = 1 mcmc_seed_type = 'uniform' # FR @@ -68,6 +68,7 @@ data = 'real' # Bayes Factor run_bayes_factor = 'False' +run_angles_limit = 'True' bayes_bins = 10 bayes_live_points = 200 bayes_tolerance = 0.01 @@ -78,7 +79,7 @@ plot_angles = 'False' plot_elements = 'False' plot_bayes = 'False' -outfile = 'dagman_FR.submit' +outfile = 'dagman_FR_angles_limit.submit' golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit' condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/submit.sub' @@ -105,6 +106,8 @@ with open(outfile, 'w') as f: outchains = outchain_head + '/fix_ifr/{0}/'.format(str(sig).replace('.', '_')) if run_bayes_factor == 'True': bayes_output = outchains + '/bayes_factor/' + if run_angles_limit == 'True': + angles_lim_output = outchains + '/angles_limit/' outchains += 'mcmc_chain' for r in range(b_runs): print 'run', r @@ -156,6 +159,8 @@ with open(outfile, 'w') as f: f.write('VARS\tjob{0}\tbayes_tolerance="{1}"\n'.format(job_number, bayes_tolerance)) f.write('VARS\tjob{0}\tplot_bayes="{1}"\n'.format(job_number, plot_bayes)) f.write('VARS\tjob{0}\tbayes_eval_bin="{1}"\n'.format(job_number, r)) + f.write('VARS\tjob{0}\trun_angles_limit="{1}"\n'.format(job_number, run_angles_limit)) + f.write('VARS\tjob{0}\tangles_lim_output="{1}"\n'.format(job_number, angles_lim_output)) job_number += 1 for frs in full_scan_mfr: @@ -163,6 +168,8 @@ with open(outfile, 'w') as f: outchains = outchain_head + '/full_scan/{0}'.format(str(sig).replace('.', '_')) if run_bayes_factor == 'True': bayes_output = outchains + '/bayes_factor/' + if run_angles_limit == 'True': + angles_lim_output = outchains + '/angles_limit/' outchains += 'mcmc_chain' for r in range(b_runs): print 'run', r @@ -214,4 +221,6 @@ with open(outfile, 'w') as f: f.write('VARS\tjob{0}\tbayes_tolerance="{1}"\n'.format(job_number, bayes_tolerance)) f.write('VARS\tjob{0}\tplot_bayes="{1}"\n'.format(job_number, plot_bayes)) f.write('VARS\tjob{0}\tbayes_eval_bin="{1}"\n'.format(job_number, r)) + f.write('VARS\tjob{0}\trun_angles_limit="{1}"\n'.format(job_number, run_angles_limit)) + f.write('VARS\tjob{0}\tangles_lim_output="{1}"\n'.format(job_number, angles_lim_output)) job_number += 1 diff --git a/submitter/submit.sub b/submitter/submit.sub index e9e66bd..d232097 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) --run-bayes-factor $(run_bayes_factor) --bayes-bins $(bayes_bins) --bayes-output $(bayes_output) --bayes-live-points $(bayes_live_points) --plot-bayes $(plot_bayes) --bayes-tolerance $(bayes_tolerance) --bayes-eval-bin $(bayes_eval_bin)" +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) --bayes-tolerance $(bayes_tolerance) --bayes-eval-bin $(bayes_eval_bin) --run-angles-limit $(run_angles_limit) --angles-lim-out $(angles_lim_output)" # All logs will go to a single file log = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).log @@ -16,8 +16,8 @@ getenv = True # +TransferOutput="" transfer_output_files = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/metaouts/ -request_memory = 30GB -request_cpus = 4 +request_memory = 10GB +request_cpus = 1 Universe = vanilla Notification = never |