Adding option to do jet MC matching with pT threhsold or not, to solv…

…e issue with smearJets
kirschen · May 26, 2016 · 588351c · 588351c
1 parent c715177
commit 588351c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/PhysicsTools/Heppy/python/analyzers/objects/JetAnalyzer.py b/PhysicsTools/Heppy/python/analyzers/objects/JetAnalyzer.py
@@ -91,6 +91,7 @@ def __init__(self, cfg_ana, cfg_comp, looperName):
           # instantiate the jet re-calibrator
           self.jetReCalibrator = JetReCalibrator(GT, cfg_ana.recalibrationType, doResidual, cfg_ana.jecPath, **kwargs)
         self.doPuId = getattr(self.cfg_ana, 'doPuId', True)
+        self.matchJetsWithThreshold = getattr(self.cfg_ana, 'matchJetsWithThreshold', False)
         self.jetLepDR = getattr(self.cfg_ana, 'jetLepDR', 0.4)
         self.jetLepArbitration = getattr(self.cfg_ana, 'jetLepArbitration', lambda jet,lepton: lepton) 
         self.lepPtMin = getattr(self.cfg_ana, 'minLepPt', -1)
@@ -166,7 +167,10 @@ def process(self, event):
                 for igj, gj in enumerate(self.genJets):
                     gj.index = igj
 #                self.matchJets(event, allJets)
-                self.matchJets(event, [ j for j in allJets if j.pt()>self.cfg_ana.jetPt ]) # To match only jets above chosen threshold
+                    if self.matchJetsWithThreshold and not getattr(self.cfg_ana, 'smearJets', False):
+                        self.matchJets(event, [ j for j in allJets if j.pt()>self.cfg_ana.jetPt ]) # To match only jets above chosen threshold
+                    else:
+                        self.matchJets(event, allJets)
             if getattr(self.cfg_ana, 'smearJets', False):
                 self.smearJets(event, allJets)
 
@@ -508,6 +512,7 @@ def smearJets(self, event, jets):
     cleanJetsFromIsoTracks = False,
     alwaysCleanPhotons = False,
     do_mc_match=True,
+    matchJetsWithThreshold=False,
     cleanGenJetsFromPhoton = False,
     jetGammaDR=0.4,
     cleanFromLepAndGammaSimultaneously = False,