From b323b9425d7f4b5968271c5c1acab1f046a7c215 Mon Sep 17 00:00:00 2001 From: shivesh Date: Wed, 14 Mar 2018 16:53:20 -0500 Subject: update submitter script --- .gitignore | 1 + chainer_plot.py | 2 +- mcmc_scan.py | 6 ++-- submitter/make_dag.py | 82 ++++++++++++++++++++++++++------------------------- 4 files changed, 47 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 546aa78..54c046a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ nohup.out *.nfs* plots/ *.pdf +dagman_FR.submit* diff --git a/chainer_plot.py b/chainer_plot.py index 31de5bd..8964bf5 100755 --- a/chainer_plot.py +++ b/chainer_plot.py @@ -19,7 +19,7 @@ from getdist import mcsamples import mcmc_scan -rc('text', usetex=True) +rc('text', usetex=False) rc('font', **{'family':'serif', 'serif':['Computer Modern'], 'size':18}) cols = ['#29A2C6','#FF6D31','#FFCB18','#73B66B','#EF597B', '#333333'] diff --git a/mcmc_scan.py b/mcmc_scan.py index 688345e..90003a9 100755 --- a/mcmc_scan.py +++ b/mcmc_scan.py @@ -552,8 +552,8 @@ def main(): print map(lnprior, p0[0]) if RUN_SCAN: - threads = multiprocessing.cpu_count() - # threads = 1 + # threads = multiprocessing.cpu_count() + threads = 1 sampler = emcee.PTSampler( ntemps, nwalkers, ndim, triangle_llh, lnprior, threads=threads ) @@ -633,7 +633,7 @@ def main(): chainer_plot.plot( infile=outfile+'.npy', angles=True, - outfile=outfile[:5]+outfile[5:].replace('data', 'plots')+'_angles.pdf', + outfile=outfile[:5]+outfile[5:].replace('data', 'plots')+'_angles.pgf', measured_ratio=MEASURED_FR, sigma_ratio=SIGMA, fix_sfr=FIX_SFR, diff --git a/submitter/make_dag.py b/submitter/make_dag.py index a72e67a..849020e 100644 --- a/submitter/make_dag.py +++ b/submitter/make_dag.py @@ -1,5 +1,6 @@ #! /usr/bin/env python +import os import numpy as np a_fr = (1, 2, 0) @@ -15,31 +16,32 @@ 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, 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, 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) ] -sigmas = ['0.1', '0.01'] -dimensions = [6] -energy = [1e4, 1e6, 1e7] +sigmas = ['0.01'] +dimensions = [3] +energy = [1e6] flat = False -burnin = 1000 +burnin = 20 nwalkers = 200 -nsteps = 10000 +nsteps = 100 scales = "1E-20 1E-30" no_bsm = False outfile = 'dagman_FR.submit' -condor_script = '/home/smandalia/Documents/flavour_ratio/submitter/submit.sub' +golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit' +condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/submit.sub' with open(outfile, 'w') as f: job_number = 1 @@ -77,27 +79,27 @@ with open(outfile, 'w') as f: f.write('VARS\tjob{0}\tno_bsm="{1}"\n'.format(job_number, no_bsm)) job_number += 1 - for frs in full_scan_mfr: - print frs - outchains = outchain_head + '/full_scan/{0}/mcmc_chain'.format(str(sig).replace('.', '_')) - 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])) - f.write('VARS\tjob{0}\tmr2="{1}"\n'.format(job_number, frs[2])) - f.write('VARS\tjob{0}\tsigma="{1}"\n'.format(job_number, sig)) - f.write('VARS\tjob{0}\tfix_source_ratio="{1}"\n'.format(job_number, 'False')) - 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)) - f.write('VARS\tjob{0}\tfix_scale="{1}"\n'.format(job_number, 'False')) - f.write('VARS\tjob{0}\tscale="{1}"\n'.format(job_number, 0)) - f.write('VARS\tjob{0}\tdimension="{1}"\n'.format(job_number, dim)) - f.write('VARS\tjob{0}\tenergy="{1}"\n'.format(job_number, en)) - f.write('VARS\tjob{0}\tflat_llh="{1}"\n'.format(job_number, flat)) - f.write('VARS\tjob{0}\tburnin="{1}"\n'.format(job_number, burnin)) - f.write('VARS\tjob{0}\tnwalkers="{1}"\n'.format(job_number, nwalkers)) - f.write('VARS\tjob{0}\tnsteps="{1}"\n'.format(job_number, nsteps)) - f.write('VARS\tjob{0}\toutfile="{1}"\n'.format(job_number, outchains)) - f.write('VARS\tjob{0}\tfix_mixing="{1}"\n'.format(job_number, 'False')) - f.write('VARS\tjob{0}\tno_bsm="{1}"\n'.format(job_number, no_bsm)) - job_number += 1 + # for frs in full_scan_mfr: + # print frs + # outchains = outchain_head + '/full_scan/{0}/mcmc_chain'.format(str(sig).replace('.', '_')) + # 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])) + # f.write('VARS\tjob{0}\tmr2="{1}"\n'.format(job_number, frs[2])) + # f.write('VARS\tjob{0}\tsigma="{1}"\n'.format(job_number, sig)) + # f.write('VARS\tjob{0}\tfix_source_ratio="{1}"\n'.format(job_number, 'False')) + # 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)) + # f.write('VARS\tjob{0}\tfix_scale="{1}"\n'.format(job_number, 'False')) + # f.write('VARS\tjob{0}\tscale="{1}"\n'.format(job_number, 0)) + # f.write('VARS\tjob{0}\tdimension="{1}"\n'.format(job_number, dim)) + # f.write('VARS\tjob{0}\tenergy="{1}"\n'.format(job_number, en)) + # f.write('VARS\tjob{0}\tflat_llh="{1}"\n'.format(job_number, flat)) + # f.write('VARS\tjob{0}\tburnin="{1}"\n'.format(job_number, burnin)) + # f.write('VARS\tjob{0}\tnwalkers="{1}"\n'.format(job_number, nwalkers)) + # f.write('VARS\tjob{0}\tnsteps="{1}"\n'.format(job_number, nsteps)) + # f.write('VARS\tjob{0}\toutfile="{1}"\n'.format(job_number, outchains)) + # f.write('VARS\tjob{0}\tfix_mixing="{1}"\n'.format(job_number, 'False')) + # f.write('VARS\tjob{0}\tno_bsm="{1}"\n'.format(job_number, no_bsm)) + # job_number += 1 -- cgit v1.2.3