Skip to content

Commit bc54a99

Browse files
kreczkokreczko
committed
Merge pull request BristolTopGroup#275 from EmyrClement/v3PAS
V3 pas
2 parents 373f89c + 087dbdd commit bc54a99

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

‎config/cross_section_config.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,12 @@ def __fill_defaults__( self ):
389389
# structure
390390
# { summary_name : [(Electron_down, Electron_up)), (TTJets_hadronisation, TTJets_hadronisation)
391391
self.typical_systematics_summary = {
392-
'Leptons energy \& scale factors': [('Electron_down', 'Electron_up'), ('Muon_down', 'Muon_up')],
392+
'Lepton selection efficiency': [('Electron_down', 'Electron_up'), ('Muon_down', 'Muon_up')],
393393
'Jet energy \& resolution': [('JES_down', 'JES_up', 'JER_down', 'JER_up')],
394-
'Normalisation': [('TTJet_cross_section-', 'TTJet_cross_section+'),
394+
'B-tagging' : [('BJet_down', 'BJet_up')],
395+
'MET' : [('ElectronEnDown', 'ElectronEnUp'), ('MuonEnDown','MuonEnUp'),('TauEnDown','TauEnUp'),('UnclusteredEnDown','UnclusteredEnUp')],
396+
'Normalisation': [
397+
# ('TTJet_cross_section-', 'TTJet_cross_section+'),
395398
('SingleTop_cross_section-', 'SingleTop_cross_section+'),
396399
('luminosity-', 'luminosity+'),
397400
('QCD_cross_section-', 'QCD_cross_section+'),],
@@ -524,9 +527,9 @@ def __fill_defaults_13TeV__( self ):
524527

525528
self.rate_changing_systematics = {#TODO check where this is used
526529
'luminosity': 0.1, # Best guess for 13 TeV
527-
'SingleTop_cross_section': 0.034, # Currently same as 8 TeV
528-
'TTJet_cross_section': 0.043, # Currently same as 8 TeV
529-
'V+Jets_cross_section': 0.3,
530+
'SingleTop_cross_section': 0.05, # Currently same as 8 TeV
531+
# 'TTJet_cross_section': 0.043, # Currently same as 8 TeV
532+
'V+Jets_cross_section': 0.5,
530533
'QCD_cross_section' : 1.,
531534
}
532535

‎src/cross_section_measurement/05_make_tables.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,6 @@ def print_typical_systematics_table(central_values, errors, channel, toFile = Tr
554554
if line.startswith(group):
555555
new_line = line.replace('\\\\', '')
556556
new_line = new_line.strip()
557-
print line, new_line
558557
lines[line_number] = new_line + '& {:.2f} \\\\ \n'.format(ts)
559558
output_file.seek(0)
560559
for line in lines:

‎src/cross_section_measurement/make_control_plots_fromTrees.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ def make_plot( channel, x_axis_title, y_axis_title,
356356
# 'Mjj',
357357
# 'M3',
358358
# 'angle_bl',
359-
# 'NJets',
359+
'NJets',
360360
'NBJets',
361361
'NBJetsNoWeight'
362362
# 'JetPt',
@@ -365,7 +365,7 @@ def make_plot( channel, x_axis_title, y_axis_title,
365365
]
366366

367367
additional_qcd_plots = [
368-
'QCDHT',
368+
# 'QCDHT',
369369
'QCDMET',
370370
'QCDST',
371371
'QCDWPT',
@@ -465,7 +465,7 @@ def make_plot( channel, x_axis_title, y_axis_title,
465465
signal_region_tree = 'TTbar_plus_X_analysis/%s/Ref selection/FitVariables' % label,
466466
control_region_tree = 'TTbar_plus_X_analysis/%s/Ref selection/FitVariables' % label,
467467
branchName = 'STNoHF',
468-
name_prefix = '%s_ST_' % label,
468+
name_prefix = '%s_STNoHF_' % label,
469469
x_limits = control_plots_bins['ST'],
470470
nBins = 20,
471471
rebin = 1,
@@ -486,7 +486,7 @@ def make_plot( channel, x_axis_title, y_axis_title,
486486
signal_region_tree = 'TTbar_plus_X_analysis/%s/Ref selection/FitVariables' % label,
487487
control_region_tree = 'TTbar_plus_X_analysis/%s/Ref selection/FitVariables' % label,
488488
branchName = 'WPTNoHF',
489-
name_prefix = '%s_WPT_' % label,
489+
name_prefix = '%s_WPTNoHF_' % label,
490490
x_limits = control_plots_bins['WPT'],
491491
nBins = 16,
492492
rebin = 1,
@@ -875,7 +875,7 @@ def make_plot( channel, x_axis_title, y_axis_title,
875875
signal_region_tree = 'TTbar_plus_X_analysis/%s/FitVariables' % treeName,
876876
control_region_tree = 'TTbar_plus_X_analysis/%s/FitVariables' % treeName,
877877
branchName = 'METNoHF',
878-
name_prefix = '%s_MET_' % channel,
878+
name_prefix = '%s_METNoHF_' % channel,
879879
x_limits = control_plots_bins['MET'],
880880
nBins = 20,
881881
rebin = 1,
@@ -895,7 +895,7 @@ def make_plot( channel, x_axis_title, y_axis_title,
895895
signal_region_tree = 'TTbar_plus_X_analysis/%s/FitVariables' % treeName,
896896
control_region_tree = 'TTbar_plus_X_analysis/%s/FitVariables' % treeName,
897897
branchName = 'STNoHF',
898-
name_prefix = '%s_ST_' % channel,
898+
name_prefix = '%s_STNoHF_' % channel,
899899
x_limits = control_plots_bins['ST'],
900900
nBins = 20,
901901
rebin = 1,
@@ -915,7 +915,7 @@ def make_plot( channel, x_axis_title, y_axis_title,
915915
signal_region_tree = 'TTbar_plus_X_analysis/%s/FitVariables' % treeName,
916916
control_region_tree = 'TTbar_plus_X_analysis/%s/FitVariables' % treeName,
917917
branchName = 'WPTNoHF',
918-
name_prefix = '%s_WPT_' % channel,
918+
name_prefix = '%s_WPTNoHF_' % channel,
919919
x_limits = control_plots_bins['WPT'],
920920
nBins = 20,
921921
rebin = 1,
@@ -1006,8 +1006,8 @@ def make_plot( channel, x_axis_title, y_axis_title,
10061006
make_plot( channel,
10071007
x_axis_title = '$%s$' % control_plots_latex['NJets'],
10081008
y_axis_title = 'Events',
1009-
signal_region_tree = 'TTbar_plus_X_analysis/%s/Jets/Jets' % ( treeName ),
1010-
control_region_tree = 'TTbar_plus_X_analysis/%s/Jets/Jets' % ( treeName ),
1009+
signal_region_tree = 'TTbar_plus_X_analysis/%s/FitVariables' % ( treeName ),
1010+
control_region_tree = 'TTbar_plus_X_analysis/%s/FitVariables' % ( treeName ),
10111011
branchName = 'NJets',
10121012
name_prefix = '%s_NJets_' % channel,
10131013
x_limits = control_plots_bins['NJets'],

0 commit comments

Comments
 (0)