Merge pull request cms-sw#615 from chernyavskaya/qgl_physicstools_root

HEPPY: QGL training updated in two commits (central heppy and heppy)
arizzi · Jan 13, 2017 · 161a97c · 161a97c
2 parents fca3ec2 + ea638a7
commit 161a97c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/PhysicsTools/Heppy/data/pdfQG_AK4chs_13TeV_cmssw8020_v1.root b/PhysicsTools/Heppy/data/pdfQG_AK4chs_13TeV_cmssw8020_v1.root
diff --git a/PhysicsTools/Heppy/python/physicsutils/QGLikelihoodCalculator.py b/PhysicsTools/Heppy/python/physicsutils/QGLikelihoodCalculator.py
@@ -74,7 +74,7 @@ def init(self, filename) :
         rhoBin  = int(rhoStr.split("rho")[1])
         histogram = hist.ReadObj()
         histogram.SetDirectory(0)
-        self.pdfs[qgType][varName][etaBin][ptBin][rhoBin] = histogram
+        if varName in ["axis2","ptD","mult"] : self.pdfs[qgType][varName][etaBin][ptBin][rhoBin] = histogram
 
     print "[QGLikelihoodCalculator]: pdfs initialized..."
 

diff --git a/VHbbAnalysis/Heppy/test/vhbb.py b/VHbbAnalysis/Heppy/test/vhbb.py
@@ -316,7 +316,7 @@
 JetAna.jetPt = 15
 JetAna.jetEta = 4.7
 JetAna.doQG=True
-JetAna.QGpath=os.environ['CMSSW_BASE']+"/src/PhysicsTools/Heppy/data/pdfQG_AK4chs_13TeV_v2b.root"
+JetAna.QGpath=os.environ['CMSSW_BASE']+"/src/PhysicsTools/Heppy/data/pdfQG_AK4chs_13TeV_cmssw8020_v1.root"
 JetAna.recalibrateJets=True
 JetAna.jecPath=os.environ['CMSSW_BASE']+"/src/VHbbAnalysis/Heppy/data/jec"
 #JetAna.mcGT="Fall15_25nsV2_MC"