From d3f5931ab158f47d1a599bd7249f37d7cecd809c Mon Sep 17 00:00:00 2001
From: shivesh <s.p.mandalia@qmul.ac.uk>
Date: Fri, 11 May 2018 16:54:32 -0500
Subject: Fri May 11 16:54:32 CDT 2018

---
 submitter/mcmc_dag.py     |  4 ++--
 submitter/mcmc_submit.sub |  1 +
 submitter/sens_dag.py     | 18 +++++++++++-------
 submitter/sens_submit.sub |  4 +++-
 4 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'submitter')

diff --git a/submitter/mcmc_dag.py b/submitter/mcmc_dag.py
index d06e920..7a0cde9 100644
--- a/submitter/mcmc_dag.py
+++ b/submitter/mcmc_dag.py
@@ -34,11 +34,11 @@ GLOBAL_PARAMS.update(dict(
 ))
 
 # FR
-dimension         = [3, 6]
+dimension         = [3]
 # dimension         = [4, 5, 7, 8]
 GLOBAL_PARAMS.update(dict(
     threads           = 1,
-    binning           = '1e4 1e7 5',
+    binning           = '6e4 1e7 5',
     no_bsm            = 'False',
     scale_region      = "1E10",
     energy_dependance = 'spectral',
diff --git a/submitter/mcmc_submit.sub b/submitter/mcmc_submit.sub
index c565205..998932e 100644
--- a/submitter/mcmc_submit.sub
+++ b/submitter/mcmc_submit.sub
@@ -22,6 +22,7 @@ request_cpus = 1
 Universe        = vanilla 
 Notification    = never 
 
++AccountingGroup="sanctioned.$ENV(USER)"
 # run on both SL5 and 6
 # +WantRHEL6 = True
 # +WantSLC6 = False
diff --git a/submitter/sens_dag.py b/submitter/sens_dag.py
index d0b4752..e02a671 100644
--- a/submitter/sens_dag.py
+++ b/submitter/sens_dag.py
@@ -29,24 +29,25 @@ GLOBAL_PARAMS.update(dict(
     sens_run      = 'True',
     run_method    = 'fixed_angle', # full, fixed_angle, corr_angle
     stat_method   = 'bayesian',
-    sens_bins     = 40,
+    sens_bins     = 20,
     seed          = 'None'
 ))
 
 # MultiNest
 GLOBAL_PARAMS.update(dict(
-    mn_live_points = 800,
-    mn_tolerance   = 0.01,
+    mn_live_points = 300,
+    mn_tolerance   = 0.1,
     mn_output      = './mnrun'
 ))
 
 # FR
-dimension         = [3, 6]
+dimension         = [6]
+# dimension         = [3, 6]
 # dimension         = [4, 5, 7, 8]
 # dimension         = [3, 4, 5, 6, 7, 8]
 GLOBAL_PARAMS.update(dict(
     threads           = 1,
-    binning           = '1e4 1e7 5',
+    binning           = '6e4 1e7 5',
     no_bsm            = 'False',
     scale_region      = "1E10",
     energy_dependance = 'spectral',
@@ -73,7 +74,7 @@ GLOBAL_PARAMS.update(dict(
     plot_statistic = 'True'
 ))
 
-outfile = 'dagman_FR_SENS_{0}_{1}_{2}.submit'.format(
+outfile = 'dagman_FR_SENS_{0}_{1}_{2}_sim.submit'.format(
     GLOBAL_PARAMS['stat_method'], GLOBAL_PARAMS['run_method'], GLOBAL_PARAMS['likelihood']
 )
 golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit'
@@ -95,7 +96,10 @@ with open(outfile, 'w') as f:
         )
         for frs in fix_sfr_mfr:
             print 'frs', frs
-            output = outchain_head + '/fix_ifr/'
+            # output = outchain_head + '/fix_ifr/'
+            # output = outchain_head + '/fix_ifr/HESESim'
+            output = outchain_head + '/fix_ifr/sim'
+            # output = outchain_head + '/fix_ifr/data'
             if GLOBAL_PARAMS['likelihood'].lower() == 'gaussian':
                 output += '{0}/'.format(str(GLOBAL_PARAMS['sigma_ratio']).replace('.', '_'))
             output += 'fr_stat'
diff --git a/submitter/sens_submit.sub b/submitter/sens_submit.sub
index f3a3e4c..5234578 100644
--- a/submitter/sens_submit.sub
+++ b/submitter/sens_submit.sub
@@ -22,6 +22,7 @@ request_cpus = 1
 Universe        = vanilla 
 Notification    = never 
 
++AccountingGroup="sanctioned.$ENV(USER)"
 # run on both SL5 and 6
 # +WantRHEL6 = True
 # +WantSLC6 = False
@@ -31,9 +32,10 @@ Notification    = never
 
 # +TransferOutput=""
 
++NATIVE_OS = True
 # Requirements = IS_GLIDEIN && HAS_CVMFS_icecube_opensciencegrid_org && (OpSysAndVer =?= "CentOS6" || OpSysAndVer =?= "RedHat6" || OpSysAndVer =?= "SL6")
 # Requirements = IS_GLIDEIN
-Requirements = (OpSysMajorVer =?= 6)
+# Requirements = (OpSysMajorVer =?= 6)
 
 # GO! 
 queue
-- 
cgit v1.2.3