Merge pull request #191 from danbarto/type1Integration

Integration of type-1 MET corrections starting from raw MET

Author: fgolf

data/jme/Autumn18_V19_DATA.tgz

@@ -107,6 +107,7 @@ def getSmearValsPt(self, jetIn, genJetIn, rho):
         jet_pt_sf_and_uncertainty = {}
         for enum_central_or_shift in [ enum_nominal, enum_shift_up, enum_shift_down ]:
             self.params_sf_and_uncertainty.setJetEta(jet.Eta())
+            self.params_sf_and_uncertainty.setJetPt(jet.Pt()) # Added bc. of pt dependency in 2018. Thanks to kschweiger!
             jet_pt_sf_and_uncertainty[enum_central_or_shift] = self.jerSF_and_Uncertainty.getScaleFactor(self.params_sf_and_uncertainty, enum_central_or_shift)
 
         smear_vals = {}

data/jme/Autumn18_V19_MC.tgz

@@ -3,16 +3,16 @@
 import subprocess
 
 from PhysicsTools.NanoAODTools.postprocessing.modules.jme.jetmetUncertainties import *
-from PhysicsTools.NanoAODTools.postprocessing.modules.jme.jetRecalib import *
+from PhysicsTools.NanoAODTools.postprocessing.modules.jme.fatJetUncertainties import *
 
 # JEC dict
 jecTagsMC = {'2016' : 'Summer16_07Aug2017_V11_MC', 
              '2017' : 'Fall17_17Nov2017_V32_MC', 
-             '2018' : 'Autumn18_V8_MC'}
+             '2018' : 'Autumn18_V19_MC'}
 
 archiveTagsDATA = {'2016' : 'Summer16_07Aug2017_V11_DATA', 
                    '2017' : 'Fall17_17Nov2017_V32_DATA', 
-                   '2018' : 'Autumn18_V8_DATA'
+                   '2018' : 'Autumn18_V19_DATA'
                   }
 
 jecTagsDATA = { '2016B' : 'Summer16_07Aug2017BCD_V11_DATA', 
@@ -27,15 +27,15 @@
                 '2017D' : 'Fall17_17Nov2017DE_V32_DATA', 
                 '2017E' : 'Fall17_17Nov2017DE_V32_DATA', 
                 '2017F' : 'Fall17_17Nov2017F_V32_DATA', 
-                '2018A' : 'Autumn18_RunA_V8_DATA',
-                '2018B' : 'Autumn18_RunB_V8_DATA',
-                '2018C' : 'Autumn18_RunC_V8_DATA',
-                '2018D' : 'Autumn18_RunD_V8_DATA',
+                '2018A' : 'Autumn18_RunA_V19_DATA',
+                '2018B' : 'Autumn18_RunB_V19_DATA',
+                '2018C' : 'Autumn18_RunC_V19_DATA',
+                '2018D' : 'Autumn18_RunD_V19_DATA',
                 } 
 
 jerTagsMC = {'2016' : 'Summer16_25nsV1_MC',
              '2017' : 'Fall17_V3_MC',
-             '2018' : 'Fall17_V3_MC'
+             '2018' : 'Autumn18_V7_MC'
             }
 
 #jet mass resolution: https://twiki.cern.ch/twiki/bin/view/CMS/JetWtagging
@@ -53,8 +53,9 @@
               '2018' : [0.982, 0.978, 0.986] # Use 2017 values for 2018 until 2018 are released
             }
 
-def createJMECorrector(isMC=True, dataYear=2016, runPeriod="B", jesUncert="Total", redojec=False, jetType = "AK4PFchs", noGroom=False):
+def createJMECorrector(isMC=True, dataYear=2016, runPeriod="B", jesUncert="Total", redojec=False, jetType = "AK4PFchs", noGroom=False, metBranchName="MET"):
 
+    dataYear = str(dataYear)
     jecTag_ = jecTagsMC[dataYear] if isMC else jecTagsDATA[dataYear + runPeriod]
 
     jmeUncert_ = [x for x in jesUncert.split(",")]
@@ -65,14 +66,28 @@ def createJMECorrector(isMC=True, dataYear=2016, runPeriod="B", jesUncert="Total
 
     jmsValues_ = jmsValues[dataYear]
 
+    archiveTag_ = archiveTagsDATA[dataYear]
+  
+    met_ = metBranchName
+    
     print 'JEC=', jecTag_, '\t JER=', jerTag_
+    print 'MET branch=', met_
 
     jmeCorrections = None
     #jme corrections
-    if isMC:
-        jmeCorrections = lambda : jetmetUncertaintiesProducer(era=dataYear, globalTag=jecTag_, jesUncertainties=jmeUncert_, redoJEC=redojec, jerTag=jerTag_, jetType = jetType, noGroom = noGroom, jmrVals = jmrValues_, jmsVals = jmsValues_)
+
+    if 'AK4' in jetType:
+      if isMC:
+          jmeCorrections = lambda : jetmetUncertaintiesProducer(era=dataYear,                      globalTag=jecTag_, jesUncertainties=jmeUncert_, jerTag=jerTag_, jetType = jetType, metBranchName=met_)
+      else:
+          jmeCorrections = lambda : jetmetUncertaintiesProducer(era=dataYear, archive=archiveTag_, globalTag=jecTag_, jesUncertainties=jmeUncert_, jerTag=jerTag_, jetType = jetType, metBranchName=met_, isData=True)
+    # no MET variations calculated
     else:
-        jmeCorrections = lambda : jetRecalib(globalTag=jecTag_, archive=archiveTag[dataYear], jetType=jetType, redojec=redojec)
+      if isMC:
+          jmeCorrections = lambda : fatJetUncertaintiesProducer(era=dataYear,                      globalTag=jecTag_, jesUncertainties=jmeUncert_, redoJEC=redojec, jetType = jetType, jerTag=jerTag_, jmrVals = jmrValues_, jmsVals = jmsValues_)
+      else:
+          jmeCorrections = lambda : fatJetUncertaintiesProducer(era=dataYear, archive=archiveTag_, globalTag=jecTag_, jesUncertainties=jmeUncert_, redoJEC=redojec, jetType = jetType, isData=True)
+
     return jmeCorrections