Fix recordable key into TrigT2CaloEgammaMTConfig.py add...

Fix recordable key into TrigT2CaloEgammaMTConfig.py add TrigRingerRingsContainer and TrigRingerRingsContainerAux into HLTEDMCreator.h and .cxx

Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaMTConfig.py

@@ -52,8 +52,7 @@ def fastL2EgammaClusteringAlg( flags, roisKey="EMCaloRoIs", doRinger=False):
       from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import RingerReFexConfig
       ringer = RingerReFexConfig('FaAlgoRingerFexConfig')
       ringer.OutputLevel=DEBUG
-      #ringer.RingsKey= recordable("L2CaloRinger")
-      ringer.RingerKey= "HLT_L2CaloRinger"
+      ringer.RingsKey= recordable("HLT_L2CaloRinger")
       ringer.ClustersName = alg.ClustersName
       acc.addPublicTool( ringer )
       __fex_tools.append(ringer)

Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt

@@ -16,8 +16,9 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/RootUtils
                           Trigger/TrigEvent/TrigSteeringEvent
                           Event/xAOD/xAODTrigCalo
+                          Event/xAOD/xAODTrigRinger
                           Event/xAOD/xAODTrigEgamma
-			  Event/xAOD/xAODEgamma
+			        Event/xAOD/xAODEgamma
                           Event/xAOD/xAODTrigger
                           Event/xAOD/xAODTracking
                           Trigger/TrigDataAccess/TrigSerializeResult
@@ -27,7 +28,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Event/xAOD/xAODTau
                           Event/xAOD/xAODTrigBphys
                           Event/xAOD/xAODJet
-			  Event/xAOD/xAODBTagging
+			        Event/xAOD/xAODBTagging
                           Trigger/TrigSteer/DecisionHandling
                           Control/AthenaMonitoringKernel
                           Trigger/TrigMonitoring/TrigCostMonitorMT
@@ -46,7 +47,7 @@ atlas_add_library( TrigOutputHandlingLib
                    PUBLIC_HEADERS TrigOutputHandling
                    INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
                    LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES}  GaudiKernel AthViews AthenaBaseComps RootUtils TrigSteeringEvent TrigSerializeResultLib TrigConfData
-                   xAODTrigCalo xAODTrigEgamma xAODEgamma xAODBTagging xAODTrigger xAODTracking xAODTrigMuon xAODMuon xAODTau xAODTrigBphys xAODTrigMissingET DecisionHandlingLib AthenaMonitoringKernelLib TrigPartialEventBuildingLib TrigSerializeTPLib AthContainersRoot )
+                   xAODTrigCalo xAODTrigRinger xAODTrigEgamma xAODEgamma xAODBTagging xAODTrigger xAODTracking xAODTrigMuon xAODMuon xAODTau xAODTrigBphys xAODTrigMissingET DecisionHandlingLib AthenaMonitoringKernelLib TrigPartialEventBuildingLib TrigSerializeTPLib AthContainersRoot )
 
 atlas_add_component( TrigOutputHandling
                      src/components/*.cxx

Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx

@@ -76,6 +76,7 @@ StatusCode HLTEDMCreator::initialize()
     
   INIT_XAOD( TrigEMClusterContainer );
   INIT_XAOD( TrigCaloClusterContainer );
+  INIT_XAOD( TrigRingerRingsContainer );
   INIT_XAOD( TrigElectronContainer ); 
   INIT_XAOD( ElectronContainer ); 
   INIT_XAOD( PhotonContainer ); 
@@ -306,15 +307,16 @@ StatusCode HLTEDMCreator::createOutput(const EventContext& context) const {
     CHECK( createIfMissing<xAOD::__TYPE>( context, ConstHandlesGroup<xAOD::__TYPE>( m_##__TYPE, m_##__TYPE##InViews, m_##__TYPE##Views ), generator, &HLTEDMCreator::noMerge<xAOD::__TYPE> )  ); \
   }
   
-  CREATE_XAOD_NO_MERGE( TrigCompositeContainer, TrigCompositeAuxContainer )
-  CREATE_XAOD( TrigElectronContainer, TrigElectronAuxContainer )
-  CREATE_XAOD( ElectronContainer, ElectronAuxContainer )
-  CREATE_XAOD( PhotonContainer, PhotonAuxContainer )
-  CREATE_XAOD( TrigPhotonContainer, TrigPhotonAuxContainer )
-  CREATE_XAOD( TrigEMClusterContainer, TrigEMClusterAuxContainer )
-  CREATE_XAOD( TrigCaloClusterContainer, TrigCaloClusterAuxContainer )
-  CREATE_XAOD( TrackParticleContainer, TrackParticleAuxContainer )
-  CREATE_XAOD( TrigMissingETContainer, TrigMissingETAuxContainer )
+  CREATE_XAOD_NO_MERGE( TrigCompositeContainer, TrigCompositeAuxContainer );
+  CREATE_XAOD( TrigElectronContainer, TrigElectronAuxContainer );
+  CREATE_XAOD( ElectronContainer, ElectronAuxContainer );
+  CREATE_XAOD( PhotonContainer, PhotonAuxContainer );
+  CREATE_XAOD( TrigPhotonContainer, TrigPhotonAuxContainer );
+  CREATE_XAOD( TrigEMClusterContainer, TrigEMClusterAuxContainer );
+  CREATE_XAOD( TrigCaloClusterContainer, TrigCaloClusterAuxContainer );
+  CREATE_XAOD( TrigRingerRingsContainer, TrigRingerRingsAuxContainer );
+  CREATE_XAOD( TrackParticleContainer, TrackParticleAuxContainer );
+  CREATE_XAOD( TrigMissingETContainer, TrigMissingETAuxContainer );
 
   CREATE_XAOD( L2StandAloneMuonContainer, L2StandAloneMuonAuxContainer );
   CREATE_XAOD( L2CombinedMuonContainer, L2CombinedMuonAuxContainer );

Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h

@@ -32,6 +32,10 @@
 #include "xAODTrigCalo/TrigEMClusterAuxContainer.h"
 #include "xAODTrigCalo/TrigCaloClusterContainer.h"
 #include "xAODTrigCalo/TrigCaloClusterAuxContainer.h"
+// Ringer
+#include "xAODTrigRinger/TrigRingerRingsContainer.h"
+#include "xAODTrigRinger/TrigRingerRingsAuxContainer.h"
+
 #include "xAODTracking/TrackParticleContainer.h"
 #include "xAODTracking/TrackParticleAuxContainer.h"
 #include "xAODTrigMissingET/TrigMissingETContainer.h"
@@ -116,6 +120,7 @@ class HLTEDMCreator: public extends<AthAlgTool, IHLTOutputTool>  {
   DEF_XAOD_KEY( TrigCompositeContainer );
   DEF_XAOD_KEY( TrigEMClusterContainer );
   DEF_XAOD_KEY( TrigCaloClusterContainer );
+  DEF_XAOD_KEY( TrigRingerRingsContainer );
   DEF_XAOD_KEY( TrigElectronContainer );
   DEF_XAOD_KEY( ElectronContainer );
   DEF_XAOD_KEY( PhotonContainer );

Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py

@@ -94,6 +94,9 @@ TriggerHLTListRun3 = [
     # Egamma
     ('xAOD::TrigEMClusterContainer#HLT_L2CaloEMClusters',           'BS ESD AODFULL', 'Egamma', 'inViews:EMCaloViews'), # last arg specifies in which view container the fragments are, look into the proprty of View maker alg for it
     ('xAOD::TrigEMClusterAuxContainer#HLT_L2CaloEMClustersAux.',    'BS ESD AODFULL', 'Egamma'),
+    ('xAOD::TrigRingerRingsContainer#HLT_L2CaloRinger',             'BS ESD AODFULL', 'Egamma', 'inViews:EMCaloViews'), #Ringer
+    ('xAOD::TrigRingerRingsAuxContainer#HLT_L2CaloRingerAux.',      'BS ESD AODFULL', 'Egamma'), #Ringer
+    
     ('xAOD::TrigPhotonContainer#HLT_L2Photons',                     'BS ESD AODFULL', 'Egamma', 'inViews:EMPhotonViews'),
     ('xAOD::TrigPhotonAuxContainer#HLT_L2PhotonsAux.',              'BS ESD AODFULL', 'Egamma'),
     ('xAOD::TrigElectronContainer#HLT_L2Electrons',                 'BS ESD AODFULL', 'Egamma', 'inViews:EMElectronViews'),