Add default values for XbbScore on jets outside acceptance

Former-commit-id: b1171d8cfcaf09c62961ceb6ac9b54ea4f249113

PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/src/HbbTaggingAlgorithm.cxx

@@ -27,6 +27,7 @@ StatusCode HbbTaggingAlgorithm::initialize() {
   CHECK(m_jet_calib_tool.retrieve());
   for (const std::string& dec_name: m_tagger->decorationNames()) {
     m_var_checkers.emplace_back(dec_name);
+    m_default_filler.emplace_back(dec_name);
   }
 
   return StatusCode::SUCCESS;
@@ -37,15 +38,18 @@ StatusCode HbbTaggingAlgorithm::finalize() {
 }
 
 StatusCode HbbTaggingAlgorithm::execute() {
+
   const xAOD::JetContainer *rawjets = 0;
   CHECK( evtStore()->retrieve(rawjets, m_jet_collection) );
   auto shallow_jets = xAOD::shallowCopyContainer (*rawjets);
   std::unique_ptr<xAOD::JetContainer> jets(shallow_jets.first);
   std::unique_ptr<xAOD::ShallowAuxContainer> aux(shallow_jets.second);
+
   for (auto jet: *jets) {
+
+    // we apply the decoration based on calibrated jets, but apply it
+    // to the uncalibrated jets.
     m_jet_calib_tool->applyCorrection(*jet);
-    if (jet->pt() < m_min_pt) continue;
-    if (std::abs(jet->eta()) > m_max_eta) continue;
     const xAOD::Jet* raw_jet = rawjets->at(jet->index());
 
     // count how many outputs are already defined
@@ -53,12 +57,21 @@ StatusCode HbbTaggingAlgorithm::execute() {
     for (const auto& acc: m_var_checkers) {
       if (acc.isAvailable(*raw_jet)) n_decs++;
     }
-    if (n_decs == 0) {
-      m_tagger->decorateSecond(*jet, *raw_jet);
-    } else if (n_decs != m_var_checkers.size()) {
+
+    // require that we values for all or none of the decorations
+    if (! (n_decs == 0 || n_decs == m_var_checkers.size() )) {
       ATH_MSG_ERROR("Some (but not all) Hbb scores found on a jet");
       return StatusCode::FAILURE;
     }
+
+    // if the jet is outside the acceptance we store NaN
+    if (jet->pt() < m_min_pt || std::abs(jet->eta()) > m_max_eta) {
+      for (const auto& dec: m_default_filler) {
+        dec(*raw_jet) = NAN;
+      }
+    } else {
+      m_tagger->decorateSecond(*jet, *raw_jet);
+    }
   }
   return StatusCode::SUCCESS;
 }

PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/src/HbbTaggingAlgorithm.h

@@ -28,6 +28,7 @@ private:
   ToolHandle<HbbTaggerDNN> m_tagger;
   ToolHandle<JetCalibrationTool> m_jet_calib_tool;
   std::vector<SG::AuxElement::ConstAccessor<float> > m_var_checkers;
+  std::vector<SG::AuxElement::Decorator<float> > m_default_filler;
 };
 
 #endif