Merge pull request cms-sw#570 from jpata/vhbbHeppy80X_factorized_jec_v2

factorized jec uncertainty, vhbb-side

VHbbAnalysis/Heppy/data/jec/Spring16_25nsV6_MC_UncertaintySources_AK4Calo.txt

@@ -0,0 +1 @@
+Spring16_25nsV6_DATA_UncertaintySources_AK4Calo.txt

VHbbAnalysis/Heppy/data/jec/Spring16_25nsV6_MC_UncertaintySources_AK4JPT.txt

@@ -0,0 +1 @@
+Spring16_25nsV6_DATA_UncertaintySources_AK4JPT.txt

VHbbAnalysis/Heppy/data/jec/Spring16_25nsV6_MC_UncertaintySources_AK4PF.txt

@@ -0,0 +1 @@
+Spring16_25nsV6_DATA_UncertaintySources_AK4PF.txt

VHbbAnalysis/Heppy/data/jec/Spring16_25nsV6_MC_UncertaintySources_AK4PFPuppi.txt

@@ -0,0 +1 @@
+Spring16_25nsV6_DATA_UncertaintySources_AK4PFPuppi.txt

VHbbAnalysis/Heppy/data/jec/Spring16_25nsV6_MC_UncertaintySources_AK4PFchs.txt

@@ -0,0 +1 @@
+Spring16_25nsV6_DATA_UncertaintySources_AK4PFchs.txt

VHbbAnalysis/Heppy/data/jec/Spring16_25nsV6_MC_UncertaintySources_AK8PF.txt

@@ -0,0 +1 @@
+Spring16_25nsV6_DATA_UncertaintySources_AK8PF.txt

VHbbAnalysis/Heppy/data/jec/Spring16_25nsV6_MC_UncertaintySources_AK8PFPuppi.txt

@@ -0,0 +1 @@
+Spring16_25nsV6_DATA_UncertaintySources_AK8PFPuppi.txt

VHbbAnalysis/Heppy/data/jec/Spring16_25nsV6_MC_UncertaintySources_AK8PFchs.txt

@@ -0,0 +1 @@
+Spring16_25nsV6_DATA_UncertaintySources_AK8PFchs.txt

VHbbAnalysis/Heppy/test/validation/jec_unc.py

@@ -0,0 +1,25 @@
+import ROOT, sys, os
+from PhysicsTools.Heppy.physicsutils.JetReCalibrator import JetReCalibrator
+
+files = os.environ["FILE_NAMES"].split()
+files = ["root://storage01.lcg.cscs.ch//pnfs/lcg.cscs.ch/cms/trivcat/" + fi for fi in files]
+
+of = ROOT.TFile("out.root", "RECREATE")
+tt = ROOT.TChain("vhbb/tree")
+for fi in files:
+    fi = fi.strip()
+    print fi
+    tt.AddFile(fi)
+
+of.cd()
+tt.Draw("Jet_pt[0] >>+ nominal(200,20,520)")
+tt.Draw("Jet_pt[0]*Jet_corr[0] >>+ corr(200,20,520)")
+for jet_corr in JetReCalibrator.factorizedJetCorrections + ["JEC"]:
+    s1 = "(Jet_pt[0] * Jet_corr_{0}Up[0]) >>+ h__{0}__Up(200,20,520)".format(jet_corr)
+    s2 = "(Jet_pt[0] * Jet_corr_{0}Down[0]) >>+ h__{0}__Down(200,20,520)".format(jet_corr)
+    print s1
+    print s2
+    tt.Draw(s1)
+    tt.Draw(s2)
+of.Write()
+of.Close()

VHbbAnalysis/Heppy/test/validation/tth_sl_dl.py

@@ -23,8 +23,6 @@
     from PhysicsTools.HeppyCore.framework.looper import Looper
     for comp in components:
         print "processing",comp
-        if "reHLT" in comp.files[0]:
-            fix_reHLT(config)
         config.components = [comp] 
         looper = Looper( 'Loop_validation_tth_sl_dl_' + comp.name, config, nPrint = 0, nEvents = 1000)
         looper.loop()

VHbbAnalysis/Heppy/test/vhbb.py

@@ -315,6 +315,53 @@
 JetAna.addJECShifts=True
 JetAna.addJERShifts=True
 
+factorizedJetCorrections = [
+    "AbsoluteFlavMap",
+    "AbsoluteMPFBias",
+    "AbsoluteScale",
+    "AbsoluteStat",
+    "FlavorQCD",
+    "Fragmentation",
+    "PileUpDataMC",
+    "PileUpEnvelope",
+    "PileUpMuZero",
+    "PileUpPtBB",
+    "PileUpPtEC1",
+    "PileUpPtEC2",
+    "PileUpPtHF",
+    "PileUpPtRef",
+    "RelativeFSR",
+    "RelativeStatFSR",
+    "RelativeJEREC1",
+    "RelativeJEREC2",
+    "RelativeJERHF",
+    "RelativePtBB",
+    "RelativePtEC1",
+    "RelativePtEC2",
+    "RelativePtHF",
+    "RelativeStatEC",
+    #"RelativeStatEC2", #Does not exist in Spring16
+    "RelativeStatHF",
+    "SinglePionECAL",
+    "SinglePionHCAL",
+    "TimeEta",
+    "TimePt",
+    "Total"
+]
+JetAna.factorizedJetCorrections = factorizedJetCorrections
+for jet_corr in factorizedJetCorrections:
+    for sdir in ["Up", "Down"]:
+        name = jet_corr + sdir
+        jetTypeVHbb.variables += [
+            NTupleVariable(
+                "corr_{0}".format(name),
+                lambda x, name = name: getattr(x, 'corr{0}'.format(name), -99),
+                float,
+                mcOnly=True,
+                help=""
+            )
+        ]
+
 # delta-beta corrected isolation for muons:
 # https://twiki.cern.ch/twiki/bin/view/CMS/SWGuideMuonIdRun2#Muon_Isolation
 def mu_pfRelIso04(mu):