From 932a8691e16eb904e3eec61daae08d72c2039f10 Mon Sep 17 00:00:00 2001 From: shivesh Date: Sun, 6 May 2018 21:22:47 -0500 Subject: Sun May 6 21:22:46 CDT 2018 --- submitter/mcmc_dag.py | 7 +++++-- submitter/mcmc_submit.sub | 6 +++--- submitter/sens_dag.py | 21 +++++++++++++-------- submitter/sens_submit.sub | 4 ++-- 4 files changed, 23 insertions(+), 15 deletions(-) (limited to 'submitter') diff --git a/submitter/mcmc_dag.py b/submitter/mcmc_dag.py index 7f6eae6..d06e920 100644 --- a/submitter/mcmc_dag.py +++ b/submitter/mcmc_dag.py @@ -35,6 +35,7 @@ GLOBAL_PARAMS.update(dict( # FR dimension = [3, 6] +# dimension = [4, 5, 7, 8] GLOBAL_PARAMS.update(dict( threads = 1, binning = '1e4 1e7 5', @@ -44,7 +45,7 @@ GLOBAL_PARAMS.update(dict( spectral_index = -2, fix_mixing = 'False', fix_mixing_almost = 'False', - fold_index = 'False' + fold_index = 'True' )) # Likelihood @@ -65,7 +66,7 @@ GLOBAL_PARAMS.update(dict( plot_elements = 'False', )) -outfile = 'dagman_FR_MCMC.submit' +outfile = 'dagman_FR_MCMC_{0}.submit'.format(GLOBAL_PARAMS['likelihood']) golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit' condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/mcmc_submit.sub' @@ -115,3 +116,5 @@ with open(outfile, 'w') as f: 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 + + print 'dag file = {0}'.format(outfile) diff --git a/submitter/mcmc_submit.sub b/submitter/mcmc_submit.sub index f006350..c565205 100644 --- a/submitter/mcmc_submit.sub +++ b/submitter/mcmc_submit.sub @@ -1,5 +1,5 @@ Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/fr.py -Arguments = "--ast $(ast) --burnin $(burnin) --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) --nsteps $(nsteps) --nwalkers $(nwalkers) --outfile $(outfile) --plot-angles $(plot_angles) --plot-elements $(plot_elements) --run-mcmc $(run_mcmc) --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) --fold-index $(fold_index)" +Arguments = "--ast $(ast) --burnin $(burnin) --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) --nsteps $(nsteps) --nwalkers $(nwalkers) --outfile $(outfile) --plot-angles $(plot_angles) --plot-elements $(plot_elements) --run-mcmc $(run_mcmc) --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) --fold-index $(fold_index) --mcmc-seed-type $(mcmc_seed_type)" # All logs will go to a single file log = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).log @@ -16,7 +16,7 @@ getenv = True # +TransferOutput="" Transfer_output_files = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/metaouts/ -request_memory = 2GB +request_memory = 3GB request_cpus = 1 Universe = vanilla @@ -33,7 +33,7 @@ Notification = never # Requirements = IS_GLIDEIN && HAS_CVMFS_icecube_opensciencegrid_org && (OpSysAndVer =?= "CentOS6" || OpSysAndVer =?= "RedHat6" || OpSysAndVer =?= "SL6") # Requirements = IS_GLIDEIN -# Requirements = (OpSysMajorVer =?= 6) +Requirements = (OpSysMajorVer =?= 6) # GO! queue diff --git a/submitter/sens_dag.py b/submitter/sens_dag.py index 17b063d..00be770 100644 --- a/submitter/sens_dag.py +++ b/submitter/sens_dag.py @@ -27,21 +27,23 @@ GLOBAL_PARAMS = {} sens_eval_bin = 'all' # set to 'all' to run normally GLOBAL_PARAMS.update(dict( sens_run = 'True', - run_method = 'fixed_angle', # full, fixed_angle, corr_angle + run_method = 'full', # full, fixed_angle, corr_angle stat_method = 'frequentist', - sens_bins = 10, + sens_bins = 40, seed = 'None' )) # MultiNest GLOBAL_PARAMS.update(dict( - mn_live_points = 400, + mn_live_points = 800, mn_tolerance = 0.01, mn_output = './mnrun' )) # FR -dimension = [3, 6] +# dimension = [3, 6] +dimension = [4, 5, 7, 8] +# dimension = [3, 4, 5, 6, 7, 8] GLOBAL_PARAMS.update(dict( threads = 1, binning = '1e4 1e7 5', @@ -50,12 +52,13 @@ GLOBAL_PARAMS.update(dict( energy_dependance = 'spectral', spectral_index = -2, fix_mixing = 'False', - fix_mixing_almost = 'False' + fix_mixing_almost = 'False', + fold_index = 'False' )) # Likelihood GLOBAL_PARAMS.update(dict( - likelihood = 'golemfit', + likelihood = 'gaussian', sigma_ratio = '0.01' )) @@ -70,8 +73,8 @@ GLOBAL_PARAMS.update(dict( plot_statistic = 'True' )) -outfile = 'dagman_FR_SENS_{0}_{1}.submit'.format( - GLOBAL_PARAMS['stat_method'], GLOBAL_PARAMS['run_method'] +outfile = 'dagman_FR_SENS_{0}_{1}_{2}.submit'.format( + GLOBAL_PARAMS['stat_method'], GLOBAL_PARAMS['run_method'], GLOBAL_PARAMS['likelihood'] ) golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit' condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/sens_submit.sub' @@ -141,3 +144,5 @@ with open(outfile, 'w') as f: 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 + + print 'dag file = {0}'.format(outfile) diff --git a/submitter/sens_submit.sub b/submitter/sens_submit.sub index 44ec0a3..f3a3e4c 100644 --- a/submitter/sens_submit.sub +++ b/submitter/sens_submit.sub @@ -16,7 +16,7 @@ getenv = True # +TransferOutput="" Transfer_output_files = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/metaouts/ -request_memory = 1GB +request_memory = 3GB request_cpus = 1 Universe = vanilla @@ -33,7 +33,7 @@ Notification = never # Requirements = IS_GLIDEIN && HAS_CVMFS_icecube_opensciencegrid_org && (OpSysAndVer =?= "CentOS6" || OpSysAndVer =?= "RedHat6" || OpSysAndVer =?= "SL6") # Requirements = IS_GLIDEIN -# Requirements = (OpSysMajorVer =?= 6) +Requirements = (OpSysMajorVer =?= 6) # GO! queue -- cgit v1.2.3