From cd2a1104b32cee6d2dc8307b9b431d42743acafa Mon Sep 17 00:00:00 2001
From: Pedro <psilva@cern.ch>
Date: Thu, 15 Nov 2018 12:18:38 +0100
Subject: [PATCH 1/2] updating sample names

---
 TopAnalysis/data/era2016/samples.json     |  4 +-
 TopAnalysis/data/era2017/samples.json     | 28 ++++++------
 TopAnalysis/data/era2017/vbf_samples.json | 55 ++++++++++++-----------
 3 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/TopAnalysis/data/era2016/samples.json b/TopAnalysis/data/era2016/samples.json
index 344f11b8..f3a7bc6d 100644
--- a/TopAnalysis/data/era2016/samples.json
+++ b/TopAnalysis/data/era2016/samples.json
@@ -54,9 +54,9 @@
 "MC13TeV_2016_GJets_HT400to600_DR04" : [27.3,    0,  "", "#gamma+jets", 41, false, false, 1],
 "MC13TeV_2016_GJets_HT600toInf_DR04" : [0.4,     0,  "", "#gamma+jets", 41, false, false, 1],
 "MC13TeV_2016_EWKZJJ"                : [4.32,    0,  "/EWK_LLJJ_MLL-50_MJJ-120_13TeV-madgraph-herwigpp/RunIISummer16MiniAODv3-PUMoriond17_94X_mcRun2_asymptotic_v3-v1/MINIAODSIM", "EWK ZJJ", 41, false, false, 1],
-"MC13TeV_2016_EWKAJJ"                : [4.32,    0,  "", "EWK AJJ", 41, false, false, 1],
+"MC13TeV_2016_EWKAJJ"                : [4.74,    0,  "", "EWK AJJ", 41, false, false, 1],
 "MC13TeV_2016_IntZJJ"                : [4.32,    0,  "", "EWK ZJJ", 41, false, false, 1],
-"MC13TeV_2016_IntAJJ"                : [4.32,    0,  "", "EWK AJJ", 41, false, false, 1],
+"MC13TeV_2016_IntAJJ"                : [0.7,    0,  "", "EWK AJJ", 41, false, false, 1],
 "MC13TeV_2016_A225ToZh"              : [1,       0,  "/GluGluToAToZhToLLBB_M-225_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv3-PUMoriond17_94X_mcRun2_asymptotic_v3-v1/MINIAODSIM", "A(225)#rightarrowZh#rightarrow2l2b", 41, false, false, 1],
 "MC13TeV_2016_AxDMv750x100"          : [1,       0,  "/DarkMatter_MonoZToLL_NLO_Axial_Mx-100_Mv-750_gDM1_gQ0p25_TuneCUETP8M1_13TeV-madgraph/RunIISummer16MiniAODv3-PUMoriond17_94X_mcRun2_asymptotic_v3-v1/MINIAODSIM", "Axial DM(750,100)", 41, false, false, 1],
 "MC13TeV_2016_PsDMv1000x1"           : [1,       0,  "/DarkMatter_MonoZToLL_NLO_Pseudo_Mx-1_Mv-1000_gDM1_gQ1_TuneCUETP8M1_13TeV-madgraph/RunIISummer16MiniAODv3-PUMoriond17_94X_mcRun2_asymptotic_v3-v1/MINIAODSIM", "Pseudo DM(1000,1)", 41, false, false, 1],
diff --git a/TopAnalysis/data/era2017/samples.json b/TopAnalysis/data/era2017/samples.json
index 81c7a487..35d8c923 100644
--- a/TopAnalysis/data/era2017/samples.json
+++ b/TopAnalysis/data/era2017/samples.json
@@ -1,12 +1,12 @@
 {
 "MC13TeV_2017_TTJets"                : [832, 0,     "/TTJets_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "t#bar{t}", 920, true, false, 1],
-"MC13TeV_2017_TTGJets"               : [832, 0,     "/TTGJets_TuneCP5_13TeV-amcatnloFXFX-madspin-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "t#bar{t}#gamma", 920, true, false, 1],
-"MC13TeV_2017_tW"                    : [832, 0,     "/ST_tW_top_5f_inclusiveDecays_TuneCP5_PSweights_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Single top", 920, true, false, 1],
-"MC13TeV_2017_tbarW"                 : [832, 0,     "/ST_tW_antitop_5f_inclusiveDecays_TuneCP5_PSweights_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Single top", 920, true, false, 1],
-"MC13TeV_2017_t_tch"                 : [832, 0,     "/ST_t-channel_top_5f_TuneCP5_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Single top", 920, true, false, 1],
-"MC13TeV_2017_tbar_tch"              : [832, 0,     "/ST_t-channel_antitop_5f_TuneCP5_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Single top", 920, true, false, 1],
-"MC13TeV_2017_t_sch"                 : [832, 0,     "/ST_s-channel_4f_leptonDecays_TuneCP5_PSweights_13TeV-amcatnlo-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Single top", 920, true, false, 1],
-"MC13TeV_2017_DY10to50_mlm"          : [5765.4, 0,  "/DYJetsToLL_M-10to50_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "DYlo", 41, false, false, 1],
+"MC13TeV_2017_TTGJets"               : [4.078, 0,   "/TTGJets_TuneCP5_13TeV-amcatnloFXFX-madspin-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "t#bar{t}#gamma", 920, true, false, 1],
+"MC13TeV_2017_tW"                    : [35.85, 0,     "/ST_tW_top_5f_inclusiveDecays_TuneCP5_PSweights_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Single top", 920, true, false, 1],
+"MC13TeV_2017_tbarW"                 : [35.85, 0,     "/ST_tW_antitop_5f_inclusiveDecays_TuneCP5_PSweights_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Single top", 920, true, false, 1],
+"MC13TeV_2017_t_tch"                 : [119.7, 0,     "/ST_t-channel_top_5f_TuneCP5_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Single top", 920, true, false, 1],
+"MC13TeV_2017_tbar_tch"              : [119.7, 0,     "/ST_t-channel_antitop_5f_TuneCP5_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Single top", 920, true, false, 1],
+"MC13TeV_2017_t_sch"                 : [3.74, 0,     "/ST_s-channel_4f_leptonDecays_TuneCP5_PSweights_13TeV-amcatnlo-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Single top", 920, true, false, 1],
+"MC13TeV_2017_DY10to50_mlm"          : [18610, 0,  "/DYJetsToLL_M-10to50_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "DYlo", 41, false, false, 1],
 "MC13TeV_2017_DY50toInf_fxfx"        : [5765.4, 0,  "/DYJetsToLL_M-50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "DY", 41, false, false, 1],
 "MC13TeV_2017_DY50toInf_fxfx_ext"    : [5765.4, 0,  "/DYJetsToLL_M-50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14_ext1-v1/MINIAODSIM", "DY", 41, false, false, 1],
 "MC13TeV_2017_ZH"                    : [0.5644, 0,  "/ZH_HToBB_ZToLL_M125_13TeV_powheg_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "ZH", 815, false, false, 1],
@@ -48,15 +48,15 @@
 "MC13TeV_2017_GJets_HT400to600_DR04" : [27.3,    0,  "/GJets_DR-0p4_HT-400To600_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma+jets", 41, false, false, 1],
 "MC13TeV_2017_GJets_HT600toInf_DR04" : [0.4,     0,  "/GJets_DR-0p4_HT-600ToInf_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma+jets", 41, false, false, 1],
 "MC13TeV_2017_GJets_flat15to6000"    : [1,   0,  "/GJet_Pt-15To6000_TuneCP5-Flat_13TeV_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma+jets flat", 41, false, false, 1],
-"MC13TeV_2017_GG"                    : [832, 0,     "/DiPhotonJets_MGG-80toInf_13TeV_amcatnloFXFX_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma#gamma", 920, true, false, 1],
-"MC13TeV_2017_GGbox"                 : [832, 0,     "/DiPhotonJetsBox_MGG-80toInf_13TeV-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 920, true, false, 1],
-"MC13TeV_2017_GGbox40to80"           : [832, 0,     "/DiPhotonJetsBox_M40_80-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 920, true, false, 1],
+"MC13TeV_2017_GG"                    : [134.3, 0,     "/DiPhotonJets_MGG-80toInf_13TeV_amcatnloFXFX_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma#gamma", 920, true, false, 1],
+"MC13TeV_2017_GGbox"                 : [82.51, 0,     "/DiPhotonJetsBox_MGG-80toInf_13TeV-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 920, true, false, 1],
+"MC13TeV_2017_GGbox40to80"           : [1, 0,     "/DiPhotonJetsBox_M40_80-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 920, true, false, 1],
 "MC13TeV_2017_ggHGG"                 : [832, 0,     "/GluGluHToGG_M-125_13TeV_powheg_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "H#rightarrow#gamma#gamma", 920, true, false, 1],
-"MC13TeV_2017_vbfHGG"                : [832, 0,     "/VBFHToGG_M-125_13TeV_powheg_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "H#rightarrow#gamma#gamma", 920, true, false, 1],
+"MC13TeV_2017_vbfHGG"                : [832,     0,     "/VBFHToGG_M-125_13TeV_powheg_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "H#rightarrow#gamma#gamma", 920, true, false, 1],
 "MC13TeV_2017_EWKZJJ"                : [4.32,    0,  "", "EWK Zjj", 41, false, false, 1],
-"MC13TeV_2017_IntZJJ"                : [4.32,    0,  "", "EWK Zjj", 41, false, false, 1],
-"MC13TeV_2017_EWKAJJ"                : [4.32,    0,  "/GJets_Mjj-500_SM_5f_TuneCP5_EWK_13TeV-madgraph-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "EWK #gammajj", 41, false, false, 1],
-"MC13TeV_2017_IntAJJ"                : [4.32,    0,  "/GJets_Mjj-500_SM_5f_TuneCP5_INTERFERENCE_13TeV-madgraph-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "EWK #gammajj", 41, false, false, 1],
+"MC13TeV_2017_IntZJJ"                : [4,    0,  "", "EWK Zjj", 41, false, false, 1],
+"MC13TeV_2017_EWKAJJ"                : [4.74,    0,  "/GJets_Mjj-500_SM_5f_TuneCP5_EWK_13TeV-madgraph-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "EWK #gammajj", 41, false, false, 1],
+"MC13TeV_2017_IntAJJ"                : [0.7,     0,  "/GJets_Mjj-500_SM_5f_TuneCP5_INTERFERENCE_13TeV-madgraph-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "EWK #gammajj", 41, false, false, 1],
 "Data13TeV_2017B_SinglePhoton"       : [1,       1, "/SinglePhoton/Run2017B-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
 "Data13TeV_2017C_SinglePhoton"       : [1,       1, "/SinglePhoton/Run2017C-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
 "Data13TeV_2017D_SinglePhoton"       : [1,       1, "/SinglePhoton/Run2017D-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
diff --git a/TopAnalysis/data/era2017/vbf_samples.json b/TopAnalysis/data/era2017/vbf_samples.json
index f9e1e05f..1e4e9533 100644
--- a/TopAnalysis/data/era2017/vbf_samples.json
+++ b/TopAnalysis/data/era2017/vbf_samples.json
@@ -1,4 +1,9 @@
 {
+"MC13TeV_2017_GJets_HT40to100"       : [20790 ,  0,  "/GJets_HT-40To100_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_1core_94X_mc2017_realistic_v14_ext1-v1/MINIAODSIM", "#gamma+jets", 41, false, false, 1],
+"MC13TeV_2017_GJets_HT100to200"      : [9238,    0,  "/GJets_HT-100To200_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma+jets", 920, false, false, 1],
+"MC13TeV_2017_GJets_HT200to400"      : [2305,    0,  "/GJets_HT-200To400_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma+jets", 920, false, false, 1],
+"MC13TeV_2017_GJets_HT400to600"      : [274.4,   0,  "/GJets_HT-400To600_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma+jets", 920, false, false, 1],
+"MC13TeV_2017_GJets_HT600toInf"      : [93.46,   0,  "/GJets_HT-600ToInf_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma+jets", 920, false, false, 1],
 "MC13TeV_2017_QCDEM_15to20"          : [2302200, 0,  "/QCD_Pt-15to20_EMEnriched_TuneCP5_13TeV_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "QCD", 865, false, false, 1],
 "MC13TeV_2017_QCDEM_20to30"          : [5352960, 0,  "/QCD_Pt-20to30_EMEnriched_TuneCP5_13TeV_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "QCD", 865, false, false, 1],
 "MC13TeV_2017_QCDEM_30to50"          : [9928000, 0,  "/QCD_Pt-30to50_EMEnriched_TuneCP5_13TeV_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "QCD", 865, false, false, 1],
@@ -7,32 +12,32 @@
 "MC13TeV_2017_QCDEM_120to170"        : [62964,   0,  "/QCD_Pt-120to170_EMEnriched_TuneCP5_13TeV_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "QCD", 865, false, false, 1],
 "MC13TeV_2017_QCDEM_170to300"        : [18810,   0,  "", "QCD", 865, false, false, 1],
 "MC13TeV_2017_QCDEM_300toInf"        : [1350,    0,  "/QCD_Pt-300toInf_EMEnriched_TuneCP5_13TeV_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "QCD", 865, false, false, 1],
-"MC13TeV_2017_GJets_HT40to100"       : [20790 ,  0,  "/GJets_HT-40To100_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_1core_94X_mc2017_realistic_v14_ext1-v1/MINIAODSIM", "#gamma+jets", 41, false, false, 1],
-"MC13TeV_2017_GJets_HT100to200"      : [9238,    0,  "/GJets_HT-100To200_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma+jets", 920, false, false, 1],
-"MC13TeV_2017_GJets_HT200to400"      : [2305,    0,  "/GJets_HT-200To400_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma+jets", 920, false, false, 1],
-"MC13TeV_2017_GJets_HT400to600"      : [274.4,   0,  "/GJets_HT-400To600_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma+jets", 920, false, false, 1],
-"MC13TeV_2017_GJets_HT600toInf"      : [93.46,   0,  "/GJets_HT-600ToInf_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma+jets", 920, false, false, 1],
-"MC13TeV_2017_TTJets"                : [832, 0,     "/TTJets_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, true, false, 1],
-"MC13TeV_2017_tW"                    : [35.85, 0,     "/ST_tW_top_5f_inclusiveDecays_TuneCP5_PSweights_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, true, false, 1],
-"MC13TeV_2017_tbarW"                 : [35.85, 0,     "/ST_tW_antitop_5f_inclusiveDecays_TuneCP5_PSweights_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, true, false, 1],
-"MC13TeV_2017_ZZ"                    : [12.14, 0,  "/ZZ_TuneCP5_13TeV-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, false, false, 1],
-"MC13TeV_2017_WZ"                    : [27.6, 0,   "/WZ_TuneCP5_13TeV-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, false, false, 1],
-"MC13TeV_2017_WW"                    : [75.8, 0,  "/WW_TuneCP5_13TeV-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, false, false, 1],
-"MC13TeV_2017_DY10to50_mlm"          : [18610, 0,  "/DYJetsToLL_M-10to50_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "DY", 41, false, false, 1],
-"MC13TeV_2017_DY50toInf_fxfx"         : [5765.4, 0,  "/DYJetsToLL_M-50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "DY", 41, false, false, 1],
+"MC13TeV_2017_TTJets"                : [832, 0,      "/TTJets_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, true, false, 1],
+"MC13TeV_2017_tW"                    : [35.85, 0,    "/ST_tW_top_5f_inclusiveDecays_TuneCP5_PSweights_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, true, false, 1],
+"MC13TeV_2017_tbarW"                 : [35.85, 0,    "/ST_tW_antitop_5f_inclusiveDecays_TuneCP5_PSweights_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, true, false, 1],
+"MC13TeV_2017_ZZ"                    : [12.14, 0,    "/ZZ_TuneCP5_13TeV-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, false, false, 1],
+"MC13TeV_2017_WZ"                    : [27.6, 0,     "/WZ_TuneCP5_13TeV-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, false, false, 1],
+"MC13TeV_2017_WW"                    : [75.8, 0,     "/WW_TuneCP5_13TeV-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, false, false, 1],
+"MC13TeV_2017_DY10to50_mlm"          : [18610, 0,    "/DYJetsToLL_M-10to50_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "DY,W", 41, false, false, 1],
+"MC13TeV_2017_DY50toInf_fxfx"        : [5765.4, 0,   "/DYJetsToLL_M-50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "DY,W", 41, false, false, 1],
+"MC13TeV_2017_WJets_mlm"             : [61526.7, 0,  "/WJetsToLNu_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "DY,W", 41,false,false,1],
+"MC13TeV_2017_WJets_mlm_ext1"        : [524.2, 0,    "/WJetsToLNu_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14_ext1-v2/MINIAODSIM", "DY,W", 41,false,false,1],
+"MC13TeV_2017_GG"                    : [134.3, 0,    "/DiPhotonJets_MGG-80toInf_13TeV_amcatnloFXFX_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma#gamma", 922, true, false, 1],
+"MC13TeV_2017_GGbox"                 : [82.51, 0,    "/DiPhotonJetsBox_MGG-80toInf_13TeV-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 922, true, false, 1],
+"MC13TeV_2017_GGbox40to80"           : [1, 0,        "/DiPhotonJetsBox_M40_80-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 922, true, false, 1],
 "MC13TeV_2017_EWKZJJ"                : [4.32,    0,  "", "EWK Zjj", 795, false, false, 1],
 "MC13TeV_2017_IntZJJ"                : [4.32,    0,  "", "EWK Zjj", 795, false, false, 1],
-"MC13TeV_2017_EWKAJJ"                : [4.32,    0,  "/GJets_Mjj-500_SM_5f_TuneCP5_EWK_13TeV-madgraph-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "EWK #gammajj", 797, false, false, 1],
-"MC13TeV_2017_IntAJJ"                : [4.32,    0,  "/GJets_Mjj-500_SM_5f_TuneCP5_INTERFERENCE_13TeV-madgraph-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "EWK #gammajj", 797, false, false, 1],
-"Data13TeV_2017B_SinglePhoton"       : [1,       1, "/SinglePhoton/Run2017B-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
-"Data13TeV_2017C_SinglePhoton"       : [1,       1, "/SinglePhoton/Run2017C-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
-"Data13TeV_2017D_SinglePhoton"       : [1,       1, "/SinglePhoton/Run2017D-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
-"Data13TeV_2017E_SinglePhoton"       : [1,       1, "/SinglePhoton/Run2017E-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
-"Data13TeV_2017F_SinglePhoton"       : [1,       1, "/SinglePhoton/Run2017F-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
-"Data13TeV_2017B_SingleMuon"         : [1,       1, "/SingleMuon/Run2017B-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
-"Data13TeV_2017C_SingleMuon"         : [1,       1, "/SingleMuon/Run2017C-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
-"Data13TeV_2017D_SingleMuon"         : [1,       1, "/SingleMuon/Run2017D-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
-"Data13TeV_2017E_SingleMuon"         : [1,       1, "/SingleMuon/Run2017E-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
-"Data13TeV_2017F_SingleMuon"         : [1,       1, "/SingleMuon/Run2017F-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0]
+"MC13TeV_2017_EWKAJJ"                : [4.74,    0,  "/GJets_Mjj-500_SM_5f_TuneCP5_EWK_13TeV-madgraph-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "EWK #gammajj", 797, false, false, 1],
+"MC13TeV_2017_IntAJJ"                : [0.7,     0,  "/GJets_Mjj-500_SM_5f_TuneCP5_INTERFERENCE_13TeV-madgraph-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "EWK #gammajj", 797, false, false, 1],
+"Data13TeV_2017B_SinglePhoton"       : [1,       1,  "/SinglePhoton/Run2017B-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
+"Data13TeV_2017C_SinglePhoton"       : [1,       1,  "/SinglePhoton/Run2017C-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
+"Data13TeV_2017D_SinglePhoton"       : [1,       1,  "/SinglePhoton/Run2017D-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
+"Data13TeV_2017E_SinglePhoton"       : [1,       1,  "/SinglePhoton/Run2017E-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
+"Data13TeV_2017F_SinglePhoton"       : [1,       1,  "/SinglePhoton/Run2017F-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
+"Data13TeV_2017B_SingleMuon"         : [1,       1,  "/SingleMuon/Run2017B-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
+"Data13TeV_2017C_SingleMuon"         : [1,       1,  "/SingleMuon/Run2017C-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
+"Data13TeV_2017D_SingleMuon"         : [1,       1,  "/SingleMuon/Run2017D-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
+"Data13TeV_2017E_SingleMuon"         : [1,       1,  "/SingleMuon/Run2017E-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0],
+"Data13TeV_2017F_SingleMuon"         : [1,       1,  "/SingleMuon/Run2017F-31Mar2018-v1/MINIAOD", "Data", 1, false, false, 0]
 }
 
-- 
GitLab


From 862c1fb1fad346c076c76223f5d4515e3f1e65ef Mon Sep 17 00:00:00 2001
From: Pedro <psilva@cern.ch>
Date: Thu, 15 Nov 2018 12:41:17 +0100
Subject: [PATCH 2/2] updating sample cross sections, vetoeing prompt photons
 in ttbar as well

---
 TopAnalysis/data/era2017/samples.json     | 6 +++---
 TopAnalysis/data/era2017/vbf_samples.json | 6 +++---
 TopAnalysis/interface/VBFVectorBoson.h    | 2 +-
 TopAnalysis/src/VBFVectorBoson.cc         | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/TopAnalysis/data/era2017/samples.json b/TopAnalysis/data/era2017/samples.json
index 35d8c923..ed8494fb 100644
--- a/TopAnalysis/data/era2017/samples.json
+++ b/TopAnalysis/data/era2017/samples.json
@@ -48,9 +48,9 @@
 "MC13TeV_2017_GJets_HT400to600_DR04" : [27.3,    0,  "/GJets_DR-0p4_HT-400To600_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma+jets", 41, false, false, 1],
 "MC13TeV_2017_GJets_HT600toInf_DR04" : [0.4,     0,  "/GJets_DR-0p4_HT-600ToInf_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma+jets", 41, false, false, 1],
 "MC13TeV_2017_GJets_flat15to6000"    : [1,   0,  "/GJet_Pt-15To6000_TuneCP5-Flat_13TeV_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma+jets flat", 41, false, false, 1],
-"MC13TeV_2017_GG"                    : [134.3, 0,     "/DiPhotonJets_MGG-80toInf_13TeV_amcatnloFXFX_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma#gamma", 920, true, false, 1],
-"MC13TeV_2017_GGbox"                 : [82.51, 0,     "/DiPhotonJetsBox_MGG-80toInf_13TeV-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 920, true, false, 1],
-"MC13TeV_2017_GGbox40to80"           : [1, 0,     "/DiPhotonJetsBox_M40_80-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 920, true, false, 1],
+"MC13TeV_2017_GG"                    : [135.1, 0,     "/DiPhotonJets_MGG-80toInf_13TeV_amcatnloFXFX_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma#gamma", 920, true, false, 1],
+"MC13TeV_2017_GGbox"                 : [84.4, 0,     "/DiPhotonJetsBox_MGG-80toInf_13TeV-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 920, true, false, 1],
+"MC13TeV_2017_GGbox40to80"           : [303.2, 0,     "/DiPhotonJetsBox_M40_80-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 920, true, false, 1],
 "MC13TeV_2017_ggHGG"                 : [832, 0,     "/GluGluHToGG_M-125_13TeV_powheg_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "H#rightarrow#gamma#gamma", 920, true, false, 1],
 "MC13TeV_2017_vbfHGG"                : [832,     0,     "/VBFHToGG_M-125_13TeV_powheg_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "H#rightarrow#gamma#gamma", 920, true, false, 1],
 "MC13TeV_2017_EWKZJJ"                : [4.32,    0,  "", "EWK Zjj", 41, false, false, 1],
diff --git a/TopAnalysis/data/era2017/vbf_samples.json b/TopAnalysis/data/era2017/vbf_samples.json
index 1e4e9533..e077eaf4 100644
--- a/TopAnalysis/data/era2017/vbf_samples.json
+++ b/TopAnalysis/data/era2017/vbf_samples.json
@@ -13,6 +13,7 @@
 "MC13TeV_2017_QCDEM_170to300"        : [18810,   0,  "", "QCD", 865, false, false, 1],
 "MC13TeV_2017_QCDEM_300toInf"        : [1350,    0,  "/QCD_Pt-300toInf_EMEnriched_TuneCP5_13TeV_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "QCD", 865, false, false, 1],
 "MC13TeV_2017_TTJets"                : [832, 0,      "/TTJets_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, true, false, 1],
+"MC13TeV_2017_TTGJets"               : [4.078, 0,    "/TTGJets_TuneCP5_13TeV-amcatnloFXFX-madspin-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "t#bar{t}#gamma", 920, true, false, 1],
 "MC13TeV_2017_tW"                    : [35.85, 0,    "/ST_tW_top_5f_inclusiveDecays_TuneCP5_PSweights_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, true, false, 1],
 "MC13TeV_2017_tbarW"                 : [35.85, 0,    "/ST_tW_antitop_5f_inclusiveDecays_TuneCP5_PSweights_13TeV-powheg-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, true, false, 1],
 "MC13TeV_2017_ZZ"                    : [12.14, 0,    "/ZZ_TuneCP5_13TeV-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "Top,VV", 920, false, false, 1],
@@ -22,9 +23,8 @@
 "MC13TeV_2017_DY50toInf_fxfx"        : [5765.4, 0,   "/DYJetsToLL_M-50_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "DY,W", 41, false, false, 1],
 "MC13TeV_2017_WJets_mlm"             : [61526.7, 0,  "/WJetsToLNu_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "DY,W", 41,false,false,1],
 "MC13TeV_2017_WJets_mlm_ext1"        : [524.2, 0,    "/WJetsToLNu_TuneCP5_13TeV-madgraphMLM-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14_ext1-v2/MINIAODSIM", "DY,W", 41,false,false,1],
-"MC13TeV_2017_GG"                    : [134.3, 0,    "/DiPhotonJets_MGG-80toInf_13TeV_amcatnloFXFX_pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "#gamma#gamma", 922, true, false, 1],
-"MC13TeV_2017_GGbox"                 : [82.51, 0,    "/DiPhotonJetsBox_MGG-80toInf_13TeV-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 922, true, false, 1],
-"MC13TeV_2017_GGbox40to80"           : [1, 0,        "/DiPhotonJetsBox_M40_80-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 922, true, false, 1],
+"MC13TeV_2017_GGbox"                 : [84.4, 0,     "/DiPhotonJetsBox_MGG-80toInf_13TeV-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 922, true, false, 1],
+"MC13TeV_2017_GGbox40to80"           : [303.2, 0,    "/DiPhotonJetsBox_M40_80-Sherpa/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM", "#gamma#gamma", 922, true, false, 1],
 "MC13TeV_2017_EWKZJJ"                : [4.32,    0,  "", "EWK Zjj", 795, false, false, 1],
 "MC13TeV_2017_IntZJJ"                : [4.32,    0,  "", "EWK Zjj", 795, false, false, 1],
 "MC13TeV_2017_EWKAJJ"                : [4.74,    0,  "/GJets_Mjj-500_SM_5f_TuneCP5_EWK_13TeV-madgraph-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM", "EWK #gammajj", 797, false, false, 1],
diff --git a/TopAnalysis/interface/VBFVectorBoson.h b/TopAnalysis/interface/VBFVectorBoson.h
index e140e3ea..564f977d 100644
--- a/TopAnalysis/interface/VBFVectorBoson.h
+++ b/TopAnalysis/interface/VBFVectorBoson.h
@@ -125,7 +125,7 @@ private:
 	TH1F * normH, * genPU;
 	TString era;
 	TH1* triggerList;
-	Bool_t debug, CR, QCDTemp, SRfake, skimtree, isQCDEMEnriched;
+	Bool_t debug, CR, QCDTemp, SRfake, skimtree, vetoPromptPhotons;
 	TFile * f /*inFile*/, *fMVATree, *fOut;
 	TTree * t /*inTree*/, *newTree /*MVA*/;
   	HistTool * ht;
diff --git a/TopAnalysis/src/VBFVectorBoson.cc b/TopAnalysis/src/VBFVectorBoson.cc
index 64b0fb15..bc10d448 100644
--- a/TopAnalysis/src/VBFVectorBoson.cc
+++ b/TopAnalysis/src/VBFVectorBoson.cc
@@ -228,7 +228,7 @@ void VBFVectorBoson::RunVBFVectorBoson()
 	isLowMJJLP = (isLowMJJ & !passLP);
 
         //veto prompt photons on the QCDEM enriched sample
-        if( isQCDEMEnriched && ev.gamma_isPromptFinalState[ photons[0].originalReference() ] ) {
+        if( vetoPromptPhotons && ev.gamma_isPromptFinalState[ photons[0].originalReference() ] ) {
           isVBF                 = false;
           isHighPt              = false;
           isHighPtAndVBF        = false;
@@ -439,7 +439,7 @@ void VBFVectorBoson::readTree(){
   if (debug) nentries = 10000; //restrict number of entries for testing
   //nentries = 10000;
   t->GetEntry(0);
-  isQCDEMEnriched = filename.Contains("_QCDEM_");
+  vetoPromptPhotons = filename.Contains("_QCDEM_") || filename.Contains("_TTJets");
 }
 
 void VBFVectorBoson::prepareOutput(){
-- 
GitLab