diff options
Diffstat (limited to 'submitter')
| -rw-r--r-- | submitter/sens_dag.py | 11 | ||||
| -rw-r--r-- | submitter/sens_submit.sub | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/submitter/sens_dag.py b/submitter/sens_dag.py index be99d8b..0a48baa 100644 --- a/submitter/sens_dag.py +++ b/submitter/sens_dag.py @@ -29,19 +29,20 @@ GLOBAL_PARAMS.update(dict( sens_run = 'True', run_method = 'fixed_angle', # full, fixed_angle, corr_angle stat_method = 'bayesian', - sens_bins = 20, + sens_bins = 10, seed = None )) # MultiNest GLOBAL_PARAMS.update(dict( mn_live_points = 1000, - mn_tolerance = 0.1, + # mn_tolerance = 0.1, + mn_tolerance = 0.3, mn_output = './mnrun' )) # FR -# dimension = [3] +# dimension = [6] # dimension = [3, 6] dimension = [3, 4, 5, 6, 7, 8] GLOBAL_PARAMS.update(dict( @@ -78,6 +79,7 @@ outfile = 'dagman_FR_SENS_{0}_{1}_{2}_{3}'.format( GLOBAL_PARAMS['likelihood'], GLOBAL_PARAMS['data'] ) # outfile += '_seed2' +# outfile += '_tol03' outfile += '.submit' golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit' condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/sens_submit.sub' @@ -102,6 +104,8 @@ with open(outfile, 'w') as f: if GLOBAL_PARAMS['likelihood'].lower() == 'gaussian': output += '{0}/'.format(str(GLOBAL_PARAMS['sigma_ratio']).replace('.', '_')) # output += 'seed2/' + # output += 'mn_noverlap/' + # output += 'tol_03/' for r in xrange(sens_runs): print 'run', r f.write('JOB\tjob{0}\t{1}\n'.format(job_number, condor_script)) @@ -121,6 +125,7 @@ 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 + # break # for frs in full_scan_mfr: # print 'frs', frs diff --git a/submitter/sens_submit.sub b/submitter/sens_submit.sub index 5b34dfd..6c92337 100644 --- a/submitter/sens_submit.sub +++ b/submitter/sens_submit.sub @@ -1,5 +1,5 @@ Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/sens.py -Arguments = "--ast $(ast) --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) --outfile $(outfile) --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) --sens-run $(sens_run) --run-method $(run_method) --stat-method $(stat_method) --sens-bins $(sens_bins) --sens-eval-bin $(sens_eval_bin) --mn-live-points $(mn_live_points) --mn-tolerance $(mn_tolerance) --mn-output $(mn_output) --plot-statistic $(plot_statistic) --fold-index $(fold_index)" +Arguments = "--ast $(ast) --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) --outfile $(outfile) --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) --sens-run $(sens_run) --run-method $(run_method) --stat-method $(stat_method) --sens-bins $(sens_bins) --sens-eval-bin $(sens_eval_bin) --mn-live-points $(mn_live_points) --mn-tolerance $(mn_tolerance) --mn-output $(mn_output) --plot-statistic $(plot_statistic) --fold-index $(fold_index) --save-measured-fr $(save_measured_fr) --output-measured-fr=$(output_measured_fr)" # All logs will go to a single file log = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).log |