diff options
Diffstat (limited to 'submitter')
| -rw-r--r-- | submitter/mcmc_dag.py | 44 | ||||
| -rw-r--r-- | submitter/mcmc_submit.sub | 2 | ||||
| -rw-r--r-- | submitter/sens_dag.py | 12 | ||||
| -rw-r--r-- | submitter/sens_submit.sub | 2 |
4 files changed, 30 insertions, 30 deletions
diff --git a/submitter/mcmc_dag.py b/submitter/mcmc_dag.py index 5a44411..1356965 100644 --- a/submitter/mcmc_dag.py +++ b/submitter/mcmc_dag.py @@ -8,8 +8,8 @@ full_scan_mfr = [ ] fix_sfr_mfr = [ - (1, 1, 1, 1, 2, 0), - (1, 1, 1, 1, 0, 0), + # (1, 1, 1, 1, 2, 0), + # (1, 1, 1, 1, 0, 0), (1, 1, 1, 0, 1, 0), # (1, 1, 1, 0, 0, 1), # (1, 1, 0, 1, 2, 0), @@ -44,7 +44,7 @@ GLOBAL_PARAMS.update(dict( scale_region = "1E10", energy_dependance = 'spectral', spectral_index = -2, - fix_mixing = 'T23', + fix_mixing = 'T13', fix_mixing_almost = 'False', fold_index = 'True' )) @@ -100,24 +100,24 @@ with open(outfile, 'w') as f: f.write('VARS\tjob{0}\toutfile="{1}"\n'.format(job_number, outchains)) job_number += 1 - for frs in full_scan_mfr: - print 'frs', frs - outchains = outchain_head + '/full/' - if GLOBAL_PARAMS['likelihood'].lower() == 'gaussian': - outchains += '{0}/'.format(str(GLOBAL_PARAMS['sigma_ratio']).replace('.', '_')) - outchains += 'mcmc_chain' - f.write('JOB\tjob{0}\t{1}\n'.format(job_number, condor_script)) - f.write('VARS\tjob{0}\tdimension="{1}"\n'.format(job_number, dim)) - 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}\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)) - for key in GLOBAL_PARAMS.iterkeys(): - 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 + # for frs in full_scan_mfr: + # print 'frs', frs + # outchains = outchain_head + '/full/' + # if GLOBAL_PARAMS['likelihood'].lower() == 'gaussian': + # outchains += '{0}/'.format(str(GLOBAL_PARAMS['sigma_ratio']).replace('.', '_')) + # outchains += 'mcmc_chain' + # f.write('JOB\tjob{0}\t{1}\n'.format(job_number, condor_script)) + # f.write('VARS\tjob{0}\tdimension="{1}"\n'.format(job_number, dim)) + # 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}\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)) + # for key in GLOBAL_PARAMS.iterkeys(): + # 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 fa36250..f98049c 100644 --- a/submitter/mcmc_submit.sub +++ b/submitter/mcmc_submit.sub @@ -22,7 +22,7 @@ request_cpus = 1 Universe = vanilla Notification = never -+AccountingGroup="sanctioned.$ENV(USER)" +# +AccountingGroup="sanctioned.$ENV(USER)" # run on both SL5 and 6 # +WantRHEL6 = True # +WantSLC6 = False diff --git a/submitter/sens_dag.py b/submitter/sens_dag.py index b3dcda8..47abd59 100644 --- a/submitter/sens_dag.py +++ b/submitter/sens_dag.py @@ -35,15 +35,15 @@ GLOBAL_PARAMS.update(dict( # MultiNest GLOBAL_PARAMS.update(dict( - mn_live_points = 1000, + mn_live_points = 4000, mn_tolerance = 0.1, mn_output = './mnrun' )) # FR -dimension = [3] +# dimension = [3] # dimension = [3, 6] -# dimension = [3, 4, 5, 6, 7, 8] +dimension = [3, 4, 5, 6, 7, 8] GLOBAL_PARAMS.update(dict( threads = 1, binning = '6e4 1e7 20', @@ -65,7 +65,7 @@ GLOBAL_PARAMS.update(dict( # GolemFit GLOBAL_PARAMS.update(dict( ast = 'p2_0', - data = 'realisation' + data = 'real' )) # Plot @@ -77,7 +77,7 @@ outfile = 'dagman_FR_SENS_{0}_{1}_{2}_{3}'.format( GLOBAL_PARAMS['stat_method'], GLOBAL_PARAMS['run_method'], GLOBAL_PARAMS['likelihood'], GLOBAL_PARAMS['data'] ) -outfile += '_seed2' +# outfile += '_seed2' outfile += '.submit' golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit' condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/sens_submit.sub' @@ -101,7 +101,7 @@ with open(outfile, 'w') as f: output = outchain_head + '/fix_ifr/' if GLOBAL_PARAMS['likelihood'].lower() == 'gaussian': output += '{0}/'.format(str(GLOBAL_PARAMS['sigma_ratio']).replace('.', '_')) - output += 'seed2/' + # output += 'seed2/' for r in xrange(sens_runs): print 'run', r f.write('JOB\tjob{0}\t{1}\n'.format(job_number, condor_script)) diff --git a/submitter/sens_submit.sub b/submitter/sens_submit.sub index 5234578..5b34dfd 100644 --- a/submitter/sens_submit.sub +++ b/submitter/sens_submit.sub @@ -22,7 +22,7 @@ request_cpus = 1 Universe = vanilla Notification = never -+AccountingGroup="sanctioned.$ENV(USER)" +# +AccountingGroup="sanctioned.$ENV(USER)" # run on both SL5 and 6 # +WantRHEL6 = True # +WantSLC6 = False |