diff --git a/Trigger/TrigDataAccess/TrigSerializeResult/python/dictwrite.py b/Trigger/TrigDataAccess/TrigSerializeResult/python/dictwrite.py index 02e3c1c922becb463234cd6d568f41388201f0dd..28821e547767fa2f1ecd5b16ab857ee6a116d035 100755 --- a/Trigger/TrigDataAccess/TrigSerializeResult/python/dictwrite.py +++ b/Trigger/TrigDataAccess/TrigSerializeResult/python/dictwrite.py @@ -1,6 +1,16 @@ #!/usr/bin/env pyroot.py # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + +#---------------------------------------------- +# +# PLEASE DO NOT UPDATE bs-streamerinfos.root YOURSELF!!!! +# Contact the person mentioned on: +# https://twiki.cern.ch/twiki/bin/view/Atlas/TrigSerializeResult +# and/or the Trigger EDM Coordinator +# +#---------------------------------------------- + import sys doEDM=False @@ -25,96 +35,99 @@ b) have a real class in the 'objects' list BEFORE the typedef objects = [ -'xAOD::TrigEMCluster_v1', -'xAOD::TrigEMClusterContainer_v1', -'xAOD::TrigEMClusterAuxContainer_v1', -'xAOD::TrigRingerRings_v1', -'xAOD::TrigRingerRingsContainer_v1', -'xAOD::TrigRingerRingsAuxContainer_v1', -'xAOD::TrigRNNOutput_v1', -'xAOD::TrigRNNOutputContainer_v1', -'xAOD::TrigRNNOutputAuxContainer_v1', -'xAOD::CaloClusterContainer_v1', -'xAOD::CaloClusterAuxContainer_v2', -'xAOD::L2StandAloneMuonContainer_v1', -'xAOD::L2StandAloneMuonAuxContainer_v1', -'xAOD::L2StandAloneMuonAuxContainer_v2', -'xAOD::L2CombinedMuonContainer_v1', -'xAOD::L2CombinedMuonAuxContainer_v1', -'xAOD::L2IsoMuonContainer_v1', -'xAOD::L2IsoMuonAuxContainer_v1', -'xAOD::MuonContainer_v1', -'xAOD::MuonAuxContainer_v1', -'xAOD::MuonAuxContainer_v2', -'xAOD::MuonAuxContainer_v3', -'xAOD::TrackParticleContainer_v1', -'xAOD::TrackParticleAuxContainer_v1', -'xAOD::TrackParticleAuxContainer_v2', -'xAOD::TrackParticleAuxContainer_v3', -'xAOD::TauJetContainer_v2', -'xAOD::TauJetAuxContainer_v2', -'xAOD::TauJetAuxContainer_v3', -'xAOD::VertexContainer_v1', -'xAOD::VertexAuxContainer_v1', -'xAOD::TrigCompositeContainer_v1', -'xAOD::TrigCompositeAuxContainer_v1', -'xAOD::MuonRoIContainer_v1', -'xAOD::MuonRoIAuxContainer_v1', -'xAOD::EmTauRoIContainer_v2', -'xAOD::EmTauRoIAuxContainer_v2', -'xAOD::JetRoIContainer_v2', -'xAOD::JetRoIAuxContainer_v2', -'xAOD::JetEtRoI_v1', -'xAOD::JetEtRoIAuxInfo_v1', -'xAOD::EnergySumRoI_v1', -'xAOD::EnergySumRoIAuxInfo_v1', -'xAOD::TriggerTowerContainer_v2', -'xAOD::TriggerTowerAuxContainer_v2', -'xAOD::ElectronContainer_v1', -'xAOD::ElectronAuxContainer_v1', -'xAOD::PhotonContainer_v1', -'xAOD::PhotonAuxContainer_v1', -'xAOD::TrigBphysContainer_v1', -'xAOD::TrigBphysAuxContainer_v1', -'xAOD::TrigT2MbtsBitsAuxContainer_v1', -'xAOD::TrigT2MbtsBitsContainer_v1', -'xAOD::TrigSpacePointCountsContainer_v1', -'xAOD::TrigSpacePointCountsAuxContainer_v1', -'xAOD::TrigVertexCountsContainer_v1', -'xAOD::TrigVertexCountsAuxContainer_v1', -'xAOD::TrigTrackCounts_v1', -'xAOD::TrigTrackCountsAuxContainer_v1', -'xAOD::TrigMissingETContainer_v1', -'xAOD::TrigMissingETAuxContainer_v1', -'xAOD::TrigPhotonContainer_v1', -'xAOD::TrigPhotonAuxContainer_v1', -'xAOD::TrigElectronContainer_v1', -'xAOD::TrigElectronAuxContainer_v1', -'xAOD::JetContainer_v1', -'xAOD::JetTrigAuxContainer_v1', -'xAOD::JetTrigAuxContainer_v2', -'xAOD::TrigDecision_v1', -'xAOD::TrigDecisionAuxInfo_v1', -'xAOD::TrigConfKeys_v1', -'xAOD::TrigNavigation_v1', -'xAOD::TrigNavigationAuxInfo_v1', -'xAOD::BTaggingContainer_v1', -'xAOD::BTaggingAuxContainer_v1', -'xAOD::BTaggingTrigAuxContainer_v1', -'xAOD::BTagVertexContainer_v1', -'xAOD::BTagVertexAuxContainer_v1', -'xAOD::HIEventShapeAuxContainer_v2', -'xAOD::HIEventShapeContainer_v2', -'xAOD::TrigT2ZdcSignalsAuxContainer_v1', -'xAOD::TrigT2ZdcSignalsContainer_v1', -'xAOD::TrigPassBitsContainer_v1', -'xAOD::TrigPassBitsAuxContainer_v1', -'xAOD::CaloClusterTrigAuxContainer_v1', -'xAOD::ElectronTrigAuxContainer_v1', -'xAOD::PhotonTrigAuxContainer_v1', -'xAOD::TrigEMClusterAuxContainer_v2', -'xAOD::TrigRingerRingsAuxContainer_v2', -'xAOD::TrigRNNOutputAuxContainer_v2', + 'xAOD::TrigEMCluster_v1', + 'xAOD::TrigEMClusterContainer_v1', + 'xAOD::TrigEMClusterAuxContainer_v1', + 'xAOD::TrigRingerRings_v1', + 'xAOD::TrigRingerRingsContainer_v1', + 'xAOD::TrigRingerRingsAuxContainer_v1', + 'xAOD::TrigRNNOutput_v1', + 'xAOD::TrigRNNOutputContainer_v1', + 'xAOD::TrigRNNOutputAuxContainer_v1', + 'xAOD::CaloClusterContainer_v1', + 'xAOD::CaloClusterAuxContainer_v2', + 'xAOD::L2StandAloneMuonContainer_v1', + 'xAOD::L2StandAloneMuonAuxContainer_v1', + 'xAOD::L2StandAloneMuonAuxContainer_v2', + 'xAOD::L2CombinedMuonContainer_v1', + 'xAOD::L2CombinedMuonAuxContainer_v1', + 'xAOD::L2IsoMuonContainer_v1', + 'xAOD::L2IsoMuonAuxContainer_v1', + 'xAOD::MuonContainer_v1', + 'xAOD::MuonAuxContainer_v1', + 'xAOD::MuonAuxContainer_v2', + 'xAOD::MuonAuxContainer_v3', + 'xAOD::MuonAuxContainer_v4', + 'xAOD::TrackParticleContainer_v1', + 'xAOD::TrackParticleAuxContainer_v1', + 'xAOD::TrackParticleAuxContainer_v2', + 'xAOD::TrackParticleAuxContainer_v3', + 'xAOD::TauJetContainer_v2', + 'xAOD::TauJetAuxContainer_v2', + 'xAOD::TauJetAuxContainer_v3', + 'xAOD::VertexContainer_v1', + 'xAOD::VertexAuxContainer_v1', + 'xAOD::TrigCompositeContainer_v1', + 'xAOD::TrigCompositeAuxContainer_v1', + 'xAOD::MuonRoIContainer_v1', + 'xAOD::MuonRoIAuxContainer_v1', + 'xAOD::EmTauRoIContainer_v2', + 'xAOD::EmTauRoIAuxContainer_v2', + 'xAOD::JetRoIContainer_v2', + 'xAOD::JetRoIAuxContainer_v2', + 'xAOD::JetEtRoI_v1', + 'xAOD::JetEtRoIAuxInfo_v1', + 'xAOD::EnergySumRoI_v1', + 'xAOD::EnergySumRoIAuxInfo_v1', + 'xAOD::TriggerTowerContainer_v2', + 'xAOD::TriggerTowerAuxContainer_v2', + 'xAOD::ElectronContainer_v1', + 'xAOD::ElectronAuxContainer_v1', + 'xAOD::PhotonContainer_v1', + 'xAOD::PhotonAuxContainer_v1', + 'xAOD::TrigBphysContainer_v1', + 'xAOD::TrigBphysAuxContainer_v1', + 'xAOD::TrigT2MbtsBitsAuxContainer_v1', + 'xAOD::TrigT2MbtsBitsContainer_v1', + 'xAOD::TrigSpacePointCountsContainer_v1', + 'xAOD::TrigSpacePointCountsAuxContainer_v1', + 'xAOD::TrigVertexCountsContainer_v1', + 'xAOD::TrigVertexCountsAuxContainer_v1', + 'xAOD::TrigTrackCounts_v1', + 'xAOD::TrigTrackCountsAuxContainer_v1', + 'xAOD::TrigMissingETContainer_v1', + 'xAOD::TrigMissingETAuxContainer_v1', + 'xAOD::TrigPhotonContainer_v1', + 'xAOD::TrigPhotonAuxContainer_v1', + 'xAOD::TrigElectronContainer_v1', + 'xAOD::TrigElectronAuxContainer_v1', + 'xAOD::JetContainer_v1', + 'xAOD::JetTrigAuxContainer_v1', + 'xAOD::JetTrigAuxContainer_v2', + 'xAOD::TrigDecision_v1', + 'xAOD::TrigDecisionAuxInfo_v1', + 'xAOD::TrigConfKeys_v1', + 'xAOD::TrigNavigation_v1', + 'xAOD::TrigNavigationAuxInfo_v1', + 'xAOD::BTaggingContainer_v1', + 'xAOD::BTaggingAuxContainer_v1', + 'xAOD::BTaggingTrigAuxContainer_v1', + 'xAOD::BTagVertexContainer_v1', + 'xAOD::BTagVertexAuxContainer_v1', + 'xAOD::HIEventShapeAuxContainer_v2', + 'xAOD::HIEventShapeContainer_v2', + 'xAOD::TrigT2ZdcSignalsAuxContainer_v1', + 'xAOD::TrigT2ZdcSignalsContainer_v1', + 'xAOD::TrigPassBitsContainer_v1', + 'xAOD::TrigPassBitsAuxContainer_v1', + 'xAOD::CaloClusterTrigAuxContainer_v1', + 'xAOD::ElectronTrigAuxContainer_v1', + 'xAOD::PhotonTrigAuxContainer_v1', + 'xAOD::TrigEMClusterAuxContainer_v2', + 'xAOD::TrigRingerRingsAuxContainer_v2', + 'xAOD::TrigRNNOutputAuxContainer_v2', + 'TrigMuonEFIsolation_p2', + 'xAOD::MuonAuxContainer_v4', ] from collections import defaultdict diff --git a/Trigger/TrigDataAccess/TrigSerializeResult/share/bs-streamerinfos.root b/Trigger/TrigDataAccess/TrigSerializeResult/share/bs-streamerinfos.root index 30f525246856feccb7ce5f16e3fd44f10b8f8353..dbc118fb5bcf4ab7aa6ca8624826b497ced4b4e7 100644 Binary files a/Trigger/TrigDataAccess/TrigSerializeResult/share/bs-streamerinfos.root and b/Trigger/TrigDataAccess/TrigSerializeResult/share/bs-streamerinfos.root differ