Skip to content

Commit 7e48077

Browse files
jjacobjjacob
committed
temp, will undo and organise later.
1 parent 3d93908 commit 7e48077

File tree

4 files changed

+23
-21
lines changed

4 files changed

+23
-21
lines changed

‎bin/x_04_all_vars‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ fit_var="absolute_eta,M3,angle_bl"
77
# fit_var="M3"
88
# fit_var="angle_bl"
99
nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
10-
N_JOBS=5
10+
N_JOBS=6
1111

1212
echo "Using the fit variable(s): $fit_var"
1313

1414
i=0
15-
for var in MET HT ST MT WPT; do
15+
for var in MET MT; do
1616
echo "Plotting diff. x-section for distribution: $var"
1717
nohup time python src/cross_section_measurement/04_make_plots_matplotlib.py -v $var -c 7 -p data/$nice_fit_var -o plots/results/fit/ &> logs/04_${var}_plot_7TeV_${nice_fit_var}.log & # -a -s <--add -a option for additional plots, -s option to include the final results from background subtraction as well as from fitting
18-
nohup time python src/cross_section_measurement/04_make_plots_matplotlib.py -v $var -c 7 -p data/$nice_fit_var -o plots/results/fit/ -s &> logs/04_${var}_plot_7TeV_${nice_fit_var}.log & # -a -s <--add -a option for additional plots, -s option to include the final results from background subtraction as well as from fitting
18+
nohup time python src/cross_section_measurement/04_make_plots_matplotlib.py -v $var -c 7 -p data/$nice_fit_var -o plots/results/fit/ -s &> logs/04_${var}_plot_7TeV_${nice_fit_var}_with_bkgd_sub.log & # -a -s <--add -a option for additional plots, -s option to include the final results from background subtraction as well as from fitting
1919
let i+=2
2020
if (( $i % N_JOBS == 0 ))
2121
then
@@ -24,7 +24,7 @@ for var in MET HT ST MT WPT; do
2424
fi
2525

2626
nohup time python src/cross_section_measurement/04_make_plots_matplotlib.py -v $var -c 8 -p data/$nice_fit_var -o plots/results/fit/ &> logs/04_${var}_plot_8TeV_${nice_fit_var}.log & # -a -s <--add -a option for additional plots, -s option to include the final results from background subtraction as well as from fitting
27-
nohup time python src/cross_section_measurement/04_make_plots_matplotlib.py -v $var -c 8 -p data/$nice_fit_var -o plots/results/fit/ -s &> logs/04_${var}_plot_8TeV_${nice_fit_var}.log & # -a -s <--add -a option for additional plots, -s option to include the final results from background subtraction as well as from fitting
27+
nohup time python src/cross_section_measurement/04_make_plots_matplotlib.py -v $var -c 8 -p data/$nice_fit_var -o plots/results/fit/ -s &> logs/04_${var}_plot_8TeV_${nice_fit_var}_with_bkgd_sub.log & # -a -s <--add -a option for additional plots, -s option to include the final results from background subtraction as well as from fitting
2828
let i+=2
2929
if (( $i % N_JOBS == 0 ))
3030
then

‎config/latex_labels.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
'MET': '\ensuremath{E_{\mathrm{T}}^{\mathrm{miss}}}',
1414
'HT': '\ensuremath{H_{\mathrm{T}}}',
1515
'ST': '\ensuremath{S_{\mathrm{T}}}',
16-
'MT': '\ensuremath{M^{\mathrm{W}}_{\mathrm{T}}}',
17-
'WPT': '\ensuremath{p^\mathrm{W}_{\mathrm{T}}}'
16+
'WPT': '\ensuremath{p^{\mathrm{W}}_{\mathrm{T}}}',
17+
'MT': '\ensuremath{M^{\mathrm{W}}_{\mathrm{T}}}'
1818
}
1919

2020
ttBarLatex = '$\mathrm{t}\\bar{\mathrm{t}}$'
2121

2222
measurements_latex = {'unfolded': 'unfolded',
2323
'measured': 'measured',
24-
'MADGRAPH': 'Madgraph Pythia',
24+
'MADGRAPH': 'Madgraph Pythia6',
2525
'MADGRAPH_ptreweight': 'Madgraph+$p_\mathrm{T}$ reweighting',
26-
'MCATNLO': 'MC@NLO Herwig',
26+
'MCATNLO': 'MC@NLO Herwig6',
2727
'powheg_v1_pythia': 'Powheg (v1) Pythia6',
2828
'powheg_v2_pythia': 'Powheg (v2) Pythia6',
29-
'powheg_v1_herwig': 'Powheg (v1) Herwig',
30-
'powheg_v2_herwig': 'Powheg (v2) Herwig++',
29+
'powheg_v1_herwig': 'Powheg (v1) Herwig6',
30+
'powheg_v2_herwig': 'Powheg (v2) Herwig6',
3131
'matchingdown': 'Matching down',
3232
'matchingup': 'Matching up',
3333
'scaledown': '$Q^{2}$ down',
@@ -110,17 +110,17 @@
110110

111111
typical_systematics_latex = {"typical_systematics_electron": "Electron trigger efficiency \& electron selection",
112112
"typical_systematics_muon": "Muon trigger efficiency \& muon selection",
113-
"typical_systematics_btagging": "btagging",
113+
"typical_systematics_btagging": "b-tagging",
114114
"typical_systematics_JES": "Jet Energy Scale",
115115
"typical_systematics_JER": "Jet Energy Resolution",
116-
"typical_systematics_PU": "pileup",
117-
"typical_systematics_hadronisation": "hadronisation",
116+
"typical_systematics_PU": "Pileup",
117+
"typical_systematics_hadronisation": "Hadronisation",
118118
"typical_systematics_QCD_shape": "QCD shape",
119119
"typical_systematics_PDF": "PDF uncertainties",
120-
"typical_systematics_top_mass": "top mass",
120+
"typical_systematics_top_mass": "Top mass",
121121
"typical_systematics_theoretical": "Theoretical systematics",
122122
'typical_systematics_background_other': 'Background (other)',
123-
'typical_systematics_MET': '$E_{T}^{miss}$ uncertainties',
123+
'typical_systematics_MET': '$E_{\mathrm{T}}^{\mathrm{miss}}$ uncertainties',
124124
'typical_systematics_pt_reweight': '$p_\mathrm{T}$ reweighting'
125125
}
126126

‎src/cross_section_measurement/05_make_tables.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ def print_typical_systematics_table(central_values, errors, channel, toFile = Tr
437437
if values_for_typical_systematics_table.has_key(source):
438438
values_for_typical_systematics_table[source].append(value)
439439
else:
440-
values_for_typical_systematics_table[source] = [typical_systematics_latex[systematic_group] + ' (\%)', value]
440+
values_for_typical_systematics_table[source] = [typical_systematics_latex[systematic_group], value]
441441

442442
rows_for_typical_systematics_table = {}
443443

@@ -491,11 +491,11 @@ def print_typical_systematics_table(central_values, errors, channel, toFile = Tr
491491
printout += '\\begin{table}[htbp]\n'
492492
printout += '\\centering\n'
493493
printout += '\\caption{Typical systematic uncertainties in percent (median values) for the normalised \\ttbar\n'
494-
printout += '\\differential cross section measurement at \ensuremath{\roots=%d\TeV} '
494+
printout += 'differential cross section measurement at \ensuremath{\\roots=%d\TeV}' % (measurement_config.centre_of_mass_energy)
495495
if channel == 'combined':
496-
printout += '(combination of electron and muon channels). '
496+
printout += ' (combination of electron and muon channels).\n'
497497
else:
498-
printout += '(%s channel).' % channel
498+
printout += ' (%s channel).\n' % channel
499499
printout += 'Typical values of the total systematic uncertainty are also shown.}\n'
500500

501501
printout += '\\label{tab:typical_systematics_%dTeV_%s}\n' % (measurement_config.centre_of_mass_energy, channel)
@@ -538,7 +538,7 @@ def print_typical_systematics_table(central_values, errors, channel, toFile = Tr
538538
for line_number, line in enumerate (lines):
539539
if line.startswith("Uncertainty source"):
540540
lines[line_number] = lines[line_number].strip() + " & " + variables_latex[variable] + "\n"
541-
elif variable == "HT" and line.startswith("$E_{T}^{miss}$ uncertainties"):
541+
elif variable == "HT" and line.startswith("$E_{\mathrm{T}}^{\mathrm{miss}}$ uncertainties"):
542542
lines[line_number] = lines[line_number].strip() + " & - \n"
543543
else:
544544
for table_entry in enumerate(typical_systematics_latex):

‎tools/HistSet.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ def plot( self, plot_options = {} ):
6161

6262
if plot_options.has_key( 'normalise' ):
6363
normalise = plot_options['normalise']
64-
64+
else:
65+
normalise = False
66+
6567
if plot_type == 'shape_comparison':
6668
make_shape_comparison_plot( shapes = self.histograms,
6769
names = self.labels,

0 commit comments

Comments
 (0)