diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos/python/L1CaloFEXAlgosConfig.py b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos/python/L1CaloFEXAlgosConfig.py
index a853c9e53df1d5e19149a2f5d4fdb472d916c055..1f798d082edf9516ec5ee3eb5c6dd24644b67222 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos/python/L1CaloFEXAlgosConfig.py
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos/python/L1CaloFEXAlgosConfig.py
@@ -46,10 +46,7 @@ def eFexTOBDecoratorCfg(flags, name, eFexEMRoIContainer = "L1_eEMRoI", eFexTauRo
decorator.RhadHadDecDecorKey = eFexEMRoIContainer+".RhadHadDec"
decorator.WstotDenDecDecorKey = eFexEMRoIContainer+".WstotDenDec"
decorator.WstotNumDecDecorKey = eFexEMRoIContainer+".WstotNumDec"
- decorator.ClusterEtSumPSDecorKey = eFexEMRoIContainer+".ClusterEtSumPS"
- decorator.ClusterEtSumL1DecorKey = eFexEMRoIContainer+".ClusterEtSumL1"
- decorator.ClusterEtSumL2DecorKey = eFexEMRoIContainer+".ClusterEtSumL2"
- decorator.ClusterEtSumL3DecorKey = eFexEMRoIContainer+".ClusterEtSumL3"
+ decorator.ClusterSCellEtSumsDecorKey = eFexEMRoIContainer+".ClusterSCellEtSums"
if eFexEMRoIContainer != "L1_eTauRoI":
decorator.RCoreDecorKey = eFexTauRoIContainer+".RCoreDec"
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos/src/eFexTOBDecorator.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos/src/eFexTOBDecorator.cxx
index a0e5e1ae6963a58e20ce66ed2b6d34e474069bc8..828b6869d07535294a5765364833178b931dce8e 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos/src/eFexTOBDecorator.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos/src/eFexTOBDecorator.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
//***************************************************************************
@@ -34,10 +34,7 @@ namespace LVL1 {
ATH_CHECK( m_WstotDenDec.initialize() );
ATH_CHECK( m_WstotNumDec.initialize() );
- ATH_CHECK( m_ClusterEtSumPSDec.initialize() );
- ATH_CHECK( m_ClusterEtSumL1Dec.initialize() );
- ATH_CHECK( m_ClusterEtSumL2Dec.initialize() );
- ATH_CHECK( m_ClusterEtSumL3Dec.initialize() );
+ ATH_CHECK( m_ClusterSCellEtSumsDec.initialize() );
ATH_CHECK( m_RCoreDec.initialize() );
ATH_CHECK( m_REnvDec.initialize() );
@@ -75,10 +72,7 @@ namespace LVL1 {
SG::WriteDecorHandle<xAOD::eFexEMRoIContainer, unsigned int > WstotDenDec (m_WstotDenDec );
SG::WriteDecorHandle<xAOD::eFexEMRoIContainer, unsigned int > WstotNumDec (m_WstotNumDec );
- SG::WriteDecorHandle<xAOD::eFexEMRoIContainer, unsigned int > ClusterEtSumPSDec (m_ClusterEtSumPSDec );
- SG::WriteDecorHandle<xAOD::eFexEMRoIContainer, unsigned int > ClusterEtSumL1Dec (m_ClusterEtSumL1Dec );
- SG::WriteDecorHandle<xAOD::eFexEMRoIContainer, unsigned int > ClusterEtSumL2Dec (m_ClusterEtSumL2Dec );
- SG::WriteDecorHandle<xAOD::eFexEMRoIContainer, unsigned int > ClusterEtSumL3Dec (m_ClusterEtSumL3Dec );
+ SG::WriteDecorHandle<xAOD::eFexEMRoIContainer, std::vector<unsigned int > > ClusterSCellEtSumsDec (m_ClusterSCellEtSumsDec );
//looping over EM TOB to decorate them
for ( const xAOD::eFexEMRoI* emRoI : *emEDMConstPtr ){
@@ -101,26 +95,7 @@ namespace LVL1 {
WstotDenDec (*emRoI) = WstotSums[0];
WstotNumDec (*emRoI) = WstotSums[1];
- // cluster et per layer summed from SCells
- unsigned int ps(0); // 0-1 - pre-sampler
- unsigned int l1(0); // 2-7 - layer 1
- unsigned int l2(0); // 8-13 - layer 2
- unsigned int l3(0); // 14-15 - layer 3
- for(std::size_t i = 0; i < ClusterCellETs.size(); ++i) {
- if (i<2)
- ps += ClusterCellETs[i];
- else if (i < 8 )
- l1 += ClusterCellETs[i];
- else if (i < 14 )
- l2 += ClusterCellETs[i];
- else
- l3 += ClusterCellETs[i];
- }
-
- ClusterEtSumPSDec (*emRoI) = ps;
- ClusterEtSumL1Dec (*emRoI) = l1;
- ClusterEtSumL2Dec (*emRoI) = l2;
- ClusterEtSumL3Dec (*emRoI) = l3;
+ ClusterSCellEtSumsDec (*emRoI) = ClusterCellETs;
}
//Setup Tau Decorator Handlers
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos/src/eFexTOBDecorator.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos/src/eFexTOBDecorator.h
index 434a287e1fe7455ac7c093f6f1f2ee1f116aed91..2c2dc326bd765d558611bba740429d2f36dd517c 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos/src/eFexTOBDecorator.h
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos/src/eFexTOBDecorator.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
//***************************************************************************
@@ -50,11 +50,7 @@ namespace LVL1 {
SG::WriteDecorHandleKey<xAOD::eFexEMRoIContainer> m_WstotDenDec { this, "WstotDenDecDecorKey" , m_ReadKeyEM_name+".WstotDenDec" , "Recalculated EM WstotDen" };
SG::WriteDecorHandleKey<xAOD::eFexEMRoIContainer> m_WstotNumDec { this, "WstotNumDecDecorKey" , m_ReadKeyEM_name+".WstotNumDec" , "Recalculated EM WstotNum" };
- SG::WriteDecorHandleKey<xAOD::eFexEMRoIContainer> m_ClusterEtSumPSDec { this, "ClusterEtSumPSDecorKey" , m_ReadKeyEM_name+".ClusterEtSumPS" , "Cluster ET sum PS PS" };
- SG::WriteDecorHandleKey<xAOD::eFexEMRoIContainer> m_ClusterEtSumL1Dec { this, "ClusterEtSumL1DecorKey" , m_ReadKeyEM_name+".ClusterEtSumL1" , "Cluster ET sum PSL1" };
- SG::WriteDecorHandleKey<xAOD::eFexEMRoIContainer> m_ClusterEtSumL2Dec { this, "ClusterEtSumL2DecorKey" , m_ReadKeyEM_name+".ClusterEtSumL2" , "Cluster ET sum PSL2" };
- SG::WriteDecorHandleKey<xAOD::eFexEMRoIContainer> m_ClusterEtSumL3Dec { this, "ClusterEtSumL3DecorKey" , m_ReadKeyEM_name+".ClusterEtSumL3" , "Cluster ET sum PSL3" };
-
+ SG::WriteDecorHandleKey<xAOD::eFexEMRoIContainer> m_ClusterSCellEtSumsDec { this, "ClusterSCellEtSumsDecorKey" , m_ReadKeyEM_name+".ClusterSCellEtSums", "name of the decoration key for SCell Ets of the cluster"};
// WriteDecor handles for the Tau RoI decorations
SG::WriteDecorHandleKey<xAOD::eFexTauRoIContainer> m_RCoreDec { this, "RCoreDecorKey" , m_ReadKeyTau_name+".RCoreDec" , "Recalculated Tau RCore" };