add option to fix all but a single BSM mixing angle

2 files changed, 8 insertions, 5 deletions

diff --git a/submitter/make_dag.py b/submitter/make_dag.py
index 627e3ff..15d195a 100644
--- a/submitter/make_dag.py
+++ b/submitter/make_dag.py
@@ -31,15 +31,15 @@ fix_sfr_mfr = [
 
 # MCMC
 run_mcmc = 'True'
-burnin   = 1000
-nsteps   = 4000
+burnin   = 500
+nsteps   = 2000
 nwalkers = 60
 seed     = 24
 threads  = 4
 mcmc_seed_type = 'uniform'
 
 # FR
-dimension         = [6]
+dimension         = [3, 6]
 energy            = [1e6]
 likelihood        = 'golemfit'
 no_bsm            = 'False'
@@ -50,6 +50,7 @@ energy_dependance = 'spectral'
 spectral_index    = -2
 binning           = [1e4, 1e7, 10]
 fix_mixing        = 'False'
+fix_mixing_almost = 'True'
 
 # Likelihood
 likelihood = 'golemfit'
@@ -69,7 +70,7 @@ data = 'real'
 plot_angles   = 'True'
 plot_elements = 'False'
 
-outfile = 'dagman_FR.submit'
+outfile = 'dagman_FR_fix_mixing_almost.submit'
 golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit'
 condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/submit.sub'
 
@@ -130,6 +131,7 @@ with open(outfile, 'w') as f:
                     f.write('VARS\tjob{0}\tbinning_0="{1}"\n'.format(job_number, binning[0]))
                     f.write('VARS\tjob{0}\tbinning_1="{1}"\n'.format(job_number, binning[1]))
                     f.write('VARS\tjob{0}\tbinning_2="{1}"\n'.format(job_number, binning[2]))
+                    f.write('VARS\tjob{0}\tfix_mixing_almost="{1}"\n'.format(job_number, fix_mixing_almost))
                     job_number += 1
 
                 # for frs in full_scan_mfr:
@@ -175,4 +177,5 @@ with open(outfile, 'w') as f:
                 #     f.write('VARS\tjob{0}\tbinning_0="{1}"\n'.format(job_number, binning[0]))
                 #     f.write('VARS\tjob{0}\tbinning_1="{1}"\n'.format(job_number, binning[1]))
                 #     f.write('VARS\tjob{0}\tbinning_2="{1}"\n'.format(job_number, binning[2]))
+                #     f.write('VARS\tjob{0}\tfix_mixing_almost="{1}"\n'.format(job_number, fix_mixing_almost))
                 #     job_number += 1
diff --git a/submitter/submit.sub b/submitter/submit.sub
index 380a4e9..b984c89 100644
--- a/submitter/submit.sub
+++ b/submitter/submit.sub
@@ -1,5 +1,5 @@
 Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/fr.py
-Arguments = "--ast $(ast) --astroDeltaGamma $(astroDeltaGamma) --astroNorm $(astroNorm) --burnin $(burnin) --convNorm $(convNorm) --data $(data) --dimension $(dimension) --energy $(energy) --fix-mixing $(fix_mixing) --fix-scale $(fix_scale) --fix-source-ratio $(fix_source_ratio) --likelihood $(likelihood) --measured-ratio $(mr0) $(mr1) $(mr2) --muonNorm $(muonNorm) --no-bsm $(no_bsm) --nsteps $(nsteps) --nwalkers $(nwalkers) --outfile $(outfile) --plot-angles $(plot_angles) --plot-elements $(plot_elements) --promptNorm $(promptNorm) --run-mcmc $(run_mcmc) --scale $(scale) --scale-region $(scale_region) --seed $(seed) --sigma-ratio $(sigma_ratio) --source-ratio $(sr0) $(sr1) $(sr2) --threads $(threads) --likelihood $(likelihood) --mcmc-seed-type $(mcmc_seed_type) --energy-dependance $(energy_dependance) --spectral-index $(spectral_index) --binning $(binning_0) $(binning_1) $(binning_2)"
+Arguments = "--ast $(ast) --astroDeltaGamma $(astroDeltaGamma) --astroNorm $(astroNorm) --burnin $(burnin) --convNorm $(convNorm) --data $(data) --dimension $(dimension) --energy $(energy) --fix-mixing $(fix_mixing) --fix-scale $(fix_scale) --fix-source-ratio $(fix_source_ratio) --likelihood $(likelihood) --measured-ratio $(mr0) $(mr1) $(mr2) --muonNorm $(muonNorm) --no-bsm $(no_bsm) --nsteps $(nsteps) --nwalkers $(nwalkers) --outfile $(outfile) --plot-angles $(plot_angles) --plot-elements $(plot_elements) --promptNorm $(promptNorm) --run-mcmc $(run_mcmc) --scale $(scale) --scale-region $(scale_region) --seed $(seed) --sigma-ratio $(sigma_ratio) --source-ratio $(sr0) $(sr1) $(sr2) --threads $(threads) --likelihood $(likelihood) --mcmc-seed-type $(mcmc_seed_type) --energy-dependance $(energy_dependance) --spectral-index $(spectral_index) --binning $(binning_0) $(binning_1) $(binning_2) --fix-mixing-almost $(fix_mixing_almost)"
 
 # All logs will go to a single file 
 log    = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).log