aboutsummaryrefslogtreecommitdiffstats
path: root/submitter
diff options
context:
space:
mode:
Diffstat (limited to 'submitter')
-rwxr-xr-xsubmitter/clean.sh2
-rw-r--r--submitter/make_dag.py53
-rw-r--r--submitter/submit.sub8
3 files changed, 40 insertions, 23 deletions
diff --git a/submitter/clean.sh b/submitter/clean.sh
index edf0eea..a89f017 100755
--- a/submitter/clean.sh
+++ b/submitter/clean.sh
@@ -1,5 +1,7 @@
#!/bin/bash
rm -f dagman_FR.submit.*
+rm -f dagman_FR_*.submit.*
rm -f logs/*
rm -f metaouts/*
+rm -f mnrun/*
diff --git a/submitter/make_dag.py b/submitter/make_dag.py
index 53878a2..78b7bff 100644
--- a/submitter/make_dag.py
+++ b/submitter/make_dag.py
@@ -19,10 +19,10 @@ fix_sfr_mfr = [
(1, 1, 1, 1, 2, 0),
# (1, 1, 0, 1, 2, 0),
# (1, 2, 0, 1, 2, 0),
- # (1, 1, 1, 1, 0, 0),
+ (1, 1, 1, 1, 0, 0),
# (1, 1, 0, 1, 0, 0),
# (1, 0, 0, 1, 0, 0),
- # (1, 1, 1, 0, 1, 0),
+ (1, 1, 1, 0, 1, 0),
# (1, 1, 0, 0, 1, 0),
# (0, 1, 0, 0, 1, 0),
# (1, 2, 0, 0, 1, 0),
@@ -31,17 +31,16 @@ fix_sfr_mfr = [
# MCMC
run_mcmc = 'False'
-burnin = 500
-nsteps = 2000
+burnin = 2500
+nsteps = 10000
nwalkers = 60
seed = 24
-threads = 1
+threads = 4
mcmc_seed_type = 'uniform'
# FR
dimension = [6]
energy = [1e6]
-likelihood = 'golemfit'
no_bsm = 'False'
sigma_ratio = ['0.01']
scale = "1E-20 1E-30"
@@ -67,23 +66,30 @@ ast = 'p2_0'
data = 'real'
# Bayes Factor
-run_bayes_factor = 'False'
-run_angles_limit = 'True'
-bayes_bins = 10
-bayes_live_points = 200
-bayes_tolerance = 0.01
-bayes_eval_bin = True # set to 'all' to run normally
+run_bayes_factor = 'False'
+run_angles_limit = 'False'
+run_angles_correlation = 'True'
+bayes_bins = 20
+bayes_live_points = 1000
+bayes_tolerance = 0.01
+bayes_eval_bin = 'None' # set to 'all' to run normally
# Plot
-plot_angles = 'False'
-plot_elements = 'False'
-plot_bayes = 'False'
+plot_angles = 'False'
+plot_elements = 'False'
+plot_bayes = 'False'
+plot_angles_limit = 'False'
-outfile = 'dagman_FR_angles_limit.submit'
+# outfile = 'dagman_FR.submit'.format(dimension[0])
+outfile = 'dagman_FR_angles_correlation_DIM{0}.submit'.format(dimension[0])
golemfitsourcepath = os.environ['GOLEMSOURCEPATH'] + '/GolemFit'
condor_script = golemfitsourcepath + '/scripts/flavour_ratio/submitter/submit.sub'
-if bayes_eval_bin != 'all': b_runs = bayes_bins
+if bayes_eval_bin != 'all':
+ if run_angles_correlation == 'True':
+ b_runs = bayes_bins**2
+ else:
+ b_runs = bayes_bins
else: b_runs = 1
with open(outfile, 'w') as f:
@@ -99,6 +105,7 @@ with open(outfile, 'w') as f:
outchain_head = '/data/user/smandalia/flavour_ratio/data/{0}/DIM{1}/SI_{2}'.format(likelihood, dim, spectral_index)
bayes_output = 'None'
+ angles_lim_output = 'None'
for sig in sigma_ratio:
print 'sigma', sig
for frs in fix_sfr_mfr:
@@ -108,6 +115,8 @@ with open(outfile, 'w') as f:
bayes_output = outchains + '/bayes_factor/'
if run_angles_limit == 'True':
angles_lim_output = outchains + '/angles_limit/'
+ if run_angles_correlation == 'True':
+ angles_corr_output = outchains + '/angles_corr/'
outchains += 'mcmc_chain'
for r in range(b_runs):
print 'run', r
@@ -144,7 +153,6 @@ with open(outfile, 'w') as f:
f.write('VARS\tjob{0}\tplot_elements="{1}"\n'.format(job_number, plot_elements))
f.write('VARS\tjob{0}\tseed="{1}"\n'.format(job_number, seed))
f.write('VARS\tjob{0}\tthreads="{1}"\n'.format(job_number, threads))
- f.write('VARS\tjob{0}\tlikelihood="{1}"\n'.format(job_number, likelihood))
f.write('VARS\tjob{0}\tmcmc_seed_type="{1}"\n'.format(job_number, mcmc_seed_type))
f.write('VARS\tjob{0}\tenergy_dependance="{1}"\n'.format(job_number, energy_dependance))
f.write('VARS\tjob{0}\tspectral_index="{1}"\n'.format(job_number, spectral_index))
@@ -161,6 +169,9 @@ with open(outfile, 'w') as f:
f.write('VARS\tjob{0}\tbayes_eval_bin="{1}"\n'.format(job_number, r))
f.write('VARS\tjob{0}\trun_angles_limit="{1}"\n'.format(job_number, run_angles_limit))
f.write('VARS\tjob{0}\tangles_lim_output="{1}"\n'.format(job_number, angles_lim_output))
+ f.write('VARS\tjob{0}\tplot_angles_limit="{1}"\n'.format(job_number, plot_angles_limit))
+ f.write('VARS\tjob{0}\trun_angles_correlation="{1}"\n'.format(job_number, run_angles_correlation))
+ f.write('VARS\tjob{0}\tangles_corr_output="{1}"\n'.format(job_number, angles_corr_output))
job_number += 1
for frs in full_scan_mfr:
@@ -170,6 +181,8 @@ with open(outfile, 'w') as f:
bayes_output = outchains + '/bayes_factor/'
if run_angles_limit == 'True':
angles_lim_output = outchains + '/angles_limit/'
+ if run_angles_correlation == 'True':
+ angles_corr_output = outchains + '/angles_corr/'
outchains += 'mcmc_chain'
for r in range(b_runs):
print 'run', r
@@ -206,7 +219,6 @@ with open(outfile, 'w') as f:
f.write('VARS\tjob{0}\tplot_elements="{1}"\n'.format(job_number, plot_elements))
f.write('VARS\tjob{0}\tseed="{1}"\n'.format(job_number, seed))
f.write('VARS\tjob{0}\tthreads="{1}"\n'.format(job_number, threads))
- f.write('VARS\tjob{0}\tlikelihood="{1}"\n'.format(job_number, likelihood))
f.write('VARS\tjob{0}\tmcmc_seed_type="{1}"\n'.format(job_number, mcmc_seed_type))
f.write('VARS\tjob{0}\tenergy_dependance="{1}"\n'.format(job_number, energy_dependance))
f.write('VARS\tjob{0}\tspectral_index="{1}"\n'.format(job_number, spectral_index))
@@ -223,4 +235,7 @@ with open(outfile, 'w') as f:
f.write('VARS\tjob{0}\tbayes_eval_bin="{1}"\n'.format(job_number, r))
f.write('VARS\tjob{0}\trun_angles_limit="{1}"\n'.format(job_number, run_angles_limit))
f.write('VARS\tjob{0}\tangles_lim_output="{1}"\n'.format(job_number, angles_lim_output))
+ f.write('VARS\tjob{0}\tplot_angles_limit="{1}"\n'.format(job_number, plot_angles_limit))
+ f.write('VARS\tjob{0}\trun_angles_correlation="{1}"\n'.format(job_number, run_angles_correlation))
+ f.write('VARS\tjob{0}\tangles_corr_output="{1}"\n'.format(job_number, angles_corr_output))
job_number += 1
diff --git a/submitter/submit.sub b/submitter/submit.sub
index d232097..810ffa0 100644
--- a/submitter/submit.sub
+++ b/submitter/submit.sub
@@ -1,5 +1,5 @@
Executable = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/fr.py
-Arguments = "--ast $(ast) --astroDeltaGamma $(astroDeltaGamma) --astroNorm $(astroNorm) --burnin $(burnin) --convNorm $(convNorm) --data $(data) --dimension $(dimension) --energy $(energy) --fix-mixing $(fix_mixing) --fix-scale $(fix_scale) --fix-source-ratio $(fix_source_ratio) --likelihood $(likelihood) --measured-ratio $(mr0) $(mr1) $(mr2) --muonNorm $(muonNorm) --no-bsm $(no_bsm) --nsteps $(nsteps) --nwalkers $(nwalkers) --outfile $(outfile) --plot-angles $(plot_angles) --plot-elements $(plot_elements) --promptNorm $(promptNorm) --run-mcmc $(run_mcmc) --scale $(scale) --scale-region $(scale_region) --seed $(seed) --sigma-ratio $(sigma_ratio) --source-ratio $(sr0) $(sr1) $(sr2) --threads $(threads) --likelihood $(likelihood) --mcmc-seed-type $(mcmc_seed_type) --energy-dependance $(energy_dependance) --spectral-index $(spectral_index) --binning $(binning_0) $(binning_1) $(binning_2) --fix-mixing-almost $(fix_mixing_almost) --run-bayes-factor $(run_bayes_factor) --bayes-bins $(bayes_bins) --bayes-output $(bayes_output) --bayes-live-points $(bayes_live_points) --plot-bayes $(plot_bayes) --bayes-tolerance $(bayes_tolerance) --bayes-eval-bin $(bayes_eval_bin) --run-angles-limit $(run_angles_limit) --angles-lim-out $(angles_lim_output)"
+Arguments = "--ast $(ast) --astroDeltaGamma $(astroDeltaGamma) --astroNorm $(astroNorm) --burnin $(burnin) --convNorm $(convNorm) --data $(data) --dimension $(dimension) --energy $(energy) --fix-mixing $(fix_mixing) --fix-scale $(fix_scale) --fix-source-ratio $(fix_source_ratio) --likelihood $(likelihood) --measured-ratio $(mr0) $(mr1) $(mr2) --muonNorm $(muonNorm) --no-bsm $(no_bsm) --nsteps $(nsteps) --nwalkers $(nwalkers) --outfile $(outfile) --plot-angles $(plot_angles) --plot-elements $(plot_elements) --promptNorm $(promptNorm) --run-mcmc $(run_mcmc) --scale $(scale) --scale-region $(scale_region) --seed $(seed) --sigma-ratio $(sigma_ratio) --source-ratio $(sr0) $(sr1) $(sr2) --threads $(threads) --mcmc-seed-type $(mcmc_seed_type) --energy-dependance $(energy_dependance) --spectral-index $(spectral_index) --binning $(binning_0) $(binning_1) $(binning_2) --fix-mixing-almost $(fix_mixing_almost) --run-bayes-factor $(run_bayes_factor) --bayes-bins $(bayes_bins) --bayes-output $(bayes_output) --bayes-live-points $(bayes_live_points) --plot-bayes $(plot_bayes) --bayes-tolerance $(bayes_tolerance) --bayes-eval-bin $(bayes_eval_bin) --run-angles-limit $(run_angles_limit) --angles-lim-out $(angles_lim_output) --plot-angles-limit $(plot_angles_limit) --run-angles-correlation $(run_angles_correlation) --angles-corr-output $(angles_corr_output)"
# All logs will go to a single file
log = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/logs/job_$(Cluster).log
@@ -14,9 +14,9 @@ getenv = True
# 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/
+Transfer_output_files = /data/user/smandalia/GolemTools/sources/GolemFit/scripts/flavour_ratio/submitter/metaouts/
-request_memory = 10GB
+request_memory = 1GB
request_cpus = 1
Universe = vanilla
@@ -33,7 +33,7 @@ Notification = never
# 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-17 23:35:39 +0000