7 files changed, 20 insertions, 17 deletions
diff --git a/submitter/contour_dag.py b/submitter/contour_dag.py
index 178bf4f..d8e8e49 100644
--- a/submitter/contour_dag.py
+++ b/submitter/contour_dag.py
@@ -28,8 +28,8 @@ GLOBAL_PARAMS.update(dict(
 # Emcee
 GLOBAL_PARAMS.update(dict(
     run_mcmc = 'True',
-    burnin   = 1000,
-    nsteps   = 8000,
+    burnin   = 1500,
+    nsteps   = 15000,
     nwalkers = 60,
     mcmc_seed_type = 'uniform'
 ))
diff --git a/submitter/contour_submit.sub b/submitter/contour_submit.sub
index 45bef9e..e038c44 100644
--- a/submitter/contour_submit.sub
+++ b/submitter/contour_submit.sub
@@ -1,4 +1,4 @@
-Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/contour.py
+Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/scripts/contour.py
 Arguments = "--ast $(ast) --data $(data) --injected-ratio $(ir0) $(ir1) $(ir2) --datadir $(datadir) --seed $(seed) --threads $(threads) --run-mcmc $(run_mcmc) --burnin $(burnin) --nsteps $(nsteps) --nwalkers $(nwalkers) --mcmc-seed-type $(mcmc_seed_type) --plot-angles $(plot_angles) --plot-elements $(plot_elements)"
 
 # All logs will go to a single file 
@@ -12,7 +12,7 @@ getenv = True
 request_memory = 8GB
 request_cpus = 12
 
-initialdir = /home/smandalia/condor
+initialdir = /data/user/smandalia/flavour_ratio/
 
 Universe        = vanilla 
 Notification    = never 
diff --git a/submitter/fr_dag.py b/submitter/fr_dag.py
index bf8c708..d50417c 100644
--- a/submitter/fr_dag.py
+++ b/submitter/fr_dag.py
@@ -9,7 +9,7 @@ scenarios = [
 ]
 
 dims = [
-    6
+    3, 4, 5, 7, 8
 ]
 
 datadir = '/data/user/smandalia/flavour_ratio/data/fr'
@@ -38,7 +38,7 @@ GLOBAL_PARAMS.update(dict(
 GLOBAL_PARAMS.update(dict(
     run_mcmc = 'True',
     burnin   = 1000,
-    nsteps   = 8000,
+    nsteps   = 10000,
     nwalkers = 60,
     mcmc_seed_type = 'uniform'
 ))
diff --git a/submitter/fr_submit.sub b/submitter/fr_submit.sub
index a333ff3..5ad5a4a 100644
--- a/submitter/fr_submit.sub
+++ b/submitter/fr_submit.sub
@@ -1,4 +1,4 @@
-Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/fr.py
+Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/scripts/fr.py
 Arguments = "--ast $(ast) --data $(data) --source-ratio $(sr0) $(sr1) $(sr2) --datadir $(datadir) --seed $(seed) --threads $(threads) --run-mcmc $(run_mcmc) --burnin $(burnin) --nsteps $(nsteps) --nwalkers $(nwalkers) --mcmc-seed-type $(mcmc_seed_type) --plot-angles $(plot_angles) --plot-elements $(plot_elements) --dimension $(dimension) --texture $(texture) --no-bsm $(no_bsm) --binning $(binning)"
 
 # All logs will go to a single file 
@@ -12,7 +12,7 @@ getenv = True
 request_memory = 8GB
 request_cpus = 12
 
-initialdir = /home/smandalia/condor
+initialdir = /data/user/smandalia/flavour_ratio/
 
 Universe        = vanilla 
 Notification    = never 
diff --git a/submitter/mc_texture_submit.sub b/submitter/mc_texture_submit.sub
index 7dccb81..c4aa985 100644
--- a/submitter/mc_texture_submit.sub
+++ b/submitter/mc_texture_submit.sub
@@ -1,4 +1,4 @@
-Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/mc_texture.py
+Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/scripts/mc_texture.py
 Arguments = "--source-ratio $(sr0) $(sr1) $(sr2) --datadir $(datadir) --seed $(seed) --threads $(threads) --run-mcmc $(run_mcmc) --burnin $(burnin) --nsteps $(nsteps) --nwalkers $(nwalkers) --mcmc-seed-type $(mcmc_seed_type) --plot-angles $(plot_angles) --plot-elements $(plot_elements) --binning $(binning) --dimension $(dimension) --no-bsm $(no_bsm) --texture $(texture)"
 
 # All logs will go to a single file 
@@ -12,7 +12,7 @@ getenv = True
 request_memory = 8GB
 request_cpus = 1
 
-initialdir = /home/smandalia/condor
+initialdir = /data/user/smandalia/flavour_ratio/
 
 Universe        = vanilla 
 Notification    = never 
diff --git a/submitter/sens_dag.py b/submitter/sens_dag.py
index 5d3d6a3..f23bf3d 100644
--- a/submitter/sens_dag.py
+++ b/submitter/sens_dag.py
@@ -6,11 +6,11 @@ import numpy as np
 x_segments = 100
 scenarios = [
     [(0.00, 0.30), 'OET'],
-    [(0.89, 1.00), 'OUT']
+    [(0.70, 1.00), 'OUT']
 ]
 
 dims = [
-    6
+    3, 6
 ]
 
 for i, (xlims, tex) in enumerate(scenarios):
@@ -23,7 +23,9 @@ for i, (xlims, tex) in enumerate(scenarios):
 
 datadir = '/data/user/smandalia/flavour_ratio/data/sensitivity'
 
-prefix = ''
+# prefix = ''
+prefix = '_d36'
+# prefix = '_kfarrag'
 
 golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit'
 condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/sens_submit.sub'
@@ -34,7 +36,8 @@ GLOBAL_PARAMS = {}
 GLOBAL_PARAMS.update(dict(
     stat_method = 'bayesian',
     segments    = 10,
-    seed        = 26
+    seed        = 26,
+    overwrite   = 'False'
 ))
 
 # MultiNest
diff --git a/submitter/sens_submit.sub b/submitter/sens_submit.sub
index 7d543d8..e8355a6 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)"
+Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/scripts/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) --overwrite $(overwrite)"
 
 # All logs will go to a single file 
 log    = /scratch/smandalia/flavour_ratio/submitter/logs/job_$(Cluster).log
@@ -12,7 +12,7 @@ getenv = True
 request_memory = 3GB
 request_cpus = 1
 
-initialdir = /home/smandalia/condor
+initialdir = /data/user/smandalia/flavour_ratio/
 
 Universe        = vanilla 
 Notification    = never