allow reco::Jets in candidate converters

cms-sw · Oct 29, 2021 · 082f9db · 082f9db
1 parent 668228d
commit 082f9db
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/RecoBTag/FeatureTools/interface/ChargedCandidateConverter.h b/RecoBTag/FeatureTools/interface/ChargedCandidateConverter.h
@@ -53,20 +53,22 @@ namespace btagbtvdeep {
 
     // subjet related
     const auto* patJet = dynamic_cast<const pat::Jet*>(&jet);
-    if (!patJet) {
-      throw edm::Exception(edm::errors::InvalidReference) << "Input is not a pat::Jet.";
-    }
 
-    if (patJet->nSubjetCollections() > 0) {
-      auto subjets = patJet->subjets();
-      // sort by pt
-      std::sort(subjets.begin(), subjets.end(), [](const edm::Ptr<pat::Jet>& p1, const edm::Ptr<pat::Jet>& p2) {
-        return p1->pt() > p2->pt();
-      });
-      c_pf_features.drsubjet1 = !subjets.empty() ? reco::deltaR(*c_pf, *subjets.at(0)) : -1;
-      c_pf_features.drsubjet2 = subjets.size() > 1 ? reco::deltaR(*c_pf, *subjets.at(1)) : -1;
+    if (patJet) {
+      if (patJet->nSubjetCollections() > 0) {
+        auto subjets = patJet->subjets();
+        // sort by pt
+        std::sort(subjets.begin(), subjets.end(), [](const edm::Ptr<pat::Jet>& p1, const edm::Ptr<pat::Jet>& p2) {
+          return p1->pt() > p2->pt();
+        });
+        c_pf_features.drsubjet1 = !subjets.empty() ? reco::deltaR(*c_pf, *subjets.at(0)) : -1;
+        c_pf_features.drsubjet2 = subjets.size() > 1 ? reco::deltaR(*c_pf, *subjets.at(1)) : -1;
+      } else {
+        // AK4 jets don't have subjets
+        c_pf_features.drsubjet1 = -1;
+        c_pf_features.drsubjet2 = -1;
+      }
     } else {
-      // AK4 jets don't have subjets
       c_pf_features.drsubjet1 = -1;
       c_pf_features.drsubjet2 = -1;
     }

diff --git a/RecoBTag/FeatureTools/interface/NeutralCandidateConverter.h b/RecoBTag/FeatureTools/interface/NeutralCandidateConverter.h
@@ -32,18 +32,20 @@ namespace btagbtvdeep {
                                         NeutralCandidateFeatures& n_pf_features) {
     const auto* patJet = dynamic_cast<const pat::Jet*>(&jet);
 
-    if (!patJet) {
-      throw edm::Exception(edm::errors::InvalidReference) << "Input is not a pat::Jet.";
-    }
     // Do Subjets
-    if (patJet->nSubjetCollections() > 0) {
-      auto subjets = patJet->subjets();
-      // sort by pt
-      std::sort(subjets.begin(), subjets.end(), [](const edm::Ptr<pat::Jet>& p1, const edm::Ptr<pat::Jet>& p2) {
-        return p1->pt() > p2->pt();
-      });
-      n_pf_features.drsubjet1 = !subjets.empty() ? reco::deltaR(*n_pf, *subjets.at(0)) : -1;
-      n_pf_features.drsubjet2 = subjets.size() > 1 ? reco::deltaR(*n_pf, *subjets.at(1)) : -1;
+    if (patJet) {
+      if (patJet->nSubjetCollections() > 0) {
+        auto subjets = patJet->subjets();
+        // sort by pt
+        std::sort(subjets.begin(), subjets.end(), [](const edm::Ptr<pat::Jet>& p1, const edm::Ptr<pat::Jet>& p2) {
+          return p1->pt() > p2->pt();
+        });
+        n_pf_features.drsubjet1 = !subjets.empty() ? reco::deltaR(*n_pf, *subjets.at(0)) : -1;
+        n_pf_features.drsubjet2 = subjets.size() > 1 ? reco::deltaR(*n_pf, *subjets.at(1)) : -1;
+      } else {
+        n_pf_features.drsubjet1 = -1;
+        n_pf_features.drsubjet2 = -1;
+      }
     } else {
       n_pf_features.drsubjet1 = -1;
       n_pf_features.drsubjet2 = -1;