update submitter script

1 files changed, 42 insertions, 40 deletions

diff --git a/submitter/make_dag.py b/submitter/make_dag.py
index a72e67a..849020e 100644
--- a/submitter/make_dag.py
+++ b/submitter/make_dag.py
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
 
+import os
 import numpy as np
 
 a_fr = (1, 2, 0)
@@ -15,31 +16,32 @@ full_scan_mfr = [
 ]
 
 fix_sfr_mfr = [
-    (1, 1, 1, 1, 0, 0),
-    (1, 1, 1, 0, 1, 0),
-    (1, 1, 1, 0, 0, 1),
+    # (1, 1, 1, 1, 0, 0),
+    # (1, 1, 1, 0, 1, 0),
+    # (1, 1, 1, 0, 0, 1),
     (1, 1, 1, 1, 2, 0),
-    (1, 1, 0, 0, 1, 0),
-    (1, 1, 0, 1, 2, 0),
-    (1, 1, 0, 1, 0, 0),
-    (1, 0, 0, 1, 0, 0),
-    (0, 1, 0, 0, 1, 0),
-    (1, 2, 0, 0, 1, 0),
-    (1, 2, 0, 1, 2, 0)
+    # (1, 1, 0, 0, 1, 0),
+    # (1, 1, 0, 1, 2, 0),
+    # (1, 1, 0, 1, 0, 0),
+    # (1, 0, 0, 1, 0, 0),
+    # (0, 1, 0, 0, 1, 0),
+    # (1, 2, 0, 0, 1, 0),
+    # (1, 2, 0, 1, 2, 0)
 ]
 
-sigmas = ['0.1', '0.01']
-dimensions = [6]
-energy = [1e4, 1e6, 1e7]
+sigmas = ['0.01']
+dimensions = [3]
+energy = [1e6]
 flat = False
-burnin = 1000
+burnin = 20
 nwalkers = 200
-nsteps = 10000
+nsteps = 100
 scales = "1E-20 1E-30"
 no_bsm = False
 
 outfile = 'dagman_FR.submit'
-condor_script = '/home/smandalia/Documents/flavour_ratio/submitter/submit.sub'
+golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit'
+condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/submit.sub'
 
 with open(outfile, 'w') as f:
     job_number = 1
@@ -77,27 +79,27 @@ with open(outfile, 'w') as f:
                     f.write('VARS\tjob{0}\tno_bsm="{1}"\n'.format(job_number, no_bsm))
                     job_number += 1
 
-                for frs in full_scan_mfr:
-                    print frs
-                    outchains = outchain_head + '/full_scan/{0}/mcmc_chain'.format(str(sig).replace('.', '_'))
-                    f.write('JOB\tjob{0}\t{1}\n'.format(job_number, condor_script))
-                    f.write('VARS\tjob{0}\tmr0="{1}"\n'.format(job_number, frs[0]))
-                    f.write('VARS\tjob{0}\tmr1="{1}"\n'.format(job_number, frs[1]))
-                    f.write('VARS\tjob{0}\tmr2="{1}"\n'.format(job_number, frs[2]))
-                    f.write('VARS\tjob{0}\tsigma="{1}"\n'.format(job_number, sig))
-                    f.write('VARS\tjob{0}\tfix_source_ratio="{1}"\n'.format(job_number, 'False'))
-                    f.write('VARS\tjob{0}\tsr0="{1}"\n'.format(job_number, 0))
-                    f.write('VARS\tjob{0}\tsr1="{1}"\n'.format(job_number, 0))
-                    f.write('VARS\tjob{0}\tsr2="{1}"\n'.format(job_number, 0))
-                    f.write('VARS\tjob{0}\tfix_scale="{1}"\n'.format(job_number, 'False'))
-                    f.write('VARS\tjob{0}\tscale="{1}"\n'.format(job_number, 0))
-                    f.write('VARS\tjob{0}\tdimension="{1}"\n'.format(job_number, dim))
-                    f.write('VARS\tjob{0}\tenergy="{1}"\n'.format(job_number, en))
-                    f.write('VARS\tjob{0}\tflat_llh="{1}"\n'.format(job_number, flat))
-                    f.write('VARS\tjob{0}\tburnin="{1}"\n'.format(job_number, burnin))
-                    f.write('VARS\tjob{0}\tnwalkers="{1}"\n'.format(job_number, nwalkers))
-                    f.write('VARS\tjob{0}\tnsteps="{1}"\n'.format(job_number, nsteps))
-                    f.write('VARS\tjob{0}\toutfile="{1}"\n'.format(job_number, outchains))
-                    f.write('VARS\tjob{0}\tfix_mixing="{1}"\n'.format(job_number, 'False'))
-                    f.write('VARS\tjob{0}\tno_bsm="{1}"\n'.format(job_number, no_bsm))
-                    job_number += 1
+                # for frs in full_scan_mfr:
+                #     print frs
+                #     outchains = outchain_head + '/full_scan/{0}/mcmc_chain'.format(str(sig).replace('.', '_'))
+                #     f.write('JOB\tjob{0}\t{1}\n'.format(job_number, condor_script))
+                #     f.write('VARS\tjob{0}\tmr0="{1}"\n'.format(job_number, frs[0]))
+                #     f.write('VARS\tjob{0}\tmr1="{1}"\n'.format(job_number, frs[1]))
+                #     f.write('VARS\tjob{0}\tmr2="{1}"\n'.format(job_number, frs[2]))
+                #     f.write('VARS\tjob{0}\tsigma="{1}"\n'.format(job_number, sig))
+                #     f.write('VARS\tjob{0}\tfix_source_ratio="{1}"\n'.format(job_number, 'False'))
+                #     f.write('VARS\tjob{0}\tsr0="{1}"\n'.format(job_number, 0))
+                #     f.write('VARS\tjob{0}\tsr1="{1}"\n'.format(job_number, 0))
+                #     f.write('VARS\tjob{0}\tsr2="{1}"\n'.format(job_number, 0))
+                #     f.write('VARS\tjob{0}\tfix_scale="{1}"\n'.format(job_number, 'False'))
+                #     f.write('VARS\tjob{0}\tscale="{1}"\n'.format(job_number, 0))
+                #     f.write('VARS\tjob{0}\tdimension="{1}"\n'.format(job_number, dim))
+                #     f.write('VARS\tjob{0}\tenergy="{1}"\n'.format(job_number, en))
+                #     f.write('VARS\tjob{0}\tflat_llh="{1}"\n'.format(job_number, flat))
+                #     f.write('VARS\tjob{0}\tburnin="{1}"\n'.format(job_number, burnin))
+                #     f.write('VARS\tjob{0}\tnwalkers="{1}"\n'.format(job_number, nwalkers))
+                #     f.write('VARS\tjob{0}\tnsteps="{1}"\n'.format(job_number, nsteps))
+                #     f.write('VARS\tjob{0}\toutfile="{1}"\n'.format(job_number, outchains))
+                #     f.write('VARS\tjob{0}\tfix_mixing="{1}"\n'.format(job_number, 'False'))
+                #     f.write('VARS\tjob{0}\tno_bsm="{1}"\n'.format(job_number, no_bsm))
+                #     job_number += 1