From fcf509268c8eee22ab971c9ea5a560e9a9d47ab4 Mon Sep 17 00:00:00 2001 From: maria Date: Wed, 12 Apr 2017 20:16:34 +0200 Subject: [PATCH] fix label ttbar --- dat/configTopBot_FullHad.dat | 2 ++ dat/topBot_FullHad.2017.dat | 2 +- src/AnalysisChargedHiggsTBfullHad.cpp | 17 +++++++++++------ src/AnalysisChargedHiggsTopBottom.cpp | 7 +++++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dat/configTopBot_FullHad.dat b/dat/configTopBot_FullHad.dat index 440fa900b3b71..a42cf509e57a1 100644 --- a/dat/configTopBot_FullHad.dat +++ b/dat/configTopBot_FullHad.dat @@ -11,6 +11,8 @@ Files= include=dat/catalog/2017.moriond/tt.dat ## signal include=dat/catalog/2017.moriond/topbottom.dat +## QCD +include=dat/catalog/2017.moriond/qcd.dat Files=root://eoscms///store/group/phys_higgs/ceballos/Nero/v2.2/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/170210_070023/0000/NeroNtuples_974.root,root://eoscms///store/group/phys_higgs/ceballos/Nero/v2.2/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/170210_070023/0000/NeroNtuples_975.root,root://eoscms///store/group/phys_higgs/ceballos/Nero/v2.2/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/170210_070023/0000/NeroNtuples_976.root,root://eoscms///store/group/phys_higgs/ceballos/Nero/v2.2/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/170210_070023/0000/NeroNtuples_977.root,root://eosuser///eos/user/a/amarini/Nero/v2.2/ChargedHiggs_HplusTB_HplusToTB_M-3000_13TeV_amcatnlo_pythia8/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/NeroNtuples_0.root,root://eosuser///eos/user/a/amarini/Nero/v2.2/ChargedHiggs_HplusTB_HplusToTB_M-3000_13TeV_amcatnlo_pythia8/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/NeroNtuples_1.root,root://eosuser///eos/user/a/amarini/Nero/v2.2/ChargedHiggs_HplusTB_HplusToTB_M-3000_13TeV_amcatnlo_pythia8/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/NeroNtuples_2.root,root://eosuser///eos/user/a/amarini/Nero/v2.2/ChargedHiggs_HplusTB_HplusToTB_M-3000_13TeV_amcatnlo_pythia8/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/NeroNtuples_3.root,root://eosuser///eos/user/a/amarini/Nero/v2.2/ChargedHiggs_HplusTB_HplusToTB_M-3000_13TeV_amcatnlo_pythia8/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/NeroNtuples_4.root,root://eosuser///eos/user/a/amarini/Nero/v2.2/ChargedHiggs_HplusTB_HplusToTB_M-3000_13TeV_amcatnlo_pythia8/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/NeroNtuples_5.root,root://eosuser///eos/user/a/amarini/Nero/v2.2/ChargedHiggs_HplusTB_HplusToTB_M-3000_13TeV_amcatnlo_pythia8/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/NeroNtuples_6.root,root://eosuser///eos/user/a/amarini/Nero/v2.2/ChargedHiggs_HplusTB_HplusToTB_M-3000_13TeV_amcatnlo_pythia8/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/NeroNtuples_7.root,root://eoscms//store/group/phys_exotica/monojet/zdemirag/moriond80x_MC_v2/v2.2/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/170209_110659/0000/NeroNtuples_8.root,root://eoscms//store/group/phys_exotica/monojet/zdemirag/moriond80x_MC_v2/v2.2/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/170209_110659/0000/NeroNtuples_7.root,root://eoscms//store/group/phys_exotica/monojet/zdemirag/moriond80x_MC_v2/v2.2/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/170209_110659/0000/NeroNtuples_6.root,root://eoscms//store/group/phys_exotica/monojet/zdemirag/moriond80x_MC_v2/v2.2/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/170209_110659/0000/NeroNtuples_5.root,root://eoscms//store/group/phys_exotica/monojet/zdemirag/moriond80x_MC_v2/v2.2/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/170209_110659/0000/NeroNtuples_4.root,root://eoscms//store/group/phys_exotica/monojet/zdemirag/moriond80x_MC_v2/v2.2/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/170209_110659/0000/NeroNtuples_3.root,root://eoscms//store/group/phys_exotica/monojet/zdemirag/moriond80x_MC_v2/v2.2/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/170209_110659/0000/NeroNtuples_2.root diff --git a/dat/topBot_FullHad.2017.dat b/dat/topBot_FullHad.2017.dat index f4e74dbfdc962..269bb78f0f490 100644 --- a/dat/topBot_FullHad.2017.dat +++ b/dat/topBot_FullHad.2017.dat @@ -17,6 +17,6 @@ addConfig=ChargedHiggsTopBottomFullHad|AddLabel('ChargedHiggs_HplusTB_HplusToTB_ addConfig=ChargedHiggsTopBottomFullHad|AddLabel('ChargedHiggs_HplusTB_HplusToTB_M-200_13TeV_amcatnlo_pythia8') addConfig=ChargedHiggsTopBottomFullHad|AddLabel('ChargedHiggs_HplusTB_HplusToTB_M-180_13TeV_amcatnlo_pythia8') -addConfig=ChargedHiggsTopBottomFullHad|AddLabel('TT_TuneCUETP8M2T4') +addConfig=ChargedHiggsTopBottomFullHad|AddLabel('TT_TuneCUETP8M2T4_13TeV-powheg-pythia8') addConfig=ChargedHiggsTopBottomFullHad|AddLabel('QCD_HT') \ No newline at end of file diff --git a/src/AnalysisChargedHiggsTBfullHad.cpp b/src/AnalysisChargedHiggsTBfullHad.cpp index 7d20172cf1ede..18c4058c09936 100644 --- a/src/AnalysisChargedHiggsTBfullHad.cpp +++ b/src/AnalysisChargedHiggsTBfullHad.cpp @@ -187,8 +187,8 @@ void ChargedHiggsTopBottomFullHad::setTree(Event*e, string label, string categor // V+jets // mc = 200; - if(label.find("DYJetsToLL_M") !=string::npos) mc =221 ; - if(label.find("WJetsToLNu")!=string::npos) mc =222; + if(label.find("DYJetsToLL_M-50_HT") !=string::npos) mc =221 ; + if(label.find("WJetsToLNu_HT")!=string::npos) mc =222; // EWK // missing tribosons @@ -260,7 +260,7 @@ void ChargedHiggsTopBottomFullHad::setTree(Event*e, string label, string categor } } - if( not e->IsRealData() and (label.find("TT_TuneCUETP8M2T4") !=string::npos) ){ + if( not e->IsRealData() and (label.find("TT_TuneCUETP8M2T4_13TeV-powheg-pythia8") !=string::npos) ){ if(WBKGplus!=NULL) { SetTreeVar("WBKGplus_pt",WBKGplus->Pt()); SetTreeVar("WBKGplus_eta",WBKGplus->Eta()); @@ -553,6 +553,7 @@ void ChargedHiggsTopBottomFullHad::Preselection() bool ChargedHiggsTopBottomFullHad::genInfoForSignal(Event*e) { + GenParticle *genCH = NULL; WFromTopAss=NULL; @@ -587,6 +588,10 @@ bool ChargedHiggsTopBottomFullHad::genInfoForSignal(Event*e) { GenParticle *genpar = e->GetGenParticle(i); //ch-higgs if(abs(genpar->GetPdgId()) == 37) if(genCH==NULL) genCH = genpar; + } + + for(Int_t i = 0; i < e->NGenPar(); i++){ + GenParticle *genpar = e->GetGenParticle(i); if(genCH!=NULL){ //top if( abs(genpar->GetPdgId()) == 6 && abs(genpar->GetParentPdgId()) == 37 ) topFromH = genpar; @@ -637,6 +642,7 @@ bool ChargedHiggsTopBottomFullHad::genInfoForSignal(Event*e) { } } } + return rightComb; } @@ -762,7 +768,7 @@ void ChargedHiggsTopBottomFullHad::classifyHF(Event*e, string label, string cate // if((label.find("TTTo2L2Nu")!=string::npos) || (label.find("TTToSemilepton")!=string::npos)) { - if((label.find("TTTo2L2Nu")!=string::npos) || (label.find("TTToSemilepton")!=string::npos) || (label.find("TT_TuneCUETP8M2T4")!=string::npos) ) { + if((label.find("TTTo2L2Nu_TuneCUETP8M2")!=string::npos) || (label.find("TTToSemilepton_TuneCUETP8M2")!=string::npos) || (label.find("TT_TuneCUETP8M2T4_13TeV-powheg-pythia8")!=string::npos) ) { //https://github.com/cms-sw/cmssw/blob/CMSSW_8_0_X/TopQuarkAnalysis/TopTools/plugins/GenTtbarCategorizer.cc#L35 string LabelHF="other_"; @@ -828,9 +834,8 @@ int ChargedHiggsTopBottomFullHad::analyze(Event*e,string systname) bool Baseline=(e->Bjets() > 0); bool rightCombination =true; - if ( not e->IsRealData() ){ + if ( not e->IsRealData() and ((label.find("HplusToTB") !=string::npos ) or (label.find("TT_TuneCUETP8M2T4_13TeV-powheg-pythia8") !=string::npos ))){ - rightCombination=false; // reset for Higgs rightCombination=genInfoForSignal(e); // compute the right combination in the higgs case } diff --git a/src/AnalysisChargedHiggsTopBottom.cpp b/src/AnalysisChargedHiggsTopBottom.cpp index 2efbb7138b38b..030d3792381c9 100644 --- a/src/AnalysisChargedHiggsTopBottom.cpp +++ b/src/AnalysisChargedHiggsTopBottom.cpp @@ -244,8 +244,8 @@ void ChargedHiggsTopBottom::setTree(Event*e, string label, string category ) if(label.find("DYJets-madgraph") !=string::npos) mc =221 ; if(label.find("WJetsToLNu_TuneCUETP8M1_13TeV-madgraphMLM-pythia8")!=string::npos) mc =222; } else { - if(label.find("DYJetsToLL_M") !=string::npos) mc =221 ; - if(label.find("WJetsToLNu")!=string::npos) mc =222; + if(label.find("DYJetsToLL_M-50_HT") !=string::npos) mc =221 ; + if(label.find("WJetsToLNu_HT")!=string::npos) mc =222; } // EWK // missing tribosons @@ -1144,6 +1144,9 @@ void ChargedHiggsTopBottom::Preselection() for ( string l : AllLabel() ) { + cout << "inside BookCutFlow" << "l = " << l << endl; + // if(e->IsRealData() && (!systname.find("NONE") !=string::npos)) cout << "possible to return " << endl; + BookCutFlow(l, ""); if(do1lAnalysis) BookCutFlow(l, "_1Mu"); if(do1lAnalysis) BookCutFlow(l, "_1Ele");