From 54c5bf501c4afa4368f181989c7a1603f74c0369 Mon Sep 17 00:00:00 2001
From: Nils Erik Krumnack <nils.erik.krumnack@cern.ch>
Date: Fri, 6 Nov 2020 15:16:28 +0000
Subject: [PATCH] Merge branch '21.2-ECFG' into '21.2'
Adding ECFG_3_3_2 for MDT studies
See merge request atlas/athena!37954
(cherry picked from commit 1e313915aa0d81296636d70c045bfd51dc3ad65c)
7d328379 Adding ECFG_3_3_2 for MDT studies
029c41ec Merge branch '21.2' of https://gitlab.cern.ch:8443/atlas/athena into 21.2-ECFG
---
.../EnergyCorrelatorGeneralizedTool.h | 3 +++
.../Root/EnergyCorrelatorGeneralizedTool.cxx | 16 +++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/JetSubStructureMomentTools/EnergyCorrelatorGeneralizedTool.h b/Reconstruction/Jet/JetSubStructureMomentTools/JetSubStructureMomentTools/EnergyCorrelatorGeneralizedTool.h
index c997afcbc51..4d566f3ffdf 100644
--- a/Reconstruction/Jet/JetSubStructureMomentTools/JetSubStructureMomentTools/EnergyCorrelatorGeneralizedTool.h
+++ b/Reconstruction/Jet/JetSubStructureMomentTools/JetSubStructureMomentTools/EnergyCorrelatorGeneralizedTool.h
@@ -60,6 +60,9 @@ class EnergyCorrelatorGeneralizedTool :
std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_ECFG_4_2_2;
std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_ECFG_4_4_1;
+ /// Added for MDT studies, might remove later
+ std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_ECFG_3_3_2;
+
};
/**
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/Root/EnergyCorrelatorGeneralizedTool.cxx b/Reconstruction/Jet/JetSubStructureMomentTools/Root/EnergyCorrelatorGeneralizedTool.cxx
index bf5143f67fd..66fc6a97dee 100644
--- a/Reconstruction/Jet/JetSubStructureMomentTools/Root/EnergyCorrelatorGeneralizedTool.cxx
+++ b/Reconstruction/Jet/JetSubStructureMomentTools/Root/EnergyCorrelatorGeneralizedTool.cxx
@@ -68,6 +68,9 @@ StatusCode EnergyCorrelatorGeneralizedTool::initialize() {
m_dec_ECFG_4_2_2 = std::make_unique< SG::AuxElement::Decorator<float> >(m_prefix+"ECFG_4_2_2");
m_dec_ECFG_4_4_1 = std::make_unique< SG::AuxElement::Decorator<float> >(m_prefix+"ECFG_4_4_1");
+ /// Added for MDT studies, might remove later
+ m_dec_ECFG_3_3_2 = std::make_unique< SG::AuxElement::Decorator<float> >(m_prefix+"ECFG_3_3_2");
+
return StatusCode::SUCCESS;
}
@@ -181,6 +184,9 @@ int EnergyCorrelatorGeneralizedTool::modifyJet(xAOD::Jet &injet) const {
float ECFG_4_2_2_value = -999;
float ECFG_4_4_1_value = -999;
+ /// Added for MDT studies, might remove later
+ float ECFG_3_3_2_value = -999;
+
/// N.B. ECFG_angles_n_beta !!
if( calculate && m_doLSeries ) {
@@ -241,7 +247,12 @@ int EnergyCorrelatorGeneralizedTool::modifyJet(xAOD::Jet &injet) const {
/// 441
JetSubStructureUtils::EnergyCorrelatorGeneralized ECFG_4_4_1(4, 4, 1, JetSubStructureUtils::EnergyCorrelator::pt_R);
ECFG_4_4_1_value = ECFG_4_4_1.result(jet);
-
+
+ /// 332
+ /// Added for MDT studies, might remove later
+ JetSubStructureUtils::EnergyCorrelatorGeneralized ECFG_3_3_2(3, 3, 2, JetSubStructureUtils::EnergyCorrelator::pt_R);
+ ECFG_3_3_2_value = ECFG_3_3_2.result(jet);
+
}
(*m_dec_ECFG_2_1_2)(injet) = ECFG_2_1_2_value;
@@ -252,6 +263,9 @@ int EnergyCorrelatorGeneralizedTool::modifyJet(xAOD::Jet &injet) const {
(*m_dec_ECFG_4_2_2)(injet) = ECFG_4_2_2_value;
(*m_dec_ECFG_4_4_1)(injet) = ECFG_4_4_1_value;
+ /// Added for MDT studies, might remove later
+ (*m_dec_ECFG_3_3_2)(injet) = ECFG_3_3_2_value;
+
return 0;
}
--
GitLab