Making DPS a python package

MANIFEST.in

@@ -0,0 +1,5 @@
+include bin/*
+include *.py
+include requirements/*.txt
+include CONTRIBUTING.md
+include README.md

Makefile

@@ -0,0 +1,105 @@
+# simple makefile to simplify repetitive build env management tasks under posix
+
+PYTHON := $(shell which python)
+NOSETESTS := $(shell which nosetests)
+
+INTERACTIVE := $(shell ([ -t 0 ] && echo 1) || echo 0)                          
+
+UNAME_S := $(shell uname -s)
+PROJECT_NAME := dps
+
+
+ifeq ($(UNAME_S),Darwin)                                                        
+        OPEN := open                                                            
+else                                                                            
+        OPEN := xdg-open                                                        
+endif
+
+all: clean inplace test
+
+# list what would be deleted by clean-repo
+clean-repo-check:
+	@git clean -f -x -d -n
+
+clean-dict:
+	@rm -f AutoDict_*
+
+clean-pyc:
+	@find . -name "*.pyc" -exec rm {} \;
+
+clean-so:
+	@find $(PROJECT_NAME) -name "*.so" -exec rm {} \;
+
+clean-build:
+	@rm -rf build
+
+clean-dist:
+	@rm -fr dist
+	@rm -fr $(PROJECT_NAME).egg-info
+
+clean: clean-build clean-pyc clean-so clean-dict clean-dist
+
+in: inplace # just a shortcut
+inplace:
+	@$(PYTHON) setup.py build_ext -i
+
+install: clean
+	@$(PYTHON) setup.py install
+
+install-user: clean
+	@$(PYTHON) setup.py install --user
+
+sdist: clean
+	@$(PYTHON) setup.py sdist --release
+
+register:
+	@$(PYTHON) setup.py register --release
+
+upload: clean
+	@$(PYTHON) setup.py sdist upload --release
+
+test-code: inplace
+	@$(NOSETESTS) -v -a '!slow' -s tests
+
+test-code-full: inplace
+	@$(NOSETESTS) -v -s tests
+
+test-code-verbose: inplace
+	@$(NOSETESTS) -v -a '!slow' -s tests --nologcapture
+
+test-installed:
+	@(mkdir -p nose && cd nose && \
+	$(NOSETESTS) -v -a '!slow' -s --exe tests && \
+	cd .. && rm -rf nose)
+
+test-doc:
+	@$(NOSETESTS) -v -s --with-doctest --doctest-tests --doctest-extension=rst \
+	--doctest-extension=inc --doctest-fixtures=_fixture docs/
+
+test-coverage:
+	@rm -rf coverage .coverage
+	@$(NOSETESTS) -s -v -a '!slow' --with-coverage \
+		--cover-erase --cover-branches \
+		--cover-html --cover-html-dir=coverage rootpy
+	@if [ "$(INTERACTIVE)" -eq "1" ]; then \
+		$(OPEN) coverage/index.html; \
+	fi;
+
+test: test-code
+
+trailing-spaces:
+	@find $(PROJECT_NAME) -name "*.py" | xargs perl -pi -e 's/[ \t]*$$//'
+
+doc: inplace
+	@make -C docs/ html
+
+check-rst:
+	@mkdir -p build
+	@$(PYTHON) setup.py --long-description | rst2html.py > build/README.html
+	@$(OPEN) build/README.html
+
+pep8:
+	@pep8 --exclude=.git,extern $(PROJECT_NAME)
+
+flakes:
+	@./ci/run-pyflakes

bin/convert_unfolding

@@ -4,9 +4,9 @@
 # This is needed to speed up the unfolding process, as the difference
 # in read speed between fine-binned and asymmetric is a factor of 200!
 # TODO: create the combined histograms as well.
-from src.cross_section_measurement.lib import convert_unfolding_histograms
-from config import XSectionConfig
-from tools.Timer import Timer
+from dps.analysis.xsection.lib import convert_unfolding_histograms
+from dps.config.xsection import XSectionConfig
+from dps.utils.Timer import Timer
 from multiprocessing import Pool
 
 config_7TeV = XSectionConfig(7)

bin/create_toy_mc_on_DICE

@@ -4,8 +4,8 @@
 '''
 from __future__ import print_function
 from optparse import OptionParser
-from condor import job
-from condor.jobtypes.create_toy_mc_from_tree_job import CreateToyMCFromTreeJob
+from dps.condor import job
+from dps.condor.jobtypes.create_toy_mc_from_tree_job import CreateToyMCFromTreeJob
 
 
 def main():

bin/create_unfolding_hists_on_DICE

@@ -4,9 +4,9 @@
 '''
 from __future__ import print_function
 from optparse import OptionParser
-from config import XSectionConfig
-from condor import job
-from condor.jobtypes.produce_unfolding_hists_job import ProduceUnfoldingHistsJob
+from dps.config.xsection import XSectionConfig
+from dps.condor import job
+from dps.condor.jobtypes.produce_unfolding_hists_job import ProduceUnfoldingHistsJob
 import os
 import sys
 

bin/create_unfolding_pulls_on_DICE

@@ -4,12 +4,10 @@
 '''
 from __future__ import print_function
 from optparse import OptionParser
-from config import XSectionConfig
-from condor import job
-from condor.jobtypes.unfolding_pull_job_new import UnfoldingPullJob
+from dps.config.xsection import XSectionConfig
+from dps.condor import job
+from dps.condor.jobtypes.unfolding_pull_job_new import UnfoldingPullJob
 from math import log10
-import os
-import sys
 
 def get_tau_values(min, max, spacing):
     taus = []

bin/dice_01

@@ -1,10 +1,10 @@
 #!/bin/bash
 echo "Recreating Config Files (Just in case you forgot...)"
-python src/cross_section_measurement/create_measurement.py
+python dps/analysis/xsection/create_measurement.py
 echo "Tarring DailyPythonScripts..."
 tar -cf dps.tar ../DailyPythonScripts/ --exclude ../DailyPythonScripts/data --exclude ../DailyPythonScripts/plots --exclude ../DailyPythonScripts/tables  --exclude ../DailyPythonScripts/jobs --exclude ../DailyPythonScripts/unfolding --exclude ../DailyPythonScripts/dps.tar
 echo "Submitting jobs to DICE..."
-condor_submit experimental/condor/01b/01_fit.description
+condor_submit dps/experimental/condor/01b/01_fit.description
 echo "Done."
 condor_q `whoami`
 

bin/dice_bltUnfold

@@ -1,7 +1,7 @@
 #!/bin/bash
-./condor/prepare_dps.sh
+dps/condor/prepare_dps.sh
 
 echo "Submitting jobs to DICE..."
-condor_submit src/BLTUnfold/submitBLTUnfold.description
+condor_submit dps/analysis/BLTUnfold/submitBLTUnfold.description
 echo "Done."
 condor_q `whoami`

bin/do_pulls_workflow

@@ -46,15 +46,15 @@ echo "Doing unfolding pulls for: $var"
 			echo "Producing pull data for $var variable, $c channel, kv=$k, sqrt(s) = $energy TeV"
 			for j in 1 2 3 4 5 6 7 8 9; do
 				echo "Doing part $j out of 9"
-				nohup time python src/unfolding_tests/create_unfolding_pull_data.py -v $var -k $k -f data/toy_mc/toy_mc_${var}_N_300_${energy}TeV.root -n 35 ${options[$j-1]} -c $c -s $energy &> logs/pull_${var}_kv${k}_${c}_${j}_${energy}TeV.log &
+				nohup time python dps/analysis/unfolding_tests/create_unfolding_pull_data.py -v $var -k $k -f data/toy_mc/toy_mc_${var}_N_300_${energy}TeV.root -n 35 ${options[$j-1]} -c $c -s $energy &> logs/pull_${var}_kv${k}_${c}_${j}_${energy}TeV.log &
 				let i+=1
 				if (( $i % N_JOBS == 0 ))
 				then
 					echo "Waiting on the above to finish."
     				wait;
 				fi
 			done
-			nohup time python src/unfolding_tests/make_unfolding_pull_plots.py -i data/pull_data/7TeV/$var/35_input_toy_mc/k_value_$k -c $c -v $var -k $k -s $energy &> logs/pull_${var}_kv${k}_${c}_plots_${energy}TeV.log &
+			nohup time python dps/analysis/unfolding_tests/make_unfolding_pull_plots.py -i data/pull_data/7TeV/$var/35_input_toy_mc/k_value_$k -c $c -v $var -k $k -s $energy &> logs/pull_${var}_kv${k}_${c}_plots_${energy}TeV.log &
 			wait;
 		done
 	done

bin/ntuple_info

@@ -5,7 +5,7 @@ from prettytable import PrettyTable
 
 from rootpy.io import root_open
 
-from tools.NTuple import FileInfo
+from dps.utils.NTuple import FileInfo
 
 def main():
     options, args = get_parameters()

bin/plot

@@ -80,9 +80,9 @@ Example JSON config structure:
 from optparse import OptionParser
 import sys
 from os.path import exists
-from tools.ROOT_utils import set_root_defaults
-from tools.file_utilities import write_data_to_JSON, read_data_from_JSON
-from tools.HistSet import HistSet
+from dps.utils.ROOT_utils import set_root_defaults
+from dps.utils.file_utilities import write_data_to_JSON, read_data_from_JSON
+from dps.utils.HistSet import HistSet
 from copy import deepcopy
 
 supported_commands = ['compare-files', 'compare-hists']

bin/plot_fit_tests

@@ -2,15 +2,15 @@
 echo "Run this only after run_fit_tests"
 echo "This will take a while ... grab a coffee/tea/water."
 mkdir -p logs
-nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/closure_test/ -o 'plots/fitchecks/closure_test' &> logs/plot_fit_checks_closure_test.log &
-nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/no_merging/closure_test/ -o 'plots/fitchecks/no_merging/closure_test' &> logs/plot_fit_checks_closure_test_no_merging.log &
-nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/no_constraints/closure_test/ -o 'plots/fitchecks/no_constraints/closure_test' &> logs/plot_fit_checks_closure_test_no_constraints.log & 
-nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/no_constraints_no_merging/closure_test/ -o 'plots/fitchecks/no_constraints_no_merging/closure_test' &> logs/plot_fit_checks_closure_test_NCNM.log &
+nohup python dps/analysis/xsection/98b_fit_cross_checks.py -p data/closure_test/ -o 'plots/fitchecks/closure_test' &> logs/plot_fit_checks_closure_test.log &
+nohup python dps/analysis/xsection/98b_fit_cross_checks.py -p data/no_merging/closure_test/ -o 'plots/fitchecks/no_merging/closure_test' &> logs/plot_fit_checks_closure_test_no_merging.log &
+nohup python dps/analysis/xsection/98b_fit_cross_checks.py -p data/no_constraints/closure_test/ -o 'plots/fitchecks/no_constraints/closure_test' &> logs/plot_fit_checks_closure_test_no_constraints.log & 
+nohup python dps/analysis/xsection/98b_fit_cross_checks.py -p data/no_constraints_no_merging/closure_test/ -o 'plots/fitchecks/no_constraints_no_merging/closure_test' &> logs/plot_fit_checks_closure_test_NCNM.log &
 wait
-nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/ -o 'plots/fitchecks/' &> logs/plot_fit_checks.log &
-nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/no_merging/ -o 'plots/fitchecks/no_merging/' &> logs/plot_fit_checks_no_merging.log &
-nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/no_constraints/ -o 'plots/fitchecks/no_constraints/' &> logs/plot_fit_checks_no_constraints.log &
-nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/no_constraints_no_merging/ -o 'plots/fitchecks/no_constraints_no_merging/' &> logs/plot_fit_checks_NCNM.log &
+nohup python dps/analysis/xsection/98b_fit_cross_checks.py -p data/ -o 'plots/fitchecks/' &> logs/plot_fit_checks.log &
+nohup python dps/analysis/xsection/98b_fit_cross_checks.py -p data/no_merging/ -o 'plots/fitchecks/no_merging/' &> logs/plot_fit_checks_no_merging.log &
+nohup python dps/analysis/xsection/98b_fit_cross_checks.py -p data/no_constraints/ -o 'plots/fitchecks/no_constraints/' &> logs/plot_fit_checks_no_constraints.log &
+nohup python dps/analysis/xsection/98b_fit_cross_checks.py -p data/no_constraints_no_merging/ -o 'plots/fitchecks/no_constraints_no_merging/' &> logs/plot_fit_checks_NCNM.log &
 wait
 DATE=`date +%d.%m.%Y_%H.%M.%S`
 tar -czf fit_check_plots_$DATE.tar.gz plots/fitchecks

bin/qcd_from_data

@@ -48,9 +48,10 @@ Uses the data_file to extract the templates, removes other samples
 from ROOT import gROOT
 gcd = gROOT.cd
 from optparse import OptionParser
-from tools.file_utilities import write_data_to_JSON, read_data_from_JSON
-from tools.ROOT_utililities import root_mkdir, find_btag, get_histogram_dictionary
-from tools.hist_utilities import clean_control_region
+from dps.utils.file_utilities import read_data_from_JSON
+# @BROKEN
+from dps.utils.ROOT_utililities import root_mkdir, find_btag, get_histogram_dictionary
+from dps.utils.hist_utilities import clean_control_region
 from rootpy.io import root_open
 
 def main():

bin/run_fit_tests

@@ -5,11 +5,11 @@ for fitComb in absolute_eta M_bl M3 angle_bl absolute_eta,M_bl absolute_eta,M3 a
 	for var in MET HT ST WPT MT; do
 		nicevar=`echo $var | sed 's/,/_/g'`
 		echo "Doing variable set: $fitComb, $nicevar"
-		nohup time python src/cross_section_measurement/01_get_fit_results.py --fit-variables $fitComb -v $var --no_combined_signal --closure_test  &> logs/fit_closure_test_$nicevar.log &
-		nohup time python src/cross_section_measurement/01_get_fit_results.py --fit-variables $fitComb -v $var --no_combined_signal --closure_test --closure_test_type='qcd_only'  &> logs/fit_closure_test_${nicevar}_qcd.log &
-		nohup time python src/cross_section_measurement/01_get_fit_results.py --fit-variables $fitComb -v $var --no_combined_signal --closure_test --closure_test_type='vjets_only'  &> logs/fit_closure_test_${nicevar}_vjets.log &
-		nohup time python src/cross_section_measurement/01_get_fit_results.py --fit-variables $fitComb -v $var --no_combined_signal --closure_test --closure_test_type='ttbar_only'  &> logs/fit_closure_test_${nicevar}_ttbar.log &
-		nohup time python src/cross_section_measurement/01_get_fit_results.py --fit-variables $fitComb -v $var --no_combined_signal --closure_test --closure_test_type='singletop_only'  &> logs/fit_closure_test_${nicevar}_singletop.log &
+		nohup time python dps/analysis/xsection/01_get_fit_results.py --fit-variables $fitComb -v $var --no_combined_signal --closure_test  &> logs/fit_closure_test_$nicevar.log &
+		nohup time python dps/analysis/xsection/01_get_fit_results.py --fit-variables $fitComb -v $var --no_combined_signal --closure_test --closure_test_type='qcd_only'  &> logs/fit_closure_test_${nicevar}_qcd.log &
+		nohup time python dps/analysis/xsection/01_get_fit_results.py --fit-variables $fitComb -v $var --no_combined_signal --closure_test --closure_test_type='vjets_only'  &> logs/fit_closure_test_${nicevar}_vjets.log &
+		nohup time python dps/analysis/xsection/01_get_fit_results.py --fit-variables $fitComb -v $var --no_combined_signal --closure_test --closure_test_type='ttbar_only'  &> logs/fit_closure_test_${nicevar}_ttbar.log &
+		nohup time python dps/analysis/xsection/01_get_fit_results.py --fit-variables $fitComb -v $var --no_combined_signal --closure_test --closure_test_type='singletop_only'  &> logs/fit_closure_test_${nicevar}_singletop.log &
 		wait;
 	done
 done

bin/run_unfolding_tests

@@ -3,10 +3,10 @@ echo "This will take a while ... grab a coffee/tea/water"
 mkdir -p logs
 for CoM in 7 8; do
 	echo "Doing centre of mass energy: $CoM TeV"
-	nohup time python src/unfolding_tests/k_value_determination.py -c $CoM &> logs/k_value_determination_${CoM}TeV.log &
-	nohup time python src/unfolding_tests/k_value_optimisation_plots.py -c $CoM &> logs/k_value_optmisation_${CoM}TeV.log &
-	nohup time python src/unfolding_tests/compare_unfolding_parameters.py -c $CoM -t closure &> logs/compare_unfolding_closure_${CoM}TeV.log &
-	nohup time python src/unfolding_tests/compare_unfolding_parameters.py -c $CoM -t data &> logs/compare_unfolding_data_${CoM}TeV.log &
+	nohup time python dps/analysis/unfolding_tests/k_value_determination.py -c $CoM &> logs/k_value_determination_${CoM}TeV.log &
+	nohup time python dps/analysis/unfolding_tests/k_value_optimisation_plots.py -c $CoM &> logs/k_value_optmisation_${CoM}TeV.log &
+	nohup time python dps/analysis/unfolding_tests/compare_unfolding_parameters.py -c $CoM -t closure &> logs/compare_unfolding_closure_${CoM}TeV.log &
+	nohup time python dps/analysis/unfolding_tests/compare_unfolding_parameters.py -c $CoM -t data &> logs/compare_unfolding_data_${CoM}TeV.log &
 	wait;
 done
 

bin/x_01_all_vars

@@ -10,7 +10,7 @@ echo "Using the fit variable(s): $fit_var"
 i=0
 for var in MET HT ST WPT MT lepTopPt lepTopRap hadTopPt hadTopRap ttbarPt ttbarM ttbarRap; do
 	echo "Fitting distribution: $var"
-	nohup time python src/cross_section_measurement/01_get_fit_results.py -V -v $var --fit-variables $fit_var &> logs/01_${var}_fit_13TeV_${nice_fit_var}.log &
+	nohup time python dps/analysis/xsection/01_get_fit_results.py -V -v $var --fit-variables $fit_var &> logs/01_${var}_fit_13TeV_${nice_fit_var}.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then

bin/x_01b_all_vars

@@ -7,7 +7,7 @@ N_JOBS=4
 i=0
 for var in MET HT ST WPT lepton_pt abs_lepton_eta NJets; do
 	echo "Fitting distribution: $var"
-	nohup time python src/cross_section_measurement/01_get_ttjet_normalisation.py -v $var -i config/measurements/background_subtraction &> logs/01_${var}_bgs_13TeV_fullPS.log &
+	nohup time python dps/analysis/xsection/01_get_ttjet_normalisation.py -v $var -i config/measurements/background_subtraction &> logs/01_${var}_bgs_13TeV_fullPS.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then
@@ -22,7 +22,7 @@ for var in MET HT ST WPT lepton_pt abs_lepton_eta NJets; do
 	# since we use the same bins in both full and visible phase space, the normalisation result will be identical
 	mkdir -p data/normalisation/background_subtraction/13TeV/$var/VisiblePS
 	cp -r data/normalisation/background_subtraction/13TeV/$var/FullPS/* data/normalisation/background_subtraction/13TeV/$var/VisiblePS/.
-	#nohup time python src/cross_section_measurement/01_get_ttjet_normalisation.py -v $var -i config/measurements/background_subtraction --visiblePS &> logs/01_${var}_bgs_13TeV_visiblePS.log &
+	#nohup time python dps/analysis/xsection/01_get_ttjet_normalisation.py -v $var -i config/measurements/background_subtraction --visiblePS &> logs/01_${var}_bgs_13TeV_visiblePS.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then

bin/x_02_all_vars

@@ -10,7 +10,7 @@ echo "Using the fit variable(s): $fit_var"
 i=0
 for var in MET HT ST WPT MT lepTopPt lepTopRap hadTopPt hadTopRap ttbarPt ttbarM ttbarRap; do
 	echo "Unfolding distribution: $var"
-	nohup time python src/cross_section_measurement/02_unfold_and_measure.py -v $var -c 13 -p data/$nice_fit_var &> logs/02_${var}_unfold_13TeV_${nice_fit_var}.log &
+	nohup time python dps/analysis/xsection/02_unfold_and_measure.py -v $var -c 13 -p data/$nice_fit_var &> logs/02_${var}_unfold_13TeV_${nice_fit_var}.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then
@@ -22,7 +22,7 @@ done
 echo "Visible phase space"
 for var in MET HT ST WPT MT lepTopPt lepTopRap hadTopPt hadTopRap ttbarPt ttbarM ttbarRap; do
 	echo "Unfolding distribution: $var"
-	nohup time python src/cross_section_measurement/02_unfold_and_measure.py --visiblePS -v $var -c 13 -p data/$nice_fit_var &> logs/02_${var}_unfold_13TeV_${nice_fit_var}.log &
+	nohup time python dps/analysis/xsection/02_unfold_and_measure.py --visiblePS -v $var -c 13 -p data/$nice_fit_var &> logs/02_${var}_unfold_13TeV_${nice_fit_var}.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then

bin/x_02b_all_vars

@@ -18,7 +18,7 @@ i=0
 echo "Visible phase space"
 for var in MET HT ST WPT lepton_pt abs_lepton_eta NJets; do
 	echo "Unfolding distribution: $var"
-	nohup time python src/cross_section_measurement/02_unfold_and_measure.py --visiblePS -v $var -c 13 -p data/normalisation/background_subtraction/ &> logs/02_${var}_Vis_unfold_13TeV.log &
+	nohup time python dps/analysis/xsection/02_unfold_and_measure.py --visiblePS -v $var -c 13 -p data/normalisation/background_subtraction/ &> logs/02_${var}_Vis_unfold_13TeV.log &
 	let i+=1
 	shallIwait $i $N_JOBS
 done

bin/x_03_all_vars

@@ -10,7 +10,7 @@ echo "Using the fit variable(s): $fit_var"
 i=0
 for var in MET HT ST WPT MT lepTopPt lepTopRap hadTopPt hadTopRap ttbarPt ttbarM ttbarRap; do
 	echo "Calculating diff. x-section for distribution: $var"
-	nohup time python src/cross_section_measurement/03_calculate_systematics.py -s -v $var -c 13 -p data/$nice_fit_var &> logs/03_${var}_calculate_13TeV_${nice_fit_var}.log &
+	nohup time python dps/analysis/xsection/03_calculate_systematics.py -s -v $var -c 13 -p data/$nice_fit_var &> logs/03_${var}_calculate_13TeV_${nice_fit_var}.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then
@@ -22,7 +22,7 @@ done
 echo "Visible phase space"
 for var in MET HT ST WPT MT lepTopPt lepTopRap hadTopPt hadTopRap ttbarPt ttbarM ttbarRap; do
 	echo "Calculating diff. x-section for distribution: $var"
-	nohup time python src/cross_section_measurement/03_calculate_systematics.py --visiblePS  -s -v $var -c 13 -p data/$nice_fit_var &> logs/03_${var}_calculate_13TeV_${nice_fit_var}.log &
+	nohup time python dps/analysis/xsection/03_calculate_systematics.py --visiblePS  -s -v $var -c 13 -p data/$nice_fit_var &> logs/03_${var}_calculate_13TeV_${nice_fit_var}.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then

bin/x_03b_all_vars

@@ -15,7 +15,7 @@ i=0
 echo "Visible phase space"
 for var in MET HT ST WPT lepton_pt abs_lepton_eta NJets; do
 	echo "Calculating diff. x-section for distribution: $var"
-	nohup time python src/cross_section_measurement/03_calculate_systematics.py --visiblePS  -s -v $var -c 13 -u TUnfold -p data/normalisation/background_subtraction/ &> logs/03_${var}_calculate_Vis_13TeV.log &
+	nohup time python dps/analysis/xsection/03_calculate_systematics.py --visiblePS  -s -v $var -c 13 -u TUnfold -p data/normalisation/background_subtraction/ &> logs/03_${var}_calculate_Vis_13TeV.log &
 	let i+=1
 	shallIwait $i $N_JOBS
 done