Merge pull request #1 from chernyavskaya/hh_tag_80X_20180626

Hh tag 80 x 20180626

DataFormats/src/DoubleHTag.cc

@@ -12,7 +12,7 @@ DoubleHTag::DoubleHTag( edm::Ptr<flashgg::DiPhotonCandidate> diPho, edm::Ptr<fla
     : mva_(-.2), MX_(0.), leadJet_(leadJet), subleadJet_(subleadJet) 
 {
     dipho_ = diPho;
-    dijet_ = leadJet_->p4() + subleadJet->p4();
+    dijet_ = leadJet_->p4() + subleadJet_->p4();
     this->setP4( dijet_ + dipho_->p4() );
 }
 

MetaData/data/cross_sections.json

@@ -194,6 +194,8 @@
 	"DiPhotonJetsBox_M40_80-Sherpa" : { "xs" : 303.2, "itype":10 },
 	"DiPhotonJetsBox_MGG-80toInf_13TeV-Sherpa" : { "xs" : 84.4, "itype":10 },
 	"DiPhotonJets_MGG-80toInf_13TeV_amcatnloFXFX_pythia8" : { "xs" : 135.1 },
+   "DiPhotonJetsBox2BJets_MGG-80toInf_13TeV-Sherpa" : {"xs" : 0.494},
+   "DiPhotonJetsBox1BJet_MGG-80toInf_13TeV-Sherpa" : {"xs" : 0.8674276},
         "QCD_Pt-30to40_DoubleEMEnriched_MGG-80toInf_TuneCUETP8M1_13TeV_Pythia8" : {"xs" : 22110.0 , "br" : 1.0,"itype":30 },
         "QCD_Pt-40toInf_DoubleEMEnriched_MGG-80toInf_TuneCUETP8M1_13TeV_Pythia8" : {"xs" : 113400.0 , "br" : 1.0,"itype":32 },
         "QCD_Pt-30toInf_DoubleEMEnriched_MGG-40to80_TuneCUETP8M1_13TeV_Pythia8" : {"xs" : 260500.0 , "br" : 1.0,"itype":31 },      

Systematics/python/doubleHCustomize.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 def variablesToDump(customize):
-    return [ "leadingJet_bDis := leadJet().bDiscriminator('pfCombinedInclusiveSecondaryVertexV2BJetTags')",#FIXME make the btag type configurable?
+    variables = [ "leadingJet_bDis := leadJet().bDiscriminator('pfCombinedInclusiveSecondaryVertexV2BJetTags')",#FIXME make the btag type configurable?
              "subleadingJet_bDis := subleadJet().bDiscriminator('pfCombinedInclusiveSecondaryVertexV2BJetTags')",
              "absCosThetaStar_CS := abs(getCosThetaStar_CS(6500))",#FIXME get energy from somewhere?
              "absCosTheta_bb := abs(CosThetaAngles()[1])",
@@ -14,7 +14,6 @@ def variablesToDump(customize):
              "subleadingPhotonSigOverE := diPhoton.subLeadingPhoton.sigEOverE",
              "sigmaMOverM := sqrt(0.5*(diPhoton.leadingPhoton.sigEOverE*diPhoton.leadingPhoton.sigEOverE + diPhoton.subLeadingPhoton.sigEOverE*diPhoton.subLeadingPhoton.sigEOverE))",
              "sigmaMOverMDecorr := getSigmaMDecorr()",
-             "sigmaMJets := getSigmaMOverMJets()",
              "PhoJetMinDr := getPhoJetMinDr()",#up to here input variables to MVA
              "HHbbggMVA := MVA()",
              "MX := MX()",
@@ -43,15 +42,11 @@ def variablesToDump(customize):
              "leadingJet_eta := leadJet().eta",
              "leadingJet_phi := leadJet().phi",
              "leadingJet_mass := leadJet().p4().M()",
-             "leadingJet_bRegNNCorr := leadJet().userFloat('bRegNNCorr')",
-             "leadingJet_bRegNNResolution := leadJet().userFloat('bRegNNResolution')",
 
              "subleadingJet_pt := subleadJet().pt",
              "subleadingJet_eta := subleadJet().eta",
              "subleadingJet_phi := subleadJet().phi",
              "subleadingJet_mass := subleadJet().p4().M()",
-             "subleadingJet_bRegNNCorr := subleadJet().userFloat('bRegNNCorr')",
-             "subleadingJet_bRegNNResolution := subleadJet().userFloat('bRegNNResolution')",
 
 
              "ttHMVA_MET := 0",# these variables are needed for ttH killer MVA, which has to be implemented in the producer with another mvaComputer
@@ -68,9 +63,16 @@ def variablesToDump(customize):
              "ttHMVA_leadingElectron :=0 ",
              "ttHMVA_subleadingElectron :=0 ",
              "ttHMVA_nelecs :=0 ",
-             "ttHHHbggMVA := 0"
-
-]
+             "ttHHHbggMVA := 0",
+    ]
+    if customize.doBJetRegression : variables +=[
+             "leadingJet_bRegNNCorr := leadJet().userFloat('bRegNNCorr')",
+             "leadingJet_bRegNNResolution := leadJet().userFloat('bRegNNResolution')",
+             "subleadingJet_bRegNNCorr := subleadJet().userFloat('bRegNNCorr')",
+             "subleadingJet_bRegNNResolution := subleadJet().userFloat('bRegNNResolution')",
+             "sigmaMJets := getSigmaMOverMJets()"
+    ]
+    return variables
 
 def tagList(customize,process):
     return [ ["DoubleHTag",12] ]#12 is the number of categories?
@@ -79,7 +81,7 @@ def tagList(customize,process):
 def customizeTagSequence(customize,process):
     process.load("flashgg.Taggers.flashggDoubleHTag_cff")
     from flashgg.Taggers.flashggTags_cff import UnpackedJetCollectionVInputTag
-    process.flashggDoubleHTag.JetTags = cms.VInputTag( ["bRegProducer%d" % icoll for icoll,coll in enumerate(UnpackedJetCollectionVInputTag) ] )
+    if customize.doBJetRegression : process.flashggDoubleHTag.JetTags = cms.VInputTag( ["bRegProducer%d" % icoll for icoll,coll in enumerate(UnpackedJetCollectionVInputTag) ] )
     ## customize here (regression, kin-fit, MVA...)
     ## process.flashggTagSequence += process.flashggDoubleHTagSequence
 #    pos = process.flashggTagSequence.index(process.flashggTagSorter) - 1 

Systematics/test/workspaceStd.py

@@ -328,7 +328,7 @@
 #"root://eoscms.cern.ch//eos/cms/store/group/phys_higgs/cmshgg/sethzenz/flashgg/RunIISummer16-2_4_1-25ns_Moriond17/2_4_1/THQ_HToGG_13TeV-madgraph-pythia8_TuneCUETP8M1/RunIISummer16-2_4_1-25ns_Moriond17-2_4_1-v0-RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/170114_100016/0000/myMicroAODOutputFile_9.root"
 #"root://eoscms.cern.ch//eos/cms//store/group/phys_higgs/cmshgg/sethzenz/flashgg/RunIISummer16-2_4_1-25ns_Moriond17/2_4_1/bbHToGG_M-125_4FS_ybyt_13TeV_amcatnlo/RunIISummer16-2_4_1-25ns_Moriond17-2_4_1-v0-RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/170114_095140/0000/myMicroAODOutputFile_9.root"
 #"root://eoscms.cern.ch//eos/cms//store/group/phys_higgs/cmshgg/sethzenz/flashgg/RunIISummer16-2_4_1-25ns_Moriond17/2_4_1/bbHToGG_M-125_4FS_yb2_13TeV_amcatnlo/RunIISummer16-2_4_1-25ns_Moriond17-2_4_1-v0-RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/170114_095013/0000/myMicroAODOutputFile_1.root"
-"root://eoscms.cern.ch//eos/cms//store/group/phys_higgs/cmshgg/sethzenz/flashgg/RunIISummer16-2_4_1-25ns_Moriond17/2_4_1/GluGluHToGG_M125_13TeV_amcatnloFXFX_pythia8/RunIISummer16-2_4_1-25ns_Moriond17-2_4_1-v0-RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext2-v1/170113_234241/0000/myMicroAODOutputFile_1.root"
+#"root://eoscms.cern.ch//eos/cms//store/group/phys_higgs/cmshgg/sethzenz/flashgg/RunIISummer16-2_4_1-25ns_Moriond17/2_4_1/GluGluHToGG_M125_13TeV_amcatnloFXFX_pythia8/RunIISummer16-2_4_1-25ns_Moriond17-2_4_1-v0-RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext2-v1/170113_234241/0000/myMicroAODOutputFile_1.root"
 #"root://eoscms.cern.ch//eos/cms/store/group/phys_higgs/cmshgg/sethzenz/flashgg/ReMiniAOD-03Feb2017-2_5_0-test/2_5_0/DoubleEG/ReMiniAOD-03Feb2017-2_5_0-test-2_5_0-v0-Run2016G-03Feb2017-v1/170210_054444/0000/myMicroAODOutputFile_264.root"
 #"root://eoscms.cern.ch//eos/cms/store/group/phys_higgs/cmshgg/sethzenz/flashgg/RunIISummer16-2_4_1-25ns_Moriond17/2_4_1/VBFHToGG_M-125_13TeV_powheg_pythia8/RunIISummer16-2_4_1-25ns_Moriond17-2_4_1-v0-RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/170114_092754/0000/myMicroAODOutputFile_10.root"
 #"root://eoscms.cern.ch//eos/cms/store/group/phys_higgs/cmshgg/ferriff/flashgg/RunIISpring16DR80X-2_3_0-25ns_Moriond17_MiniAODv2/2_3_0/DoubleEG/RunIISpring16DR80X-2_3_0-25ns_Moriond17_MiniAODv2-2_3_0-v0-Run2016B-23Sep2016-v2/161114_162452/0000/myMicroAODOutputFile_10.root"
@@ -352,6 +352,8 @@
 #"root://eoscms.cern.ch//eos/cms/store/group/phys_higgs/cmshgg/ferriff/flashgg/RunIIFall15DR76-1_3_0-25ns_ext1/1_3_1/QCD_Pt-30to40_DoubleEMEnriched_MGG-80toInf_TuneCUETP8M1_13TeV_Pythia8/RunIIFall15DR76-1_3_0-25ns_ext1-1_3_1-v0-RunIIFall15MiniAODv2-PU25nsData2015v1_76X_mcRun2_asymptotic_v12-v1/160127_023721/0000/myMicroAODOutputFile_1.root"
 #"root://eoscms.cern.ch//eos/cms/store/group/phys_higgs/cmshgg/ferriff/flashgg/RunIIFall15DR76-1_3_0-25ns_ext1/1_3_1/GJet_Pt-40toInf_DoubleEMEnriched_MGG-80toInf_TuneCUETP8M1_13TeV_Pythia8/RunIIFall15DR76-1_3_0-25ns_ext1-1_3_1-v0-RunIIFall15MiniAODv2-PU25nsData2015v1_76X_mcRun2_asymptotic_v12-v1/160210_050208/0000/myMicroAODOutputFile_1.root"
 #"root://eoscms.cern.ch//eos/cms/store/group/phys_higgs/cmshgg/ferriff/flashgg/RunIISpring16DR80X-2_2_0-25ns_ICHEP16_MiniAODv2/2_2_0/ttHJetToGG_M125_13TeV_amcatnloFXFX_madspin_pythia8_v2/RunIISpring16DR80X-2_2_0-25ns_ICHEP16_MiniAODv2-2_2_0-v0-RunIISpring16MiniAODv2-PUSpring16RAWAODSIM_reHLT_80X_mcRun2_asymptotic_v14-v1/160707_152047/0000/myMicroAODOutputFile_8.root"),skipEvents=cms.untracked.uint32(31500))
+#"root://cms-xrd-global.cern.ch//store/user/micheli/HHbbgg/MicroAod/RunIIMoriond17_HHbbgg_breg_extra4/1/GluGluToHHTo2B2G_node_box_13TeV-madgraph/RunIIMoriond17_HHbbgg_breg_extra4-1-v0-RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/180528_185053/0000/myMicroAODOutputFile_1.root"
+"root://xrootd-cms.infn.it//store/user/micheli/HHbbgg/MicroAod/RunIIMoriond17_HHbbgg_breg_v2/1/GluGluToHHTo2B2G_node_SM_13TeV-madgraph/RunIIMoriond17_HHbbgg_breg-1-v1-RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/180412_131554/0000/myMicroAODOutputFile_1.root"
 ))
 
 process.TFileService = cms.Service("TFileService",

Taggers/plugins/DoubleHTagProducer.cc

@@ -231,8 +231,9 @@ namespace flashgg {
 
 
             // find vertex associated to diphoton object
-            size_t vtx = (size_t)dipho->vertexIndex();
-            if( vtx >= jetTokens_.size() ) { vtx = 0; }
+            size_t vtx = (size_t)dipho->jetCollectionIndex();
+           // size_t vtx = (size_t)dipho->vertexIndex();
+           // if( vtx >= jetTokens_.size() ) { vtx = 0; }
             // and read corresponding jet collection
             edm::Handle<edm::View<flashgg::Jet> > jets;
             evt.getByToken( jetTokens_[vtx], jets);
@@ -254,19 +255,25 @@ namespace flashgg {
             if( cleaned_jets.size() < 2 ) { continue; }
             //dijet pair selection. Do pair according to pt and choose the pair with highest b-tag
             double sumbtag_ref = -999;
+            bool hasDijet = false;
             edm::Ptr<flashgg::Jet>  jet1, jet2;
             for( size_t ijet=0; ijet < cleaned_jets.size()-1;++ijet){
                 auto jet_1 = cleaned_jets[ijet];
-                auto jet_2 = cleaned_jets[ijet+1];
-                double sumbtag = jet_1->bDiscriminator(bTagType_) + jet_2->bDiscriminator(bTagType_);
-                if (sumbtag > sumbtag_ref) {
-                    sumbtag_ref = sumbtag;
-                    jet1 = jet_1;
-                    jet2 = jet_2;
+                for( size_t kjet=ijet+1; kjet < cleaned_jets.size();++kjet){
+                    auto jet_2 = cleaned_jets[kjet];
+                    auto dijet_mass = (jet_1->p4()+jet_2->p4()).mass(); 
+                    if (dijet_mass<mjjBoundaries_[0] || dijet_mass>mjjBoundaries_[1]) continue;
+                    double sumbtag = jet_1->bDiscriminator(bTagType_) + jet_2->bDiscriminator(bTagType_);
+                    if (sumbtag > sumbtag_ref) {
+                        hasDijet = true;
+                        sumbtag_ref = sumbtag;
+                        jet1 = jet_1;
+                        jet2 = jet_2;
+                    }
                 }
-
             }
-
+            if (!hasDijet) continue;             
+
             auto & leadJet = jet1; 
             auto & subleadJet = jet2; 
 

Taggers/python/flashggDoubleHTag_cfi.py

@@ -23,7 +23,7 @@
 
                                    MinJetPt   = cms.double(20.),
                                    MaxJetEta   = cms.double(2.5),
-                                   MJJBoundaries = cms.vdouble(70.,180.),
+                                   MJJBoundaries = cms.vdouble(70.,190.),
                                    BTagType = cms.untracked.string('pfCombinedInclusiveSecondaryVertexV2BJetTags'), #string for btag algorithm
                                    UseJetID = cms.bool(True),
                                    JetIDLevel = cms.string('Loose'),