update submit scripts

6 files changed, 31 insertions, 27 deletions

diff --git a/.gitignore b/.gitignore
index b67a5c1..bb77e89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ nohup*
 *.nfs*
 plots/
 *.pdf
+dagman_*
 dagman_FR*
 submitter/logs/
 mnrun_*
diff --git a/sens.py b/sens.py
index ba2d82b..9451056 100755
--- a/sens.py
+++ b/sens.py
@@ -233,9 +233,9 @@ def main():
                     identifier      = identifier
                 )
             except:
-                print 'Failed run, continuing'
-                # raise
-                continue
+                print 'Failed run'
+                raise
+                # continue
             print '## Evidence = {0}'.format(stat)
         elif args.stat_method is StatCateg.FREQUENTIST:
             raise NotImplementedError('Still needs testing')
diff --git a/submitter/clean.sh b/submitter/clean.sh
index bb1443c..d669683 100755
--- a/submitter/clean.sh
+++ b/submitter/clean.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
-rm -f dagman_FR.submit.*
-rm -f dagman_FR_*.submit.*
+rm -f dagman_*.submit.*
 rm -f logs/*
 rm -f metaouts/*
 rm -rf mnrun/
 mkdir mnrun
+
+rm -f /scratch/smandalia/flavour_ratio/submitter/dagman_*.submit.*
+rm -f /scratch/smandalia/flavour_ratio/submitter/logs/*
diff --git a/submitter/sens_dag.py b/submitter/sens_dag.py
index e60477c..160e590 100644
--- a/submitter/sens_dag.py
+++ b/submitter/sens_dag.py
@@ -3,14 +3,20 @@
 import os
 import numpy as np
 
-sources = [
-    (1, 2, 0),
-    (1, 0, 0),
-    (0, 1, 0),
-]
+# sources = [
+#     (1, 2, 0),
+#     (1, 0, 0),
+#     (0, 1, 0),
+# ]
+
+x_bins = 20
+x_array = np.linspace(0, 1, x_bins)
+sources = []
+for x in x_array:
+    sources.append([x, 1-x, 0])
 
 dims = [
-    3, 4, 5, 6, 7, 8
+    6
 ]
 
 textures = [
@@ -18,7 +24,6 @@ textures = [
 ]
 
 datadir = '/data/user/smandalia/flavour_ratio/data/sensitivity'
-scratchdir = '/scratch/smandalia/flavour_ratio'
 
 prefix = ''
 # prefix = '_noprior'
@@ -38,16 +43,16 @@ GLOBAL_PARAMS.update(dict(
 # MultiNest
 GLOBAL_PARAMS.update(dict(
     # mn_live_points = 1000,
-    mn_live_points = 600,
-    # mn_live_points = 300,
+    # mn_live_points = 600,
+    mn_live_points = 200,
     # mn_tolerance   = 0.1,
     mn_tolerance   = 0.3,
-    mn_output      = scratchdir + '/mnrun'
+    mn_output      = './mnrun'
 ))
 
 # FR
 GLOBAL_PARAMS.update(dict(
-    threads = 4,
+    threads = 1,
     binning = '6e4 1e7 20',
     no_bsm  = 'False'
 ))
@@ -86,4 +91,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)
diff --git a/submitter/sens_submit.sub b/submitter/sens_submit.sub
index 5a2c670..d55e625 100644
--- a/submitter/sens_submit.sub
+++ b/submitter/sens_submit.sub
@@ -3,21 +3,16 @@ Arguments = "--ast $(ast) --data $(data) --dimension $(dimension) --no-bsm $(no_
 
 # All logs will go to a single file 
 log    = /scratch/smandalia/flavour_ratio/submitter/logs/job_$(Cluster).log
-output = /scratch/smandalia/flavour_ratio/submitter/logs/job_$(Cluster).out
-error  = /scratch/smandalia/flavour_ratio/submitter/logs/job_$(Cluster).err
+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" 
 
-# Stage user cert to the node (Gridftp-Users is already on CVMFS)
-# transfer_input_files = /tmp/x509up_u14830
-
-# but do not try to copy outputs back (see: https://htcondor-wiki.cs.wisc.edu/index.cgi/tktview?tn=3081) 
-# +TransferOutput="" 
-# Transfer_output_files = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/metaouts/
-
 request_memory = 3GB
-request_cpus = 4
+request_cpus = 1
+
+initialdir = /home/smandalia/condor
 
 Universe        = vanilla 
 Notification    = never 
diff --git a/utils/mn.py b/utils/mn.py
index f7d5610..563b3c8 100644
--- a/utils/mn.py
+++ b/utils/mn.py
@@ -79,7 +79,7 @@ def mn_evidence(mn_paramset, llh_paramset, asimov_paramset, args,
     llh = '{0}'.format(args.likelihood).split('.')[1]
     data = '{0}'.format(args.data).split('.')[1]
     src_string = solve_ratio(args.source_ratio)
-    prefix = './mnrun/DIM{0}/{1}/{2}/s{3}/{4}'.format(
+    prefix = args.mn_output + '/DIM{0}/{1}/{2}/s{3}/{4}'.format(
         args.dimension, data, llh, src_string, identifier
     )
     make_dir(prefix)