diff options
Diffstat (limited to 'submitter')
| -rw-r--r-- | submitter/fr_dag.py | 4 | ||||
| -rw-r--r-- | submitter/sens_dag.py | 41 | ||||
| -rw-r--r-- | submitter/sens_submit.sub | 2 |
3 files changed, 19 insertions, 28 deletions
diff --git a/submitter/fr_dag.py b/submitter/fr_dag.py index c1cf11a..b93ad86 100644 --- a/submitter/fr_dag.py +++ b/submitter/fr_dag.py @@ -4,8 +4,8 @@ import os import numpy as np scenarios = [ - ((1, 0, 0), 'OUT'), - ((0, 1, 0), 'OET') + ((0, 1, 0), 'OET'), + ((1, 0, 0), 'OUT') ] dims = [ diff --git a/submitter/sens_dag.py b/submitter/sens_dag.py index 829c0b3..5d3d6a3 100644 --- a/submitter/sens_dag.py +++ b/submitter/sens_dag.py @@ -3,36 +3,27 @@ import os import numpy as np -# sources = [ -# (1, 2, 0), -# (1, 0, 0), -# (0, 1, 0), -# ] - -# XLIMS = (0., 0.3) -XLIMS = (0.89, 1.0) - x_segments = 100 -x_array = np.linspace(0, 1, x_segments) -sources = [] -for x in x_array: - if x >= XLIMS[0] and x <= XLIMS[1]: - sources.append([x, 1-x, 0]) +scenarios = [ + [(0.00, 0.30), 'OET'], + [(0.89, 1.00), 'OUT'] +] dims = [ 6 ] -textures = [ - # 'OET' - 'OUT' -] +for i, (xlims, tex) in enumerate(scenarios): + x_array = np.linspace(0, 1, x_segments) + sources = [] + for x in x_array: + if x >= xlims[0] and x <= xlims[1]: + sources.append([x, 1-x, 0]) + scenarios[i][0] = tuple(sources) datadir = '/data/user/smandalia/flavour_ratio/data/sensitivity' -# prefix = '' -# prefix = '_OET' -prefix = '_OUT' +prefix = '' golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit' condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/sens_submit.sub' @@ -80,10 +71,10 @@ with open(dagfile, 'w') as f: for dim in dims: print 'dims', dim of_d = datadir + '/DIM{0}/{1}'.format(dim, prefix) - for src in sources: - print 'source flavour', src - for tex in textures: - print 'texture', tex + for sources, tex in scenarios: + print 'texture', tex + for src in sources: + print 'source flavour', src for r in xrange(GLOBAL_PARAMS['segments']): 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 6980e8f..7d543d8 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) --no-bsm $(no_bsm) --datadir $(datadir) --seed $(seed) --source-ratio $(sr0) $(sr1) $(sr2) --threads $(threads) --binning $(binning) --texture $(texture) --segments $(segments) --eval-segment $(eval_segment) --stat-method $(stat_method) --mn-live-points $(mn_live_points) --mn-tolerance $(mn_tolerance) --mn_efficiency $(mn_efficiency) --mn-output $(mn_output) --run-mn $(run_mn)" +Arguments = "--ast $(ast) --data $(data) --dimension $(dimension) --no-bsm $(no_bsm) --datadir $(datadir) --seed $(seed) --source-ratio $(sr0) $(sr1) $(sr2) --threads $(threads) --binning $(binning) --texture $(texture) --segments $(segments) --eval-segment $(eval_segment) --stat-method $(stat_method) --mn-live-points $(mn_live_points) --mn-tolerance $(mn_tolerance) --mn-efficiency $(mn_efficiency) --mn-output $(mn_output) --run-mn $(run_mn)" # All logs will go to a single file log = /scratch/smandalia/flavour_ratio/submitter/logs/job_$(Cluster).log |