diff options
| -rw-r--r-- | submitter/sens_dag.py | 12 | ||||
| -rw-r--r-- | submitter/sens_submit.sub | 2 | ||||
| -rw-r--r-- | utils/param.py | 3 |
3 files changed, 9 insertions, 8 deletions
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 diff --git a/utils/param.py b/utils/param.py index fe0a0a0..749f8d7 100644 --- a/utils/param.py +++ b/utils/param.py @@ -237,7 +237,8 @@ def get_paramsets(args, nuisance_paramset): ]) asimov_paramset = ParamSet(asimov_paramset) - if args.fix_mixing is not MixingScenario.NONE and not args.fix_mixing_almost: + print args.fix_mixing + if args.fix_mixing is MixingScenario.NONE and not args.fix_mixing_almost: tag = ParamTag.MMANGLES llh_paramset.extend([ Param(name='np_s_12^2', value=0.5, ranges=[0., 1.], std=0.2, tex=r'\tilde{s}_{12}^2', tag=tag), |