diff --git a/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt b/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt index 9c78608dc9034e75e2053a0dad5477622fe834b1..00777f1e5f25a327c8511a74fb5e491b4d093b0b 100644 --- a/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt +++ b/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt @@ -23,6 +23,7 @@ atlas_depends_on_subdirs( PUBLIC Event/xAOD/xAODMuon Event/xAOD/xAODTrigMissingET Event/xAOD/xAODTau + Event/xAOD/xAODTrigBphys Trigger/TrigSteer/DecisionHandling Control/AthenaMonitoring Trigger/TrigMonitoring/TrigCostMonitorMT @@ -39,7 +40,7 @@ atlas_add_library( TrigOutputHandlingLib PUBLIC_HEADERS TrigOutputHandling INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} GaudiKernel AthViews AthenaBaseComps TrigSteeringEvent TrigSerializeResultLib - xAODTrigCalo xAODTrigEgamma xAODTrigger xAODTracking xAODTrigMuon xAODMuon xAODTau xAODTrigMissingET DecisionHandlingLib AthenaMonitoringLib TrigPartialEventBuildingLib TrigSerializeTPLib AthContainersRoot ) + xAODTrigCalo xAODTrigEgamma xAODTrigger xAODTracking xAODTrigMuon xAODMuon xAODTau xAODTrigBphys xAODTrigMissingET DecisionHandlingLib AthenaMonitoringLib TrigPartialEventBuildingLib TrigSerializeTPLib AthContainersRoot ) atlas_add_component( TrigOutputHandling src/components/*.cxx diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx index b3bf6b9e2d29dec16809f90c5be4138893f2afe2..2c012a12f073ac812debe6b73cc527e47ddd6e73 100644 --- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx +++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx @@ -56,7 +56,8 @@ StatusCode HLTEDMCreator::initialize() INIT_XAOD( MuonContainer ); INIT_XAOD( TauJetContainer ); INIT_XAOD( JetContainer ); - INIT_XAOD( VertexContainer ) + INIT_XAOD( VertexContainer ); + INIT_XAOD( TrigBphysContainer ); INIT_XAOD( CaloClusterContainer ); @@ -309,7 +310,8 @@ StatusCode HLTEDMCreator::createOutput(const EventContext& context) const { // After view collections are merged, need to update collection links CREATE_XAOD( JetContainer, JetAuxContainer ); - CREATE_XAOD( VertexContainer,VertexAuxContainer ) + CREATE_XAOD( VertexContainer,VertexAuxContainer ); + CREATE_XAOD( TrigBphysContainer, TrigBphysAuxContainer ); ATH_CHECK( fixLinks() ); diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h index 31be556625ffe3df1ab15fee5554e25db14036c0..c53deb5944bce0fbb346347303f7a9c4cddc6f6a 100644 --- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h +++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h @@ -47,6 +47,8 @@ #include "xAODJet/JetAuxContainer.h" #include "xAODTracking/VertexContainer.h" #include "xAODTracking/VertexAuxContainer.h" +#include "xAODTrigBphys/TrigBphysContainer.h" +#include "xAODTrigBphys/TrigBphysAuxContainer.h" #include "xAODCaloEvent/CaloClusterContainer.h" #include "xAODTrigCalo/CaloClusterTrigAuxContainer.h" @@ -118,6 +120,7 @@ class HLTEDMCreator: public extends<AthAlgTool, IHLTOutputTool> { DEF_XAOD_KEY( CaloClusterContainer ); DEF_XAOD_KEY( JetContainer ); DEF_XAOD_KEY( VertexContainer ); + DEF_XAOD_KEY( TrigBphysContainer ); #undef DEF_VIEWS #undef DEF_KEY #undef DEF_XAOD_KEY diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py index e107afa019dd989fd523fdf8385f3c9a6cd6b338..cef757873db63e2252575ecf3a700d75d93700f0 100644 --- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py +++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py @@ -122,6 +122,12 @@ TriggerHLTListRun3 = [ ('xAOD::TrackParticleContainer#HLT_xAODTracks_MuonIso', 'BS ESD AODFULL', 'Muon', 'inViews:MUEFIsoViewRoIs'), ('xAOD::TrackParticleAuxContainer#HLT_xAODTracks_MuonIsoAux.', 'BS ESD AODFULL', 'Muon'), + #bphys + ('xAOD::TrigBphysContainer#TrigBphysDimu', 'BS ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'Bphys'), + ('xAOD::TrigBphysAuxContainer#TrigBphysDimuAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'Bphys'), + ('xAOD::TrigBphysContainer#TrigBphysEFDimu', 'BS ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'Bphys'), + ('xAOD::TrigBphysAuxContainer#TrigBphysEFDimuAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'Bphys'), + #xAOD muons (msonly (x2: roi+FS), combined (x3: FS+RoI (outside-in, inside-out+outside-in)) ('xAOD::MuonContainer#HLT_Muons_RoI', 'BS ESD AODFULL', 'Muon', 'inViews:MUEFSAViewRoIs'), ('xAOD::MuonAuxContainer#HLT_Muons_RoIAux.', 'BS ESD AODFULL', 'Muon'),