Merge pull request #27328 from andrzejnovak/backport106X

[Backport] Fix BoostedDoubleSVProd crashing with nan/inf daughters
cms-sw · Jul 2, 2019 · 74be976 · 74be976
2 parents 5e3fb63 + 7dd48e4
commit 74be976
Showing 1 changed file with 23 additions and 8 deletions.
diff --git a/RecoBTag/SecondaryVertex/plugins/BoostedDoubleSVProducer.cc b/RecoBTag/SecondaryVertex/plugins/BoostedDoubleSVProducer.cc
@@ -30,6 +30,7 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/StreamID.h"
+#include "FWCore/Utilities/interface/isFinite.h"
 
 #include "DataFormats/BTauReco/interface/CandIPTagInfo.h"
 #include "DataFormats/BTauReco/interface/CandSecondaryVertexTagInfo.h"
@@ -668,16 +669,30 @@ BoostedDoubleSVProducer::calcNsubjettiness(const reco::JetBaseRef & jet, float &
         {
           const reco::Candidate * constit = daughter->daughter(i);
 
-          if ( constit )
-            fjParticles.push_back( fastjet::PseudoJet( constit->px(), constit->py(), constit->pz(), constit->energy() ) );
-          else
-            edm::LogWarning("MissingJetConstituent") << "Jet constituent required for N-subjettiness computation is missing!";
+          if (constit) {
+            // Check if any values were nan or inf
+            float valcheck = constit->px() + constit->py() + constit->pz() + constit->energy();
+            if (edm::isNotFinite(valcheck)) {
+              edm::LogWarning("FaultyJetConstituent")
+                  << "Jet constituent required for N-subjettiness computation contains Nan/Inf values!";
+              continue;
+            }
+            fjParticles.push_back(fastjet::PseudoJet(constit->px(), constit->py(), constit->pz(), constit->energy()));
+          } else
+            edm::LogWarning("MissingJetConstituent")
+                << "Jet constituent required for N-subjettiness computation is missing!";
         }
+      } else {
+        // Check if any values were nan or inf
+        float valcheck = daughter->px() + daughter->py() + daughter->pz() + daughter->energy();
+        if (edm::isNotFinite(valcheck)) {
+          edm::LogWarning("FaultyJetConstituent")
+              << "Jet constituent required for N-subjettiness computation contains Nan/Inf values!";
+          continue;
+        }
+        fjParticles.push_back(fastjet::PseudoJet(daughter->px(), daughter->py(), daughter->pz(), daughter->energy()));
       }
-      else
-        fjParticles.push_back( fastjet::PseudoJet( daughter->px(), daughter->py(), daughter->pz(), daughter->energy() ) );
-    }
-    else
+    } else
       edm::LogWarning("MissingJetConstituent") << "Jet constituent required for N-subjettiness computation is missing!";
   }