puppi v14

cms-sw · Apr 28, 2020 · 096fae6 · 096fae6
1 parent b3d42e1
commit 096fae6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/CommonTools/PileupAlgos/plugins/PuppiProducer.cc b/CommonTools/PileupAlgos/plugins/PuppiProducer.cc
@@ -27,6 +27,7 @@ PuppiProducer::PuppiProducer(const edm::ParameterSet& iConfig) {
   fUseFromPVLooseTight = iConfig.getParameter<bool>("UseFromPVLooseTight");
   fUseDZ = iConfig.getParameter<bool>("UseDeltaZCut");
   fDZCut = iConfig.getParameter<double>("DeltaZCut");
+  fEtaMinUseDZ = iConfig.getParameter<double>("EtaMinUseDeltaZ");
   fPtMaxCharged = iConfig.getParameter<double>("PtMaxCharged");
   fEtaMaxCharged = iConfig.getParameter<double>("EtaMaxCharged");
   fPtMaxPhotons = iConfig.getParameter<double>("PtMaxPhotons");
@@ -163,7 +164,7 @@ void PuppiProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
               pReco.id = 1;
             else if (std::abs(pReco.eta) > fEtaMaxCharged)
               pReco.id = 1;
-            else if (fUseDZ)
+            else if ((fUseDZ) && (std::abs(pReco.eta) >= fEtaMinUseDZ))
               pReco.id = (std::abs(pDZ) < fDZCut) ? 1 : 2;
             else if (fUseFromPVLooseTight && tmpFromPV == 1)
               pReco.id = 2;
@@ -194,7 +195,7 @@ void PuppiProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
               pReco.id = 1;
             else if (std::abs(pReco.eta) > fEtaMaxCharged)
               pReco.id = 1;
-            else if (fUseDZ)
+            else if ((fUseDZ) && (std::abs(pReco.eta) >= fEtaMinUseDZ))
               pReco.id = (std::abs(pDZ) < fDZCut) ? 1 : 2;
             else if (fUseFromPVLooseTight && lPack->fromPV() == (pat::PackedCandidate::PVLoose))
               pReco.id = 2;
@@ -361,6 +362,7 @@ void PuppiProducer::fillDescriptions(edm::ConfigurationDescriptions& description
   desc.add<bool>("UseFromPVLooseTight", false);
   desc.add<bool>("UseDeltaZCut", true);
   desc.add<double>("DeltaZCut", 0.3);
+  desc.add<double>("EtaMinUseDeltaZ", 0.);
   desc.add<double>("PtMaxCharged", -1.);
   desc.add<double>("EtaMaxCharged", 99999.);
   desc.add<double>("PtMaxPhotons", -1.);

diff --git a/CommonTools/PileupAlgos/plugins/PuppiProducer.h b/CommonTools/PileupAlgos/plugins/PuppiProducer.h
@@ -63,6 +63,7 @@ class PuppiProducer : public edm::stream::EDProducer<> {
   bool fUseFromPVLooseTight;
   bool fUseDZ;
   float fDZCut;
+  double fEtaMinUseDZ;
   double fPtMaxCharged;
   double fEtaMaxCharged;
   double fPtMaxPhotons;

diff --git a/CommonTools/PileupAlgos/python/Puppi_cff.py b/CommonTools/PileupAlgos/python/Puppi_cff.py
@@ -29,13 +29,14 @@
                        puppiForLeptons = cms.bool(False),
                        UseFromPVLooseTight = cms.bool(False),
                        UseDeltaZCut   = cms.bool(True),
+                       EtaMinUseDeltaZ = cms.double(2.4),
                        DeltaZCut      = cms.double(0.3),
-		       PtMaxCharged   = cms.double(-1.),
+		       PtMaxCharged   = cms.double(20.),
 		       EtaMaxCharged   = cms.double(99999.),
 		       PtMaxPhotons = cms.double(-1.),
 		       EtaMaxPhotons = cms.double(2.5),
 		       PtMaxNeutrals  = cms.double(200.),
-		       PtMaxNeutralsStartSlope = cms.double(0.),
+		       PtMaxNeutralsStartSlope = cms.double(20.),
                        candName       = cms.InputTag('particleFlow'),
                        vertexName     = cms.InputTag('offlinePrimaryVertices'),
                        #candName      = cms.string('packedPFCandidates'),
@@ -91,6 +92,7 @@
 from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
 phase2_common.toModify(
     puppi,
+    EtaMinUseDeltaZ = -1.,
     DeltaZCut = cms.double(0.1),
     algos = cms.VPSet( 
         cms.PSet( 

diff --git a/CommonTools/PileupAlgos/python/customizePuppiTune_cff.py b/CommonTools/PileupAlgos/python/customizePuppiTune_cff.py
@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
-def UpdatePuppiTuneV13(process):
+def UpdatePuppiTuneV14(process):
   #
   # Adapt for re-running PUPPI
   #
-  print("customizePuppiTune_cff::UpdatePuppiTuneV13: Recomputing PUPPI with Tune v13, slimmedJetsPuppi and slimmedMETsPuppi")
+  print("customizePuppiTune_cff::UpdatePuppiTuneV14: Recomputing PUPPI with Tune v14, slimmedJetsPuppi and slimmedMETsPuppi")
   from PhysicsTools.PatAlgos.tools.helpers import getPatAlgosToolsTask, addToProcessAndTask
   task = getPatAlgosToolsTask(process)
   from PhysicsTools.PatAlgos.slimming.puppiForMET_cff import makePuppiesFromMiniAOD
@@ -26,15 +26,11 @@ def UpdatePuppiTuneV13(process):
   del process.updatedPatJetsPuppiJetSpecific
   process.puppiSequence = cms.Sequence(process.puppiMETSequence+process.fullPatMetSequencePuppi+process.patPuppiJetSpecificProducer+process.slimmedJetsPuppi)
   #
-  # Adapt for PUPPI tune V13
+  # Adapt for PUPPI tune V14
   #
-  process.puppi.UseFromPVLooseTight = False
-  process.puppi.UseDeltaZCut = False
   process.puppi.PtMaxCharged = 20.
-  process.puppi.EtaMaxCharged = 2.5
+  process.puppi.EtaMinUseDeltaZ = 2.4
   process.puppi.PtMaxNeutralsStartSlope = 20.
-  process.puppiNoLep.UseFromPVLooseTight = False
-  process.puppiNoLep.UseDeltaZCut = False
   process.puppiNoLep.PtMaxCharged = 20.
-  process.puppiNoLep.EtaMaxCharged = 2.5
+  process.puppiNoLep.EtaMinUseDeltaZ = 2.4
   process.puppiNoLep.PtMaxNeutralsStartSlope = 20.