Tue Apr 24 11:22:19 CDT 2018

3 files changed, 30 insertions, 28 deletions

diff --git a/submitter/clean.sh b/submitter/clean.sh
index a89f017..bb1443c 100755
--- a/submitter/clean.sh
+++ b/submitter/clean.sh
@@ -4,4 +4,5 @@ rm -f dagman_FR.submit.*
 rm -f dagman_FR_*.submit.*
 rm -f logs/*
 rm -f metaouts/*
-rm -f mnrun/*
+rm -rf mnrun/
+mkdir mnrun
diff --git a/submitter/make_dag.py b/submitter/make_dag.py
index c6e7400..0e41c9a 100644
--- a/submitter/make_dag.py
+++ b/submitter/make_dag.py
@@ -17,29 +17,29 @@ full_scan_mfr = [
 
 fix_sfr_mfr = [
     (1, 1, 1, 1, 2, 0),
+    (1, 1, 1, 1, 0, 0),
+    (1, 1, 1, 0, 1, 0),
+    (1, 1, 1, 0, 0, 1),
     # (1, 1, 0, 1, 2, 0),
-    # (1, 2, 0, 1, 2, 0),
-    # (1, 1, 1, 1, 0, 0),
     # (1, 1, 0, 1, 0, 0),
-    # (1, 0, 0, 1, 0, 0),
-    (1, 1, 1, 0, 1, 0),
     # (1, 1, 0, 0, 1, 0),
+    # (1, 0, 0, 1, 0, 0),
     # (0, 1, 0, 0, 1, 0),
+    # (1, 2, 0, 1, 2, 0),
     # (1, 2, 0, 0, 1, 0),
-    # (1, 1, 1, 0, 0, 1),
 ]
 
 # MCMC
-run_mcmc = 'False'
+run_mcmc = 'True'
 burnin   = 2500
 nsteps   = 10000
 nwalkers = 60
 seed     = 'None'
-threads  = 4
+threads  = 1
 mcmc_seed_type = 'uniform'
 
 # FR
-dimension         = [4, 5, 7, 8]
+dimension         = [3, 6]
 energy            = [1e6]
 no_bsm            = 'False'
 sigma_ratio       = ['0.01']
@@ -52,7 +52,7 @@ fix_mixing        = 'False'
 fix_mixing_almost = 'False'
 
 # Likelihood
-likelihood = 'golemfit'
+likelihood = 'gaussian'
 
 # Nuisance
 convNorm        = 1.
@@ -66,7 +66,7 @@ ast  = 'p2_0'
 data = 'real'
 
 # Bayes Factor
-run_bayes_factor       = 'True'
+run_bayes_factor       = 'False'
 run_angles_limit       = 'False'
 run_angles_correlation = 'False'
 bayes_bins             = 100
@@ -75,13 +75,12 @@ bayes_tolerance        = 0.01
 bayes_eval_bin         = 'all' # set to 'all' to run normally
 
 # Plot
-plot_angles       = 'False'
+plot_angles       = 'True'
 plot_elements     = 'False'
 plot_bayes        = 'False'
 plot_angles_limit = 'False'
 
-outfile = 'dagman_FR_freq_fullscan_otherdims.submit'
-# outfile = 'dagman_FR_bayes_freq.submit'
+outfile = 'dagman_FR.submit'
 golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit'
 condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/submit.sub'
 
@@ -161,18 +160,18 @@ with open(outfile, 'w') as f:
                         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))
-                        f.write('VARS\tjob{0}\trun_bayes_factor="{1}"\n'.format(job_number, run_bayes_factor))
-                        f.write('VARS\tjob{0}\tbayes_bins="{1}"\n'.format(job_number, bayes_bins))
-                        f.write('VARS\tjob{0}\tbayes_output="{1}"\n'.format(job_number, bayes_output))
-                        f.write('VARS\tjob{0}\tbayes_live_points="{1}"\n'.format(job_number, bayes_live_points))
-                        f.write('VARS\tjob{0}\tbayes_tolerance="{1}"\n'.format(job_number, bayes_tolerance))
-                        f.write('VARS\tjob{0}\tplot_bayes="{1}"\n'.format(job_number, plot_bayes))
-                        f.write('VARS\tjob{0}\tbayes_eval_bin="{1}"\n'.format(job_number, r))
-                        f.write('VARS\tjob{0}\trun_angles_limit="{1}"\n'.format(job_number, run_angles_limit))
-                        f.write('VARS\tjob{0}\tangles_lim_output="{1}"\n'.format(job_number, angles_lim_output))
-                        f.write('VARS\tjob{0}\tplot_angles_limit="{1}"\n'.format(job_number, plot_angles_limit))
-                        f.write('VARS\tjob{0}\trun_angles_correlation="{1}"\n'.format(job_number, run_angles_correlation))
-                        f.write('VARS\tjob{0}\tangles_corr_output="{1}"\n'.format(job_number, angles_corr_output))
+                        # f.write('VARS\tjob{0}\trun_bayes_factor="{1}"\n'.format(job_number, run_bayes_factor))
+                        # f.write('VARS\tjob{0}\tbayes_bins="{1}"\n'.format(job_number, bayes_bins))
+                        # f.write('VARS\tjob{0}\tbayes_output="{1}"\n'.format(job_number, bayes_output))
+                        # f.write('VARS\tjob{0}\tbayes_live_points="{1}"\n'.format(job_number, bayes_live_points))
+                        # f.write('VARS\tjob{0}\tbayes_tolerance="{1}"\n'.format(job_number, bayes_tolerance))
+                        # f.write('VARS\tjob{0}\tplot_bayes="{1}"\n'.format(job_number, plot_bayes))
+                        # f.write('VARS\tjob{0}\tbayes_eval_bin="{1}"\n'.format(job_number, r))
+                        # f.write('VARS\tjob{0}\trun_angles_limit="{1}"\n'.format(job_number, run_angles_limit))
+                        # f.write('VARS\tjob{0}\tangles_lim_output="{1}"\n'.format(job_number, angles_lim_output))
+                        # f.write('VARS\tjob{0}\tplot_angles_limit="{1}"\n'.format(job_number, plot_angles_limit))
+                        # f.write('VARS\tjob{0}\trun_angles_correlation="{1}"\n'.format(job_number, run_angles_correlation))
+                        # f.write('VARS\tjob{0}\tangles_corr_output="{1}"\n'.format(job_number, angles_corr_output))
                         job_number += 1
 
                 for frs in full_scan_mfr:
diff --git a/submitter/submit.sub b/submitter/submit.sub
index 810ffa0..8e3c5af 100644
--- a/submitter/submit.sub
+++ b/submitter/submit.sub
@@ -1,5 +1,7 @@
 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) --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) --run-bayes-factor $(run_bayes_factor) --bayes-bins $(bayes_bins) --bayes-output $(bayes_output) --bayes-live-points $(bayes_live_points) --plot-bayes $(plot_bayes) --bayes-tolerance $(bayes_tolerance) --bayes-eval-bin $(bayes_eval_bin) --run-angles-limit $(run_angles_limit) --angles-lim-out $(angles_lim_output) --plot-angles-limit $(plot_angles_limit) --run-angles-correlation $(run_angles_correlation) --angles-corr-output $(angles_corr_output)"
+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) --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)"
+
+# --run-bayes-factor $(run_bayes_factor) --bayes-bins $(bayes_bins) --bayes-output $(bayes_output) --bayes-live-points $(bayes_live_points) --plot-bayes $(plot_bayes) --bayes-tolerance $(bayes_tolerance) --bayes-eval-bin $(bayes_eval_bin) --run-angles-limit $(run_angles_limit) --angles-lim-out $(angles_lim_output) --plot-angles-limit $(plot_angles_limit) --run-angles-correlation $(run_angles_correlation) --angles-corr-output $(angles_corr_output)"
 
 # All logs will go to a single file 
 log    = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).log
@@ -17,7 +19,7 @@ getenv = True
 Transfer_output_files = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/metaouts/
 
 request_memory = 1GB
-request_cpus = 1
+request_cpus = 4
 
 Universe        = vanilla 
 Notification    = never