Merge branch '21.2-ECFG' into '21.2'

Fixing ECFG logic

See merge request atlas/athena!38527

(cherry picked from commit 0ac7b780ef80700fa21c9f755fea40e869e75296)

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
26af0885 Merge branch '21.2' of https://gitlab.cern.ch:8443/atlas/athena into 21.2-ECFG
cf1af0a5 Fixing ECFG_3_1 logic

Reconstruction/Jet/JetSubStructureMomentTools/Root/EnergyCorrelatorGeneralizedTool.cxx

@@ -107,6 +107,9 @@ int EnergyCorrelatorGeneralizedTool::modifyJet(xAOD::Jet &injet) const {
 
     float beta = moment.first;
 
+    /// Note that the indexing for these follows the 
+    /// convention of ECFG_angles_n
+
     /// These are used for M2 and N2
     float ECFG_2_1_value = -999.0;
     float ECFG_3_2_value = -999.0;
@@ -124,41 +127,31 @@ int EnergyCorrelatorGeneralizedTool::modifyJet(xAOD::Jet &injet) const {
     if( calculate ) {
 
       /// These are used for N2 and M2
-      JetSubStructureUtils::EnergyCorrelatorGeneralized ECFG_3_2(2, 3, beta, JetSubStructureUtils::EnergyCorrelator::pt_R);
       JetSubStructureUtils::EnergyCorrelatorGeneralized ECFG_2_1(1, 2, beta, JetSubStructureUtils::EnergyCorrelator::pt_R);
+      JetSubStructureUtils::EnergyCorrelatorGeneralized ECFG_3_1(1, 3, beta, JetSubStructureUtils::EnergyCorrelator::pt_R);
+      JetSubStructureUtils::EnergyCorrelatorGeneralized ECFG_3_2(2, 3, beta, JetSubStructureUtils::EnergyCorrelator::pt_R);
 
       ECFG_2_1_value = ECFG_2_1.result(jet);
+      ECFG_3_1_value = ECFG_3_1.result(jet);
       ECFG_3_2_value = ECFG_3_2.result(jet);
 
       /// These are used for dichroic N2 and M2
       if( calculate_ungroomed ) {
         ECFG_2_1_ungroomed_value = ECFG_2_1.result(jet_ungroomed);
+        ECFG_3_1_ungroomed_value = ECFG_3_1.result(jet_ungroomed);
         ECFG_3_2_ungroomed_value = ECFG_3_2.result(jet_ungroomed);
       }
 
-      /// These are used for M3 and N3
-      if( m_doM3 || m_doN3 ) {
-
-        JetSubStructureUtils::EnergyCorrelatorGeneralized ECFG_3_1(1, 3, beta, JetSubStructureUtils::EnergyCorrelator::pt_R);
-
-        ECFG_3_1_value = ECFG_3_1.result(jet);
-
-        if( calculate_ungroomed ) {
-          ECFG_3_1_ungroomed_value = ECFG_3_1.result(jet_ungroomed);
-        }
-
-        /// This is used for M3
-        if( m_doM3 ) {
-          JetSubStructureUtils::EnergyCorrelatorGeneralized ECFG_4_1(1, 4, beta, JetSubStructureUtils::EnergyCorrelator::pt_R);
-          ECFG_4_1_value = ECFG_4_1.result(jet);
-        }
-
-        /// This is used for N3
-        if( m_doN3 ) {
-          JetSubStructureUtils::EnergyCorrelatorGeneralized ECFG_4_2(2, 4, beta, JetSubStructureUtils::EnergyCorrelator::pt_R);
-          ECFG_4_2_value = ECFG_4_2.result(jet);
-        }
+      /// This is used for M3
+      if( m_doM3 ) {
+        JetSubStructureUtils::EnergyCorrelatorGeneralized ECFG_4_1(1, 4, beta, JetSubStructureUtils::EnergyCorrelator::pt_R);
+        ECFG_4_1_value = ECFG_4_1.result(jet);
+      }
 
+      /// This is used for N3
+      if( m_doN3 ) {
+        JetSubStructureUtils::EnergyCorrelatorGeneralized ECFG_4_2(2, 4, beta, JetSubStructureUtils::EnergyCorrelator::pt_R);
+        ECFG_4_2_value = ECFG_4_2.result(jet);
       }
 
     }