Merge pull request cms-sw#10 from gzevi/SUSY5_on_CMSSW_9_4_7

Susy5 on cmssw 9 4 7
sethcooper · Jun 12, 2018 · 18b846f · 18b846f
2 parents 701ad8b + aa2780e
commit 18b846f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/python/TnPTreeProducer_cfg.py b/python/TnPTreeProducer_cfg.py
@@ -335,6 +335,7 @@
     setattr( process.tnpEleIDs.variables , 'el_miniIsoChg', cms.string("userFloat('miniIsoChg')") )
     setattr( process.tnpEleIDs.variables , 'el_miniIsoAll', cms.string("userFloat('miniIsoAll')") )
     setattr( process.tnpEleIDs.variables , 'el_ptRatio', cms.string("userFloat('ptRatio')") )
+    setattr( process.tnpEleIDs.variables , 'el_ptRatioUncorr', cms.string("userFloat('ptRatioUncorr')") )
     setattr( process.tnpEleIDs.variables , 'el_ptRel', cms.string("userFloat('ptRel')") )
     setattr( process.tnpEleIDs.variables , 'el_MVATTH', cms.InputTag("susyEleVarHelper:electronMVATTH") )   
     setattr( process.tnpEleIDs.variables , 'el_sip3d', cms.InputTag("susyEleVarHelper:sip3d") )

diff --git a/python/electronsExtrasSUSY_cff.py b/python/electronsExtrasSUSY_cff.py
@@ -29,19 +29,38 @@ def addSusyIDs(process, options):
     from PhysicsTools.NanoAOD.electrons_cff import slimmedElectronsWithUserData
     from PhysicsTools.NanoAOD.electrons_cff import electronMVATTH
 
+    doJEC = True
+    if (doJEC):
+        from PhysicsTools.NanoAOD.jets_cff import updatedJets
+        from PhysicsTools.NanoAOD.jets_cff import jetCorrFactors # is this needed?
+        jetCorrFactors.src ='slimmedJets'
+        updatedJets.jetSource ='slimmedJets'
+        process.updatedJets = updatedJets
+        process.jetCorrFactors = jetCorrFactors
+    else:
+        ptRatioRelForEle.srcJet = cms.InputTag("slimmedJets")
+
     process.isoForEle = isoForEle 
     process.ptRatioRelForEle = ptRatioRelForEle
     process.slimmedElectronsWithUserData = slimmedElectronsWithUserData
     process.electronMVATTH = electronMVATTH
 
+    # Also save the raw ptRatio, with the JECs from the miniAOD
+    ptRatioRelForEleUncorr = ptRatioRelForEle.clone()
+    ptRatioRelForEleUncorr.srcJet = cms.InputTag("slimmedJets")
+    process.ptRatioRelForEleUncorr = ptRatioRelForEleUncorr
+
+
     # Make a new electron collection, with additional variables that are used for the LeptonMVA below
     process.slimmedElectronsWithUserData.src = cms.InputTag(options['ELECTRON_COLL'])
     process.slimmedElectronsWithUserData.userFloats = cms.PSet(
         miniIsoChg = cms.InputTag("isoForEle:miniIsoChg"),
         miniIsoAll = cms.InputTag("isoForEle:miniIsoAll"),
         PFIsoChg = cms.InputTag("isoForEle:PFIsoChg"),
         PFIsoAll = cms.InputTag("isoForEle:PFIsoAll"),
+        PFIsoAll04 = cms.InputTag("isoForEle:PFIsoAll04"),
         ptRatio = cms.InputTag("ptRatioRelForEle:ptRatio"),
+        ptRatioUncorr = cms.InputTag("ptRatioRelForEleUncorr:ptRatio"),
         ptRel = cms.InputTag("ptRatioRelForEle:ptRel"),
         jetNDauChargedMVASel = cms.InputTag("ptRatioRelForEle:jetNDauChargedMVASel"),
         )
@@ -50,12 +69,13 @@ def addSusyIDs(process, options):
 
 
     # Run the ttH MVA
-    # Cannot take EGMMVA directly from VID, because the TTHMVA producer only loads userFloat. Need to first put the EGMMVA in the object as a userFloat
+    # Cannot take EGMMVA directly from VID, because the TTHMVA producer only loads userFloat. Need to first put the EGMMVA in the object as a userFloats, with the names the TTHMVA expects
     process.slimmedElectronsWithUserDataWithVID = process.slimmedElectronsWithUserData.clone()
     process.slimmedElectronsWithUserDataWithVID.src = cms.InputTag("slimmedElectronsWithUserData")
     process.slimmedElectronsWithUserDataWithVID.userCands = cms.PSet() # Removed
     process.slimmedElectronsWithUserDataWithVID.userFloats = cms.PSet(
         mvaSpring16HZZ = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Spring16HZZV1Values"),
+        mvaFall17noIso = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Fall17NoIsoV1Values"),
         )
 
     process.electronMVATTH.src = cms.InputTag("slimmedElectronsWithUserDataWithVID")
@@ -82,13 +102,16 @@ def addSusyIDs(process, options):
     # The DataEmbedder (slimmedElectronsWithUserData) breaks the references, so we need to run VID and EleVarHelper after it --> Again, can never add VID results as userFloats
     # Solution: make a temp electron collection with VID, use it to calculate the TTHMVA, and then teach the SusyElectronVariableHelper to load 2 electron collections, taking MVATTH from the temp one and adding it as a susyEleVarHelper variable. That way, the susyEleVarHelper re-establishes the link between TTHMVA and the main electron collection
 
+    process.susy_sequence = cms.Sequence()
 
+    if (doJEC) :
+        process.susy_sequence += process.jetCorrFactors
+        process.susy_sequence += process.updatedJets
+        process.susy_sequence += process.ptRatioRelForEleUncorr
 
-    process.susy_sequence = cms.Sequence(
-        process.isoForEle +
-        process.ptRatioRelForEle + 
-        process.slimmedElectronsWithUserData 
-        )
+    process.susy_sequence += process.isoForEle
+    process.susy_sequence += process.ptRatioRelForEle
+    process.susy_sequence += process.slimmedElectronsWithUserData
 
     process.susy_sequence_requiresVID = cms.Sequence(
         process.slimmedElectronsWithUserDataWithVID +