Merge pull request cms-sw#340 from arizzi/caterina

take @cvernier stuff
bianchini · Feb 3, 2016 · 36db34c · 36db34c
2 parents 4c731bb + 7097be8
commit 36db34c
Show file tree

Hide file tree

Showing 3 changed files with 4,851 additions and 14 deletions.
diff --git a/VHbbAnalysis/Heppy/python/JetRegression.py b/VHbbAnalysis/Heppy/python/JetRegression.py
@@ -11,16 +11,16 @@ def __init__(self,weightfile,name) :
 #      for i in range(0,3):
         reader = ROOT.TMVA.Reader()
         self.Jet_pt =array.array('f',[0])
-        self.Jet_rawPt = array.array('f',[0])
+        self.Jet_corr = array.array('f',[0])
         self.rho = array.array('f',[0])
         self.Jet_eta = array.array('f',[0])
         self.Jet_mt = array.array('f',[0])
         self.Jet_leadTrackPt = array.array('f',[0])
         self.Jet_leptonPtRel = array.array('f',[0])
         self.Jet_leptonPt =  array.array('f',[0])
         self.Jet_leptonDeltaR = array.array('f',[0])
-        self.Jet_chEmEF = array.array('f',[0])
-        self.Jet_chHEF = array.array('f',[0])
+        #self.Jet_chEmEF = array.array('f',[0])
+        #self.Jet_chHEF = array.array('f',[0])
         self.Jet_neHEF = array.array('f',[0])
         self.Jet_neEmEF = array.array('f',[0])
         self.Jet_chMult = array.array('f',[0])
@@ -30,16 +30,16 @@ def __init__(self,weightfile,name) :
         self.Jet_vtxNtrk = array.array('f',[0])
         self.Jet_vtx3deL = array.array('f',[0])
         reader.AddVariable("Jet_pt",self.Jet_pt)
-        reader.AddVariable("Jet_rawPt",self.Jet_rawPt)
+        reader.AddVariable("Jet_corr",self.Jet_corr)
         reader.AddVariable("rho",self.rho)
         reader.AddVariable("Jet_eta",self.Jet_eta)
         reader.AddVariable("Jet_mt",self.Jet_mt)
         reader.AddVariable("Jet_leadTrackPt",self.Jet_leadTrackPt)
         reader.AddVariable("Jet_leptonPtRel",self.Jet_leptonPtRel)
         reader.AddVariable("Jet_leptonPt",self.Jet_leptonPt)
         reader.AddVariable("Jet_leptonDeltaR",self.Jet_leptonDeltaR)
-        reader.AddVariable("Jet_chEmEF",self.Jet_chEmEF)
-        reader.AddVariable("Jet_chHEF",self.Jet_chHEF)
+        #reader.AddVariable("Jet_chEmEF",self.Jet_chEmEF)
+        #reader.AddVariable("Jet_chHEF",self.Jet_chHEF)
         reader.AddVariable("Jet_neHEF",self.Jet_neHEF)
         reader.AddVariable("Jet_neEmEF",self.Jet_neEmEF)
         reader.AddVariable("Jet_chMult",self.Jet_chMult)
@@ -58,7 +58,7 @@ def evaluateRegression(self, event, attrName="pt_reg"):
 	for j in event.jetsForHiggs :
 		self.Jet_pt[0] = j.pt()
 		self.Jet_eta[0] = j.eta()
-		self.Jet_rawPt[0] = j.pt()*j.rawFactor()
+		self.Jet_corr[0] = j.rawFactor()
 		self.Jet_mt[0] = j.mt()
 		self.Jet_leadTrackPt[0] = j.leadTrackPt()
 		if len(j.leptons) > 0       :
@@ -69,8 +69,8 @@ def evaluateRegression(self, event, attrName="pt_reg"):
 			self.Jet_leptonPtRel[0] = -99
 			self.Jet_leptonPt[0] =  -99
 			self.Jet_leptonDeltaR[0] =-99
-		self.Jet_chEmEF[0] = j.chargedEmEnergyFraction()
-		self.Jet_chHEF[0] = j.chargedHadronEnergyFraction()
+		#self.Jet_chEmEF[0] = j.chargedEmEnergyFraction()
+		#self.Jet_chHEF[0] = j.chargedHadronEnergyFraction()
 		self.Jet_neHEF[0] = j.neutralHadronEnergyFraction()
 		self.Jet_neEmEF[0] = j.neutralEmEnergyFraction()
 		self.Jet_chMult[0] = j.chargedMultiplicity()