Apply puppi weight consistently in BoostedDoubleSV btaginfo for packe…

…d and PF candidates
cms-sw · Mar 25, 2020 · 2d2f563 · 2d2f563
1 parent 0884d51
commit 2d2f563
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/PhysicsTools/PatAlgos/python/slimming/applyDeepBtagging_cff.py b/PhysicsTools/PatAlgos/python/slimming/applyDeepBtagging_cff.py
@@ -42,6 +42,12 @@ def applyDeepBtagging( process, postfix="" ) :
     # delete module not used anymore (slimmedJets substitutes)
     delattr(process, 'selectedUpdatedPatJetsSlimmedDeepFlavour'+postfix)
 
+    from CommonTools.PileupAlgos.Puppi_cff import puppi
+    addToProcessAndTask('packedpuppi', puppi.clone(
+                        useExistingWeights = True,
+                        candName = 'packedPFCandidates',
+                        vertexName = cms.InputTag('offlineSlimmedPrimaryVertices')) , process, task)
+
     from RecoBTag.ONNXRuntime.pfDeepBoostedJet_cff import _pfDeepBoostedJetTagsAll as pfDeepBoostedJetTagsAll
     from RecoBTag.MXNet.pfParticleNet_cff import _pfParticleNetJetTagsAll as pfParticleNetJetTagsAll
 

diff --git a/PhysicsTools/PatAlgos/python/tools/jetTools.py b/PhysicsTools/PatAlgos/python/tools/jetTools.py
@@ -597,10 +597,12 @@ def setupBTagging(process, jetSource, pfCandidates, explicitJTA, pvSource, svSou
                                     btag.pixelClusterTagInfos.clone(jets = jetSource, vertices=pvSource),
                                     process, task)
 
-            if 'Puppi' in jetSource.value() and pfCandidates.value() == 'particleFlow' and\
-	       ('pfBoostedDouble' in btagInfo or 'SecondaryVertex' in btagInfo):
-                _btagInfo = getattr(process, btagPrefix+btagInfo+labelName+postfix)
+            if 'pfBoostedDouble' in btagInfo or 'SecondaryVertex' in btagInfo:
+              _btagInfo = getattr(process, btagPrefix+btagInfo+labelName+postfix)
+              if 'Puppi' in jetSource.value() and pfCandidates.value() == 'particleFlow':
                 _btagInfo.weights = cms.InputTag("puppi")
+              if 'SlimmedAK8DeepTags' in jetSource.value() and pfCandidates.value() == 'packedPFCandidates':
+                _btagInfo.weights = cms.InputTag("packedpuppi")
 
             if 'DeepFlavourTagInfos' in btagInfo:
                 svUsed = svSource

diff --git a/RecoBTag/SecondaryVertex/plugins/BoostedDoubleSVProducer.cc b/RecoBTag/SecondaryVertex/plugins/BoostedDoubleSVProducer.cc
@@ -672,10 +672,9 @@ void BoostedDoubleSVProducer::calcNsubjettiness(const reco::JetBaseRef& jet,
               if (!weightsToken_.isUninitialized())
                 w = (*weightsHandle_)[constit];
               else {
-                w = 1.0;  // For backward compatibility PUPPI weight is not applied to PackedCandidates.
-                //throw cms::Exception("MissingConstituentWeight")
-                //      << "BoostedDoubleSVProducer: No weights (e.g. PUPPI) given for weighted jet collection"
-                //      << std::endl;
+                throw cms::Exception("MissingConstituentWeight")
+                    << "BoostedDoubleSVProducer: No weights (e.g. PUPPI) given for weighted jet collection"
+                    << std::endl;
               }
               fjParticles.push_back(
                   fastjet::PseudoJet(constit->px() * w, constit->py() * w, constit->pz() * w, constit->energy() * w));
@@ -698,9 +697,8 @@ void BoostedDoubleSVProducer::calcNsubjettiness(const reco::JetBaseRef& jet,
           if (!weightsToken_.isUninitialized())
             w = (*weightsHandle_)[daughter];
           else {
-            w = 1.0;  // For backward compatibility PUPPI weight is not applied to PackedCandidates.
-            //throw cms::Exception("MissingConstituentWeight")
-            //      << "BoostedDoubleSVProducer: No weights (e.g. PUPPI) given for weighted jet collection" << std::endl;
+            throw cms::Exception("MissingConstituentWeight")
+                << "BoostedDoubleSVProducer: No weights (e.g. PUPPI) given for weighted jet collection" << std::endl;
           }
           fjParticles.push_back(
               fastjet::PseudoJet(daughter->px() * w, daughter->py() * w, daughter->pz() * w, daughter->energy() * w));