From 0a9dd1a00e0ed2801b2c1a3549ed64e1444a6832 Mon Sep 17 00:00:00 2001
From: shivesh <s.p.mandalia@qmul.ac.uk>
Date: Thu, 26 Sep 2019 12:06:19 -0500
Subject: update plotting, add overwrite option to sens.py

---
 submitter/clean.sh        | 0
 submitter/contour_dag.py  | 2 +-
 submitter/fr_dag.py       | 2 +-
 submitter/sens_dag.py     | 9 +++++----
 submitter/sens_submit.sub | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)
 mode change 100755 => 100644 submitter/clean.sh

(limited to 'submitter')

diff --git a/submitter/clean.sh b/submitter/clean.sh
old mode 100755
new mode 100644
diff --git a/submitter/contour_dag.py b/submitter/contour_dag.py
index 178bf4f..6c87e2f 100644
--- a/submitter/contour_dag.py
+++ b/submitter/contour_dag.py
@@ -29,7 +29,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_dag.py b/submitter/fr_dag.py
index bf8c708..ccfce50 100644
--- a/submitter/fr_dag.py
+++ b/submitter/fr_dag.py
@@ -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/sens_dag.py b/submitter/sens_dag.py
index 5d3d6a3..6001d2c 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
 ]
 
 for i, (xlims, tex) in enumerate(scenarios):
@@ -23,7 +23,7 @@ for i, (xlims, tex) in enumerate(scenarios):
 
 datadir = '/data/user/smandalia/flavour_ratio/data/sensitivity'
 
-prefix = ''
+prefix = '_dim3'
 
 golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit'
 condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/sens_submit.sub'
@@ -34,7 +34,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..d354eb1 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)"
+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
-- 
cgit v1.2.3