add syst variations plots, reintroduce mcmc fr script

4 files changed, 123 insertions, 4 deletions

diff --git a/submitter/contour_dag.py b/submitter/contour_dag.py
index 0dcdf1e..178bf4f 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   = 2000,
-    nsteps   = 10000,
+    burnin   = 1000,
+    nsteps   = 8000,
     nwalkers = 60,
     mcmc_seed_type = 'uniform'
 ))
diff --git a/submitter/fr_dag.py b/submitter/fr_dag.py
new file mode 100644
index 0000000..c1cf11a
--- /dev/null
+++ b/submitter/fr_dag.py
@@ -0,0 +1,81 @@
+#! /usr/bin/env python
+
+import os
+import numpy as np
+
+scenarios = [
+    ((1, 0, 0), 'OUT'),
+    ((0, 1, 0), 'OET')
+]
+
+dims = [
+    6
+]
+
+datadir = '/data/user/smandalia/flavour_ratio/data/fr'
+
+prefix = ''
+# prefix = '_noprior'
+
+golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit'
+condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/fr_submit.sub'
+
+GLOBAL_PARAMS = {}
+
+# General
+GLOBAL_PARAMS.update(dict(
+    threads     = 12,
+    seed        = 26
+))
+
+# FR
+GLOBAL_PARAMS.update(dict(
+    binning = '6e4 1e7 20',
+    no_bsm  = 'False'
+))
+
+# Emcee
+GLOBAL_PARAMS.update(dict(
+    run_mcmc = 'True',
+    burnin   = 500,
+    nsteps   = 2000,
+    nwalkers = 60,
+    mcmc_seed_type = 'uniform'
+))
+
+# GolemFit
+GLOBAL_PARAMS.update(dict(
+    ast  = 'p2_0',
+    data = 'real'
+))
+
+# Plot
+GLOBAL_PARAMS.update(dict(
+    plot_angles   = 'False',
+    plot_elements = 'False',
+))
+
+dagfile = 'dagman_FR_{0}'.format(GLOBAL_PARAMS['data'])
+dagfile += prefix + '.submit'
+
+with open(dagfile, 'w') as f:
+    job_number = 1
+    for dim in dims:
+        print 'dims', dim
+        of_d = datadir + '/DIM{0}/{1}'.format(dim, prefix)
+        for src, tex in scenarios:
+            print 'scenario: src =', src, 'tex =', tex
+            f.write('JOB\tjob{0}\t{1}\n'.format(job_number, condor_script))
+            f.write('VARS\tjob{0}\tdimension="{1}"\n'.format(job_number, dim))
+            f.write('VARS\tjob{0}\ttexture="{1}"\n'.format(job_number, tex))
+            f.write('VARS\tjob{0}\tsr0="{1}"\n'.format(job_number, src[0]))
+            f.write('VARS\tjob{0}\tsr1="{1}"\n'.format(job_number, src[1]))
+            f.write('VARS\tjob{0}\tsr2="{1}"\n'.format(job_number, src[2]))
+            for key in GLOBAL_PARAMS.iterkeys():
+                f.write('VARS\tjob{0}\t{1}="{2}"\n'.format(job_number, key, GLOBAL_PARAMS[key]))
+            f.write('VARS\tjob{0}\tdatadir="{1}"\n'.format(job_number, datadir))
+            job_number += 1
+
+print 'total jobs = {0}'.format(job_number - 1)
+print 'dag file = {0}'.format(dagfile)
+
diff --git a/submitter/fr_submit.sub b/submitter/fr_submit.sub
new file mode 100644
index 0000000..a333ff3
--- /dev/null
+++ b/submitter/fr_submit.sub
@@ -0,0 +1,38 @@
+Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/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 
+log    = /scratch/smandalia/flavour_ratio/submitter/logs/job_$(Cluster).log
+output = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).out
+error  = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).err
+
+getenv = True
+# environment = "X509_USER_PROXY=x509up_u14830" 
+
+request_memory = 8GB
+request_cpus = 12
+
+initialdir = /home/smandalia/condor
+
+Universe        = vanilla 
+Notification    = never 
+
+# +AccountingGroup="quicktest.$ENV(USER)"
+# +AccountingGroup="sanctioned.$ENV(USER)"
+# run on both SL5 and 6
+# +WantRHEL6 = True
+# +WantSLC6 = False
+
+# # run on OSG
+# +WantGlidein = True
+
+# +TransferOutput=""
+
++NATIVE_OS = True
+# Requirements = IS_GLIDEIN && HAS_CVMFS_icecube_opensciencegrid_org && (OpSysAndVer =?= "CentOS6" || OpSysAndVer =?= "RedHat6" || OpSysAndVer =?= "SL6")
+# Requirements = IS_GLIDEIN
+# Requirements = (OpSysMajorVer =?= 6)
+
+# GO! 
+queue
+
diff --git a/submitter/sens_dag.py b/submitter/sens_dag.py
index cbb526a..829c0b3 100644
--- a/submitter/sens_dag.py
+++ b/submitter/sens_dag.py
@@ -98,5 +98,5 @@ with open(dagfile, 'w') as f:
                     f.write('VARS\tjob{0}\tdatadir="{1}"\n'.format(job_number, of_d))
                     job_number += 1
 
-    print 'total jobs = {0}'.format(job_number - 1)
-    print 'dag file = {0}'.format(dagfile)
+print 'total jobs = {0}'.format(job_number - 1)
+print 'dag file = {0}'.format(dagfile)