Merge pull request cms-sw#586 from chernyavskaya/softActivityEWK

Soft activity for EWK analysis
jpata · Jan 9, 2017 · 3b3cd82 · 3b3cd82
2 parents ef593e1 + dbd1fc3
commit 3b3cd82
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/VHbbAnalysis/Heppy/python/VHbbAnalyzer.py b/VHbbAnalysis/Heppy/python/VHbbAnalyzer.py
@@ -31,7 +31,7 @@ def declareHandles(self):
         self.handles['rhoN'] =  AutoHandle( 'fixedGridRhoFastjetCentralNeutral','double' )
         self.handles['rhoCHPU'] =  AutoHandle( 'fixedGridRhoFastjetCentralChargedPileUp','double' )
         self.handles['rhoCentral'] =  AutoHandle( 'fixedGridRhoFastjetCentral','double' )
-        if getattr(self.cfg_ana,"doSoftActivityVH", False) or getattr(self.cfg_ana,"doVBF", True):
+        if getattr(self.cfg_ana,"doSoftActivityVH", False) or getattr(self.cfg_ana,"doVBF", True) or getattr(self.cfg_ana, "doSoftActivityEWK", False):
             self.handles['pfCands'] =  AutoHandle( 'packedPFCandidates', 'std::vector<pat::PackedCandidate>' )
         if self.cfg_comp.isMC:
             self.handles['GenInfo'] = AutoHandle( ('generator','',''), 'GenEventInfoProduct' )
@@ -113,6 +113,15 @@ def doSoftActivityVH(self,event) :
             excludedJets+=[event.cleanJetsAll[event.isrJetVH]]
         event.softActivityVHJets=[x for x in self.softActivity(event,j1,j2,excludedJets,-1000) if x.pt() > 2.0 ]
 
+    def doSoftActivityEWK(self,event) :
+        if not len(event.cleanJetsAll) >= 2 :
+           return
+        j1=event.cleanJetsAll[0]
+        j2=event.cleanJetsAll[1]
+        leadingPtJets = event.cleanJetsAll[0:2]
+        excludedJets=leadingPtJets+event.selectedElectrons+event.selectedMuons
+        event.softActivityEWKJets=self.softActivity(event,j1,j2,excludedJets,-1000)
+
 
     def addPullVector(self,event) :
       """ Add color flow properties to the jetsForHiggs jet collections.
@@ -474,6 +483,7 @@ def initOutputs (self,event) :
         event.hjidxDiJetPtByCSV = []
         event.softActivityJets=[]
         event.softActivityVHJets=[]
+        event.softActivityEWKJets=[]
         event.rhoN= -1
         event.rhoCHPU= -1
         event.rhoCentral= -1
@@ -538,6 +548,8 @@ def process(self, event):
 	    self.doVBF(event)
         if getattr(self.cfg_ana,"doSoftActivityVH", False) :
             self.doSoftActivityVH(event)
+        if getattr(self.cfg_ana,"doSoftActivityEWK", False) :
+            self.doSoftActivityEWK(event)
 
         self.doQuickTkMET(event)
 

diff --git a/VHbbAnalysis/Heppy/test/vhbb.py b/VHbbAnalysis/Heppy/test/vhbb.py
@@ -110,6 +110,7 @@
           "V"    : NTupleObject("V", fourVectorType, help="z or w"),
           "softActivityJets"    : NTupleObject("softActivity", softActivityType, help="VBF soft activity variables"),
           "softActivityVHJets"    : NTupleObject("softActivityVH", softActivityType, help="VH soft activity variables"),
+          "softActivityEWKJets"    : NTupleObject("softActivityEWK", softActivityType, help="EWK soft activity variables"),
           "l1MET"       : NTupleObject("l1MET",   twoVectorType , help="Stage-2 L1 trigger MET", mcOnly=False),        
        #   "l1MET2"       : NTupleObject("l1MET2",   twoVectorType , help="Stage-2 L1 trigger MET", mcOnly=False),   #l1MET2 is defined in "l1t::EtSum" but it is empty
           "l1MHT"       : NTupleObject("l1MHT",   twoVectorType , help="Stage-2 L1 trigger MHT", mcOnly=False),        
@@ -141,6 +142,7 @@
                 "inclusiveTaus"  : NTupleCollection("TauGood", tauTypeVHbb, 25, help="Taus after the preselection"),
                 "softActivityJets"    : NTupleCollection("softActivityJets", fourVectorType, 5, help="jets made for soft activity"),
                 "softActivityVHJets"    : NTupleCollection("softActivityVHJets", fourVectorType, 5, help="jets made for soft activity VH version"),
+                "softActivityEWKJets"    : NTupleCollection("softActivityEWKJets", fourVectorType, 5, help="jets made for soft activity EWK version"),
                 "goodVertices"    : NTupleCollection("primaryVertices", primaryVertexType, 4, help="first four PVs"), 
 
 		#dump of gen objects
@@ -411,6 +413,7 @@ def ele_mvaEleID_Trig_preselection(ele) :
 #    higgsJetsPreSelectionVBF = lambda x: (( x.puJetId() > 0 and x.jetID('POG_PFID_Loose')) or abs(x.eta())>3.0 ) and x.pt() >  20,
     passall=False,
     doSoftActivityVH=True,
+    doSoftActivityEWK=True,
     doVBF=True,
     regressions = [
         {"weight":"ttbar-spring16-500k-13d-300t.weights.xml", "name":"jet0Regression", "vtypes":[0,1,2,3,4,5,-1]},