Skip to content

Commit

Permalink
Merge pull request #12 from alefisico/PUPPIMETwithPUPPIV15_106X_tmp
Browse files Browse the repository at this point in the history 
Puppime twith puppiv15 106 x tmp
  • Loading branch information
@alefisico
alefisico authored Nov 26, 2020
2 parents a3d1f3c + e0556e9 commit 1d43e87
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 32 deletions.
46 changes: 17 additions & 29 deletions PhysicsTools/PatUtils/python/tools/runMETCorrectionsAndUncertainties.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,13 +519,11 @@ def produceMET(self, process, metType, metModuleSequence, postfix):
getattr(process, _myPatMet).srcPFCands = copy.copy(self.getvalue("pfCandCollection"))
from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
for modifier in run2_miniAOD_UL, run2_nanoAOD_106Xv1:
modifier.toModify( getattr(process, _myPatMet), srcPFCands = "puppiForMET" if self.getvalue("Puppi") else copy.copy(self.getvalue("pfCandCollection")) )
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify( getattr(process, _myPatMet), srcPFCands = "puppiForMET" if self.getvalue("Puppi") else copy.copy(self.getvalue("pfCandCollection")) )
if metType == "PF":
from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
for modifier in run2_miniAOD_UL, run2_nanoAOD_106Xv1:
modifier.toModify(getattr(process, _myPatMet), srcLeptons = \
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(getattr(process, _myPatMet), srcLeptons = \
cms.VInputTag( copy.copy(self.getvalue("electronCollection")) if self.getvalue("onMiniAOD") else cms.InputTag("pfeGammaToCandidate","electrons"),
copy.copy(self.getvalue("muonCollection")),
copy.copy(self.getvalue("photonCollection")) if self.getvalue("onMiniAOD") else cms.InputTag("pfeGammaToCandidate","photons")
Expand Down Expand Up @@ -639,8 +637,7 @@ def getCorrectedMET(self, process, metType, correctionLevel,produceIntermediateC
getattr(process, "patPFMetTxyCorr"+postfix).srcPFlow = self._parameters["pfCandCollection"].value
from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
for modifier in run2_miniAOD_UL, run2_nanoAOD_106Xv1:
modifier.toModify( getattr(process, "patPFMetTxyCorr"+postfix), srcPFlow = "puppiForMET" if self.getvalue("Puppi") else self._parameters["pfCandCollection"].value )
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify( getattr(process, "patPFMetTxyCorr"+postfix), srcPFlow = "puppiForMET" if self.getvalue("Puppi") else self._parameters["pfCandCollection"].value )


#Enable MET significance if the type1 MET is computed
Expand All @@ -650,9 +647,8 @@ def getCorrectedMET(self, process, metType, correctionLevel,produceIntermediateC
getattr(process, _myPatMet).srcPFCands = copy.copy(self.getvalue("pfCandCollection"))
from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
for modifier in run2_miniAOD_UL, run2_nanoAOD_106Xv1:
modifier.toModify(getattr(process, _myPatMet), srcPFCands = "puppiForMET" if self.getvalue("Puppi") else copy.copy(self.getvalue("pfCandCollection")) )
modifier.toModify(getattr(process, _myPatMet), srcLeptons = \
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(getattr(process, _myPatMet), srcPFCands = "puppiForMET" if self.getvalue("Puppi") else copy.copy(self.getvalue("pfCandCollection")) )
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(getattr(process, _myPatMet), srcLeptons = \
cms.VInputTag(copy.copy(self.getvalue("electronCollection")) if self.getvalue("onMiniAOD") else
cms.InputTag("pfeGammaToCandidate","electrons"),
copy.copy(self.getvalue("muonCollection")),
Expand All @@ -677,9 +673,8 @@ def getCorrectedMET(self, process, metType, correctionLevel,produceIntermediateC
getattr(process, _myPatMet).srcPFCands= copy.copy(self.getvalue("pfCandCollection"))
from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
for modifier in run2_miniAOD_UL, run2_nanoAOD_106Xv1:
modifier.toModify(getattr(process, _myPatMet), srcPFCands= "puppiForMET" if self.getvalue("Puppi") else copy.copy(self.getvalue("pfCandCollection")))
modifier.toModify(getattr(process, _myPatMet), srcLeptons = \
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(getattr(process, _myPatMet), srcPFCands= "puppiForMET" if self.getvalue("Puppi") else copy.copy(self.getvalue("pfCandCollection")))
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(getattr(process, _myPatMet), srcLeptons = \
cms.VInputTag(copy.copy(self.getvalue("electronCollection")) if self.getvalue("onMiniAOD") else
cms.InputTag("pfeGammaToCandidate","electrons"),
copy.copy(self.getvalue("muonCollection")),
Expand Down Expand Up @@ -858,9 +853,8 @@ def getMETUncertainties(self, process, metType, metModName, electronCollection,
if self.getvalue("Puppi"):
from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
for modifier in run2_miniAOD_UL, run2_nanoAOD_106Xv1:
modifier.toModify(pfCandsNoJets, src = cms.InputTag('puppiForMET'))
modifier.toModify(pfCandsNoJets, useDeltaRforFootprint = True)
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(pfCandsNoJets, src = cms.InputTag('puppiForMET'))
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(pfCandsNoJets, useDeltaRforFootprint = True)
addToProcessAndTask("pfCandsNoJets"+postfix, pfCandsNoJets, process, task)
metUncSequence += getattr(process, "pfCandsNoJets"+postfix)

Expand All @@ -873,9 +867,8 @@ def getMETUncertainties(self, process, metType, metModName, electronCollection,
if not self.getvalue("onMiniAOD"):
from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
for modifier in run2_miniAOD_UL, run2_nanoAOD_106Xv1:
modifier.toModify(pfCandsNoJetsNoEle, useDeltaRforFootprint = True)
modifier.toModify(pfCandsNoJetsNoEle, veto = cms.InputTag("pfeGammaToCandidate","electrons"))
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(pfCandsNoJetsNoEle, useDeltaRforFootprint = True)
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(pfCandsNoJetsNoEle, veto = cms.InputTag("pfeGammaToCandidate","electrons"))
addToProcessAndTask("pfCandsNoJetsNoEle"+postfix, pfCandsNoJetsNoEle, process, task)
metUncSequence += getattr(process, "pfCandsNoJetsNoEle"+postfix)

Expand All @@ -888,8 +881,7 @@ def getMETUncertainties(self, process, metType, metModName, electronCollection,
if not self.getvalue("onMiniAOD"):
from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
for modifier in run2_miniAOD_UL, run2_nanoAOD_106Xv1:
modifier.toModify(pfCandsNoJetsNoEleNoMu, useDeltaRforFootprint = True)
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(pfCandsNoJetsNoEleNoMu, useDeltaRforFootprint = True)
addToProcessAndTask("pfCandsNoJetsNoEleNoMu"+postfix, pfCandsNoJetsNoEleNoMu, process, task)
metUncSequence += getattr(process, "pfCandsNoJetsNoEleNoMu"+postfix)

Expand All @@ -902,8 +894,7 @@ def getMETUncertainties(self, process, metType, metModName, electronCollection,
if self.getvalue("Puppi"):
from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
for modifier in run2_miniAOD_UL, run2_nanoAOD_106Xv1:
modifier.toModify(pfCandsNoJetsNoEleNoMuNoTau, useDeltaRforFootprint = True)
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(pfCandsNoJetsNoEleNoMuNoTau, useDeltaRforFootprint = True)
addToProcessAndTask("pfCandsNoJetsNoEleNoMuNoTau"+postfix, pfCandsNoJetsNoEleNoMuNoTau, process, task)
metUncSequence += getattr(process, "pfCandsNoJetsNoEleNoMuNoTau"+postfix)

Expand All @@ -916,9 +907,8 @@ def getMETUncertainties(self, process, metType, metModName, electronCollection,
if not self.getvalue("onMiniAOD"):
from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
for modifier in run2_miniAOD_UL, run2_nanoAOD_106Xv1:
modifier.toModify(pfCandsForUnclusteredUnc, useDeltaRforFootprint = True)
modifier.toModify(pfCandsForUnclusteredUnc, veto = cms.InputTag("pfeGammaToCandidate","photons"))
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(pfCandsForUnclusteredUnc, useDeltaRforFootprint = True)
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(pfCandsForUnclusteredUnc, veto = cms.InputTag("pfeGammaToCandidate","photons"))
addToProcessAndTask("pfCandsForUnclusteredUnc"+postfix, pfCandsForUnclusteredUnc, process, task)
metUncSequence += getattr(process, "pfCandsForUnclusteredUnc"+postfix)

Expand Down Expand Up @@ -1508,8 +1498,7 @@ def recomputeRawMetFromPfcs(self, process, pfCandCollection, onMiniAOD, patMetMo
getattr(process, "pfMet"+postfix).src = pfCandCollection
from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
for modifier in run2_miniAOD_UL, run2_nanoAOD_106Xv1:
modifier.toModify( getattr(process, "pfMet"+postfix), src = "puppiForMET" if self.getvalue("Puppi") else pfCandCollection )
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify( getattr(process, "pfMet"+postfix), src = "puppiForMET" if self.getvalue("Puppi") else pfCandCollection )
patMetModuleSequence += getattr(process, "pfMet"+postfix)

#PAT METs
Expand All @@ -1528,8 +1517,7 @@ def recomputeRawMetFromPfcs(self, process, pfCandCollection, onMiniAOD, patMetMo
getattr(process, _myPatMet).computeMETSignificance = cms.bool(self.getvalue("computeMETSignificance"))
from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
for modifier in run2_miniAOD_UL, run2_nanoAOD_106Xv1:
modifier.toModify(getattr(process, _myPatMet), srcLeptons = \
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(getattr(process, _myPatMet), srcLeptons = \
cms.VInputTag(copy.copy(self.getvalue("electronCollection")) if self.getvalue("onMiniAOD") else
cms.InputTag("pfeGammaToCandidate","electrons"),
copy.copy(self.getvalue("muonCollection")),
Expand Down
5 changes: 2 additions & 3 deletions RecoMET/METProducers/python/METSignificanceParams_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,5 @@

from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
for modifier in run2_miniAOD_UL, run2_nanoAOD_106Xv1:
modifier.toModify(METSignificanceParams, useDeltaRforFootprint = True)
modifier.toModify(METSignificanceParams_Data, useDeltaRforFootprint = True)
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(METSignificanceParams, useDeltaRforFootprint = True)
(run2_miniAOD_UL|run2_nanoAOD_106Xv1).toModify(METSignificanceParams_Data, useDeltaRforFootprint = True)

0 comments on commit 1d43e87

Please sign in to comment.