Merge pull request cms-sw#114 from mariadalfonso/TopBotV12

Top bot v12
mariadalfonso · Mar 3, 2017 · bfc9d8b · bfc9d8b
2 parents d0d9051 + 56022ca
commit bfc9d8b
Show file tree

Hide file tree

Showing 18 changed files with 424 additions and 222 deletions.
diff --git a/aux/mcdb.2017.moriond.txt b/aux/mcdb.2017.moriond.txt
diff --git a/aux/pileup.2017.BCDEFGH.root b/aux/pileup.2017.BCDEFGH.root
diff --git a/aux/sf_database.2017.moriond.txt b/aux/sf_database.2017.moriond.txt
@@ -20,17 +20,13 @@ eletight th2f aux/PassingTight_EGM2D.root:EGamma_SF2D
 # https://twiki.cern.ch/twiki/bin/viewauth/CMS/MuonWorkInProgressAndPagResults#Results_on_the_full_2016_data
 # https://indico.cern.ch/event/594396/contributions/2402538/attachments/1389409/2116003/20161215_MuonPOG_GeneralPPD.pdf
 
-#muIDtight th2f aux/Mu_ID_EfficienciesAndSF_BCDEF.root:MC_NUM_TightID_DEN_genTracks_PAR_pt_eta/abseta_pt_ratio
-#muIDiso th2f aux/Mu_ISO_EfficienciesAndSF_BCDEF.root:TightISO_TightID_pt_eta/abseta_pt_ratio
-
-muIDtight th2f aux/mu_ID_EfficienciesAndSF_GH.root:MC_NUM_TightID_DEN_genTracks_PAR_pt_eta/abseta_pt_ratio
-muISO th2f aux/mu_ISO_EfficienciesAndSF_GH.root:TightISO_TightID_pt_eta/abseta_pt_ratio
+muID th2f aux/mu_ID_EfficienciesAndSF_GH.root:MC_NUM_MediumID2016_DEN_genTracks_PAR_pt_eta/abseta_pt_ratio
+muISO th2f aux/mu_ISO_EfficienciesAndSF_GH.root:TightISO_MediumID_pt_eta/abseta_pt_ratio
 muTRG th2f aux/mu_trigger_EfficienciesAndSF_Period4.root:IsoMu24_OR_IsoTkMu24_PtEtaBins/abseta_pt_ratio
 muIDloose th2f aux/mu_ID_EfficienciesAndSF_GH.root:MC_NUM_LooseID_DEN_genTracks_PAR_pt_eta/abseta_pt_ratio
 muISOloose th2f aux/mu_ISO_EfficienciesAndSF_GH.root:LooseISO_LooseID_pt_eta/abseta_pt_ratio
 
 
-
 ###################
 ## BTag from POG ##
 ## https://twiki.cern.ch/twiki/bin/view/CMS/BtagRecommendation80XReReco

diff --git a/dat/catalog/2017.moriond/MuonEG.dat b/dat/catalog/2017.moriond/MuonEG.dat
@@ -1,4 +1,4 @@
-sub=ceballosHigData|/store/group/phys_higgs/ceballos/setup80x_ichep/Data/Nero/v2.0
+sub=ceballosHigData|/store/group/phys_higgs/ceballos/Data/Nero/v2.2/
 
 addfiles=%(ceballosHigData)s/MuonEG
 

diff --git a/dat/catalog/2017.moriond/doubleEG.dat b/dat/catalog/2017.moriond/doubleEG.dat
@@ -1,4 +1,4 @@
-sub=ceballosHigData|/store/group/phys_higgs/ceballos/setup80x_ichep/Data/Nero/v2.0
+sub=ceballosHigData|/store/group/phys_higgs/ceballos/Data/Nero/v2.2/
 
 addfiles=%(ceballosHigData)s/DoubleEG/
 

diff --git a/dat/catalog/2017.moriond/doubleMuon.dat b/dat/catalog/2017.moriond/doubleMuon.dat
@@ -1,4 +1,4 @@
-sub=ceballosHigData|/store/group/phys_higgs/ceballos/setup80x_ichep/Data/Nero/v2.0
+sub=ceballosHigData|/store/group/phys_higgs/ceballos/Data/Nero/v2.2/
 
 addfiles=%(ceballosHigData)s/DoubleMuon/
 
diff --git a/dat/catalog/2017.moriond/dy.dat b/dat/catalog/2017.moriond/dy.dat
@@ -1,18 +1,18 @@
 sub=ceballosHig|/store/group/phys_higgs/ceballos/Nero/v2.2/
-sub=zdemiragExoMono|/store/group/phys_exotica/monojet/zdemirag/moriond80x/v2.1/
-sub=ceballosUser|/store/user/ceballos/Nero/v2.1/
+sub=zdemiragExoMonov2|/store/group/phys_exotica/monojet/zdemirag/moriond80x_MC_v2/v2.2/
+sub=ceballosUser|/store/user/ceballos/Nero/v2.2/
 
 addfiles=%(ceballosHig)s/DYJetsToLL_M-50_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
 addfiles=%(ceballosHig)s/DYJetsToLL_M-10to50_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
 
 #otherwise adding twice
-#addfiles=%(zdemiragExoMono)s/DYJetsToLL_M-50_HT-70to100_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/DYJetsToLL_M-50_HT-100to200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/DYJetsToLL_M-50_HT-200to400_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/DYJetsToLL_M-50_HT-400to600_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/DYJetsToLL_M-50_HT-600to800_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/DYJetsToLL_M-50_HT-800to1200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/DYJetsToLL_M-50_HT-1200to2500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/DYJetsToLL_M-50_HT-2500toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/DYJetsToLL_M-50_HT-70to100_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/DYJetsToLL_M-50_HT-100to200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/DYJetsToLL_M-50_HT-200to400_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/DYJetsToLL_M-50_HT-400to600_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/DYJetsToLL_M-50_HT-600to800_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/DYJetsToLL_M-50_HT-800to1200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/DYJetsToLL_M-50_HT-1200to2500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/DYJetsToLL_M-50_HT-2500toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
 
 
diff --git a/dat/catalog/2017.moriond/rares.dat b/dat/catalog/2017.moriond/rares.dat
@@ -1,16 +1,17 @@
-sub=ceballosHig|/store/group/phys_higgs/ceballos/Nero/v2.1/
+sub=ceballosHig|/store/group/phys_higgs/ceballos/Nero/v2.2/
 sub=ceballosUser|/store/user/ceballos/Nero/v2.2/
 sub=amarini|/store/user/amarini/Nero/v2.1
+sub=zdemiragExoMonov2|/store/group/phys_exotica/monojet/zdemirag/moriond80x_MC_v2/v2.2/
 
-#### ---> missing  ttHJetTobb, TTTT, WH_HToBB_ , tZq_nunu_4f
+#### ---> missing  WH_HToBB_ , tZq_nunu_4f
 
 addfiles=%(ceballosUser)s/tZq_ll_4f_13TeV-amcatnlo-pythia8
 ##addfiles=%(ceballosHig)s/tZq_nunu_4f_13TeV-amcatnlo-pythia8_TuneCUETP8M1
 
 addfiles=%(ceballosUser)s/VHToNonbb_M125_13TeV_amcatnloFXFX_madspin_pythia8
 ##addfiles=%(ceballosHig)s/WH_HToBB_WToLNu_M125_13TeV_amcatnloFXFX_madspin_pythia8
 
-##addfiles=%(ceballosUser)s/TTTT_TuneCUETP8M1_13TeV-amcatnlo-pythia8
+addfiles=%(zdemiragExoMonov2)s/TTTT_TuneCUETP8M1_13TeV-amcatnlo-pythia8
 
 addfiles=%(ceballosUser)s/TTZToQQ_TuneCUETP8M1_13TeV-amcatnlo-pythia8
 addfiles=%(ceballosUser)s/TTZToLLNuNu_M-10_TuneCUETP8M1_13TeV-amcatnlo-pythia8
@@ -19,8 +20,8 @@ addfiles=%(ceballosUser)s/TTWJetsToLNu_TuneCUETP8M1_13TeV-amcatnloFXFX-madspin-p
 
 addfiles=%(ceballosUser)s/TTGJets_TuneCUETP8M1_13TeV-amcatnloFXFX-madspin-pythia8
 
-##addfiles=%(ceballosHig)s/ttHJetTobb_M125_13TeV_amcatnloFXFX_madspin_pythia8
-##addfiles=%(ceballosUser)s/ttHToNonbb_M125_TuneCUETP8M2_ttHtranche3_13TeV-powheg-pythia8
+addfiles=%(zdemiragExoMonov2)s/ttHTobb_M125_TuneCUETP8M2_ttHtranche3_13TeV-powheg-pythia8
+addfiles=%(ceballosUser)s/ttHToNonbb_M125_TuneCUETP8M2_ttHtranche3_13TeV-powheg-pythia8
 
 addfiles=%(ceballosUser)s/WWW_4F_TuneCUETP8M1_13TeV-amcatnlo-pythia8
 addfiles=%(ceballosUser)s/WWZ_TuneCUETP8M1_13TeV-amcatnlo-pythia8

diff --git a/dat/catalog/2017.moriond/st.dat b/dat/catalog/2017.moriond/st.dat
@@ -1,11 +1,10 @@
-sub=zdexo|/store/group/phys_exotica/monojet/zdemirag/moriond80x/Nero/v2.0
 sub=ceballosUser|/store/user/ceballos/Nero/v2.2/
-sub=ceballosHig|/store/group/phys_higgs/ceballos/Nero/v2.1/
-sub=ceballosHigMono|/store/group/phys_exotica/monojet/zdemirag/moriond80x/v2.1/
+sub=ceballosHig|/store/group/phys_higgs/ceballos/Nero/v2.2/
 sub=amarini|/store/user/amarini/Nero/v2.1
+sub=zdemiragExoMonov2|/store/group/phys_exotica/monojet/zdemirag/moriond80x_MC_v2/v2.2/
 
-%addfiles=%(ceballosHigMono)s/ST_t-channel_antitop_4f_inclusiveDecays_13TeV-powhegV2-madspin-pythia8_TuneCUETP8M1
-%addfiles=%(ceballosHigMono)s/ST_t-channel_top_4f_inclusiveDecays_13TeV-powhegV2-madspin-pythia8_TuneCUETP8M1
+addfiles=%(zdemiragExoMonov2)s/ST_t-channel_antitop_4f_inclusiveDecays_13TeV-powhegV2-madspin-pythia8_TuneCUETP8M1
+addfiles=%(zdemiragExoMonov2)s/ST_t-channel_top_4f_inclusiveDecays_13TeV-powhegV2-madspin-pythia8_TuneCUETP8M1
 addfiles=%(ceballosUser)s/ST_tW_antitop_5f_inclusiveDecays_13TeV-powheg-pythia8_TuneCUETP8M1
 addfiles=%(ceballosUser)s/ST_tW_top_5f_inclusiveDecays_13TeV-powheg-pythia8_TuneCUETP8M1
 

diff --git a/dat/catalog/2017.moriond/tt.dat b/dat/catalog/2017.moriond/tt.dat
@@ -1,5 +1,3 @@
 sub=ceballosHig|/store/group/phys_higgs/ceballos/Nero/v2.2/
-sub=zdemiragExoMono|/store/group/phys_exotica/monojet/zdemirag/moriond80x/v2.1/
-sub=amarini|/store/user/amarini/Nero/v2.1
 
 addfiles=%(ceballosHig)s/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8
diff --git a/dat/catalog/2017.moriond/ttlep.dat b/dat/catalog/2017.moriond/ttlep.dat
@@ -1,6 +1,6 @@
 sub=ceballosHig|/store/group/phys_higgs/ceballos/Nero/v2.2/
-sub=zdemiragExoMono|/store/group/phys_exotica/monojet/zdemirag/moriond80x/v2.1
-sub=ceballosUser|/store/user/ceballos/Nero/v2.1/
+sub=zdemiragExoMonov2|/store/group/phys_exotica/monojet/zdemirag/moriond80x_MC_v2/v2.2/
+sub=ceballosUser|/store/user/ceballos/Nero/v2.2/
 
 addfiles=%(ceballosHig)s/TTTo2L2Nu_TuneCUETP8M2_ttHtranche3_13TeV-powheg-pythia8
 addfiles=%(ceballosHig)s/TTToSemilepton_TuneCUETP8M2_ttHtranche3_13TeV-powheg-pythia8
diff --git a/dat/catalog/2017.moriond/vv.dat b/dat/catalog/2017.moriond/vv.dat
@@ -1,6 +1,6 @@
 sub=ceballosUser|/store/user/ceballos/Nero/v2.2/
-sub=ceballosHig|/store/group/phys_higgs/ceballos/Nero/v2.1/
-sub=zdemiragExoMono|/store/group/phys_exotica/monojet/zdemirag/moriond80x/v2.1/
+sub=ceballosHig|/store/group/phys_higgs/ceballos/Nero/v2.2/
+sub=zdemiragExoMonov2|/store/group/phys_exotica/monojet/zdemirag/moriond80x_MC_v2/v2.2/
 
 addfiles=%(ceballosUser)s/WWTo2L2Nu_13TeV-powheg
 addfiles=%(ceballosUser)s/WZTo1L1Nu2Q_13TeV_amcatnloFXFX_madspin_pythia8
@@ -11,11 +11,11 @@ addfiles=%(ceballosUser)s/ZZTo2L2Nu_13TeV_powheg_pythia8
 addfiles=%(ceballosUser)s/ZZTo2L2Q_13TeV_amcatnloFXFX_madspin_pythia8
 addfiles=%(ceballosUser)s/ZZTo4L_13TeV_powheg_pythia8
 
-#addfiles=%(zdemiragExoMono)s/WW_TuneCUETP8M1
-#addfiles=%(zdemiragExoMono)s/WW_TuneCUETP8M1_ext
-#addfiles=%(zdemiragExoMono)s/WZ_TuneCUETP8M1
-#addfiles=%(zdemiragExoMono)s/WZ_TuneCUETP8M1_ext
-#addfiles=%(zdemiragExoMono)s/ZZ_TuneCUETP8M1
-#addfiles=%(zdemiragExoMono)s/ZZ_TuneCUETP8M1_ext
+#addfiles=%(zdemiragExoMonov2)s/WW_TuneCUETP8M1
+#addfiles=%(zdemiragExoMonov2)s/WW_TuneCUETP8M1_ext
+#addfiles=%(zdemiragExoMonov2)s/WZ_TuneCUETP8M1
+#addfiles=%(zdemiragExoMonov2)s/WZ_TuneCUETP8M1_ext
+#addfiles=%(zdemiragExoMonov2)s/ZZ_TuneCUETP8M1
+#addfiles=%(zdemiragExoMonov2)s/ZZ_TuneCUETP8M1_ext
 
 
diff --git a/dat/catalog/2017.moriond/wjets.dat b/dat/catalog/2017.moriond/wjets.dat
@@ -1,15 +1,15 @@
 sub=ceballosHig|/store/group/phys_higgs/ceballos/Nero/v2.2/
-sub=zdemiragExoMono|/store/group/phys_exotica/monojet/zdemirag/moriond80x/v2.1/
+sub=zdemiragExoMonov2|/store/group/phys_exotica/monojet/zdemirag/moriond80x_MC_v2/v2.2/
 sub=ceballosUser|/store/user/ceballos/Nero/v2.2/
 
 addfiles=%(ceballosUser)s/WJetsToLNu_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
 
 #still miss the low ht part (no cross section for HT-70To100)
-#addfiles=%(zdemiragExoMono)s/WJetsToLNu_HT-70To100_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/WJetsToLNu_HT-100To200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/WJetsToLNu_HT-200To400_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/WJetsToLNu_HT-400To600_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/WJetsToLNu_HT-600To800_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/WJetsToLNu_HT-800To1200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/WJetsToLNu_HT-1200To2500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
-#addfiles=%(zdemiragExoMono)s/WJetsToLNu_HT-2500ToInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/WJetsToLNu_HT-70To100_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/WJetsToLNu_HT-100To200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/WJetsToLNu_HT-200To400_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/WJetsToLNu_HT-400To600_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/WJetsToLNu_HT-600To800_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/WJetsToLNu_HT-800To1200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/WJetsToLNu_HT-1200To2500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
+#addfiles=%(zdemiragExoMonov2)s/WJetsToLNu_HT-2500ToInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8
diff --git a/interface/AnalysisChargedHiggsTopBottom.hpp b/interface/AnalysisChargedHiggsTopBottom.hpp
@@ -94,9 +94,12 @@ class ChargedHiggsTopBottom:  virtual public AnalysisBase
     double evt_HT=-1;
     double evt_ST=-1;
     double evt_minDRbb=-1;
+    double evt_DRlbmaxPt=-1;
     double evt_minDRbb_invMass=-1;
     double evt_minDRlb_invMass=-1;
 
+    double evt_DEtaMaxBB=-1;
+
     double evt_MT=-1;
     double evt_MT2bb=-1;
     double evt_MT2bb1l=-1;
@@ -115,15 +118,19 @@ class ChargedHiggsTopBottom:  virtual public AnalysisBase
     vector<float> bdt;
 
     int nGenB = 0 ;
+    int genLepSig = 0 ;
 
     /////
     /////
 
     GenParticle * bAss=NULL;
     GenParticle * bFromTopH=NULL;
     GenParticle * bFromTopAss=NULL;
+    GenParticle * topFromH=NULL;
     GenParticle * bFromH=NULL;
     GenParticle * leptonFromTopH=NULL;
+    GenParticle * WFromTopH=NULL;
+    GenParticle * WFromTopAss=NULL;
     GenParticle * leptonTopAssH=NULL;
 
     /////

diff --git a/interface/Lepton.hpp b/interface/Lepton.hpp
@@ -54,7 +54,7 @@ class Lepton : virtual public Object,
         inline void SetCharge(int x){charge=x;}
         inline void SetTightId( bool x=true){tightId=x;}
         inline void SetMediumId( bool x=true){mediumId=x;}
-        inline void SetMva(int x){mva=x;}
+        inline void SetMva(float x){mva=x;}
 
 
         inline float GetIsoCut()const {return isocut_;}