add test scripts for Golem LV and NSI

2 files changed, 11 insertions, 12 deletions

diff --git a/submitter/make_dag.py b/submitter/make_dag.py
index daddb65..33d05b3 100644
--- a/submitter/make_dag.py
+++ b/submitter/make_dag.py
@@ -36,6 +36,7 @@ nsteps   = 100
 nwalkers = 200
 seed     = 24
 threads  = 1
+mcmc_seed_type = 'uniform'
 
 # FR
 dimension    = [3]
@@ -46,6 +47,9 @@ sigma_ratio  = ['0.01']
 scale        = "1E-20 1E-30"
 scale_region = "1E10"
 
+# Likelihood
+likelihood = 'golemfit'
+
 # Nuisance
 astroDeltaGamma = 2.
 astroNorm       = 1.
@@ -54,11 +58,8 @@ muonNorm        = 1.
 promptNorm      = 0.
 
 # GolemFit
-aft    = 'hesespl'
-ast    = 'baseline'
-axs    = 'nom'
-data   = 'real'
-priors = 'uniform'
+ast  = 'p2_0'
+data = 'real'
 
 # Plot
 plot_angles   = 'True'
@@ -110,14 +111,13 @@ with open(outfile, 'w') as f:
                     f.write('VARS\tjob{0}\tmuonNorm="{1}"\n'.format(job_number, muonNorm))
                     f.write('VARS\tjob{0}\tpromptNorm="{1}"\n'.format(job_number, promptNorm))
                     f.write('VARS\tjob{0}\tdata="{1}"\n'.format(job_number, data))
-                    f.write('VARS\tjob{0}\tpriors="{1}"\n'.format(job_number, priors))
-                    f.write('VARS\tjob{0}\taft="{1}"\n'.format(job_number, aft))
                     f.write('VARS\tjob{0}\tast="{1}"\n'.format(job_number, ast))
-                    f.write('VARS\tjob{0}\taxs="{1}"\n'.format(job_number, axs))
                     f.write('VARS\tjob{0}\tplot_angles="{1}"\n'.format(job_number, plot_angles))
                     f.write('VARS\tjob{0}\tplot_elements="{1}"\n'.format(job_number, plot_elements))
                     f.write('VARS\tjob{0}\tseed="{1}"\n'.format(job_number, seed))
                     f.write('VARS\tjob{0}\tthreads="{1}"\n'.format(job_number, threads))
+                    f.write('VARS\tjob{0}\tlikelihood="{1}"\n'.format(job_number, likelihood))
+                    f.write('VARS\tjob{0}\tmcmc_seed_type="{1}"\n'.format(job_number, mcmc_seed_type))
                     job_number += 1
 
                 for frs in full_scan_mfr:
@@ -151,12 +151,11 @@ with open(outfile, 'w') as f:
                     f.write('VARS\tjob{0}\tmuonNorm="{1}"\n'.format(job_number, muonNorm))
                     f.write('VARS\tjob{0}\tpromptNorm="{1}"\n'.format(job_number, promptNorm))
                     f.write('VARS\tjob{0}\tdata="{1}"\n'.format(job_number, data))
-                    f.write('VARS\tjob{0}\tpriors="{1}"\n'.format(job_number, priors))
-                    f.write('VARS\tjob{0}\taft="{1}"\n'.format(job_number, aft))
                     f.write('VARS\tjob{0}\tast="{1}"\n'.format(job_number, ast))
-                    f.write('VARS\tjob{0}\taxs="{1}"\n'.format(job_number, axs))
                     f.write('VARS\tjob{0}\tplot_angles="{1}"\n'.format(job_number, plot_angles))
                     f.write('VARS\tjob{0}\tplot_elements="{1}"\n'.format(job_number, plot_elements))
                     f.write('VARS\tjob{0}\tseed="{1}"\n'.format(job_number, seed))
                     f.write('VARS\tjob{0}\tthreads="{1}"\n'.format(job_number, threads))
+                    f.write('VARS\tjob{0}\tlikelihood="{1}"\n'.format(job_number, likelihood))
+                    f.write('VARS\tjob{0}\tmcmc_seed_type="{1}"\n'.format(job_number, mcmc_seed_type))
                     job_number += 1
diff --git a/submitter/submit.sub b/submitter/submit.sub
index b57c64c..e932673 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 = "--aft $(aft) --ast $(ast) --astroDeltaGamma $(astroDeltaGamma) --astroNorm $(astroNorm) --axs $(axs) --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) --priors $(priors) --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)"
+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)"
 
 # All logs will go to a single file 
 log    = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).log