Commit 3366a446 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'caloExtension_no_decor_III' into 'master'

caloExtension, cellAssociation are not decorations anymore no need to suppress them

See merge request atlas/athena!48830
parents 439de123 8bfa476c
......@@ -327,7 +327,7 @@ svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.TriggerMenuMetaDataTool ]
excludedAuxData = "-caloExtension.-cellAssociation.-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
excludedAuxData = "-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
excludedTRTData = "-T0.-TRTboard.-TRTchip.-bitPattern.-driftTimeToTCorrection.-driftTimeHTCorrection.-highThreshold.-strawnumber"
excludedSCTData = "-detectorElementID.-hitsInThirdTimeBin.-rdo_groupsize"
......
......@@ -215,7 +215,7 @@ from PrimaryDPDMaker.PrimaryDPDFlags import primDPD
streamName = primDPD.WriteDAOD_IDTRKLUMIStream.StreamName
fileName = buildFileName( primDPD.WriteDAOD_IDTRKLUMIStream )
IDTRKLUMIStream = MSMgr.NewPoolRootStream( streamName, fileName )
excludedAuxData = "-caloExtension.-cellAssociation.-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
excludedAuxData = "-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
# Add generic event information
IDTRKLUMIStream.AddItem("xAOD::EventInfo#*")
......
......@@ -397,11 +397,11 @@ outList = CfgItemList( 'IDALIGN',
'xAOD::JEMTobRoIContainer#JEMTobRoIsRoIB',
'xAOD::L2StandAloneMuonAuxContainer#HLT_xAOD__L2StandAloneMuonContainer_MuonL2SAInfoAux.',
'xAOD::TrigSpacePointCountsContainer#HLT_xAOD__TrigSpacePointCountsContainer_spacepoints',
'xAOD::TrackParticleAuxContainer#CombinedMuonTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#CombinedStauTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#ExtrapolatedMuonTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#ExtrapolatedStauTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#GSFTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#CombinedMuonTrackParticlesAux.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#CombinedStauTrackParticlesAux.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#ExtrapolatedMuonTrackParticlesAux.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#ExtrapolatedStauTrackParticlesAux.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#GSFTrackParticlesAux.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnvIOTRT_CosmicsN_EFIDAux.',
'xAOD::TrackParticleAuxContainer#HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTFAux.',
'xAOD::TrackParticleAuxContainer#HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_EFIDAux.',
......
......@@ -396,11 +396,11 @@ outList = CfgItemList( 'DEDX',
'xAOD::JEMTobRoIContainer#JEMTobRoIsRoIB',
'xAOD::L2StandAloneMuonAuxContainer#HLT_xAOD__L2StandAloneMuonContainer_MuonL2SAInfoAux.',
'xAOD::TrigSpacePointCountsContainer#HLT_xAOD__TrigSpacePointCountsContainer_spacepoints',
'xAOD::TrackParticleAuxContainer#CombinedMuonTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#CombinedStauTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#ExtrapolatedMuonTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#CombinedMuonTrackParticlesAux.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#CombinedStauTrackParticlesAux.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#ExtrapolatedMuonTrackParticlesAux.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#ExtrapolatedStauTrackParticlesAux.',
'xAOD::TrackParticleAuxContainer#GSFTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#GSFTrackParticlesAux.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnvIOTRT_CosmicsN_EFIDAux.',
'xAOD::TrackParticleAuxContainer#HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTFAux.',
'xAOD::TrackParticleAuxContainer#HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_EFIDAux.',
......
......@@ -313,7 +313,7 @@ if primDPDAlignTrigMu.ApplySkimming():
#AlignmentTriggerMuonStream.Stream.TakeItemsFromInput = True
from PrimaryDPDMaker import PrimaryDPD_OutputDefinitions as dpdOutput
trackParticleAuxExclusions="-caloExtension.-cellAssociation.-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
trackParticleAuxExclusions="-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
if primDPDAlignTrigMu.doAlignmentFormat():
trackParticleAuxExclusions=""
......
......@@ -159,7 +159,7 @@ ExcludeList=[]
#dpdOutput.addAllItemsFromInputExceptExcludeList(streamName,ExcludeList)
trackParticleAuxExclusions="-caloExtension.-cellAssociation.-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
trackParticleAuxExclusions="-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
TileMuStream.AddItem(["xAOD::EventInfo#*"])
......
......@@ -550,7 +550,7 @@ outList = CfgItemList( 'EGAMMA',
'xAOD::MuonAuxContainer#HLT_xAOD__MuonContainer_MuonEFInfo_MSonlyTrackParticles_FullScanAux.',
'xAOD::MuonAuxContainer#HLT_xAOD__MuonContainer_eMuonEFInfoAux.',
'xAOD::MuonAuxContainer#MuonsAux.',
'xAOD::MuonAuxContainer#StausAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::MuonAuxContainer#StausAux.-clusterAssociation',
'Muon::MdtPrepDataContainer#MDT_DriftCircles',
'xAOD::HIEventShapeContainer#HLT_xAOD__HIEventShapeContainer_HIUE',
'xAOD::BTagVertexContainer#BTagging_AntiKt2TrackJFVtx',
......
......@@ -411,11 +411,11 @@ outList = CfgItemList( 'EOVERP',
'xAOD::JEMTobRoIContainer#JEMTobRoIsRoIB',
'xAOD::L2StandAloneMuonAuxContainer#HLT_xAOD__L2StandAloneMuonContainer_MuonL2SAInfoAux.',
'xAOD::TrigSpacePointCountsContainer#HLT_xAOD__TrigSpacePointCountsContainer_spacepoints',
'xAOD::TrackParticleAuxContainer#CombinedMuonTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#CombinedStauTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#ExtrapolatedMuonTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#CombinedMuonTrackParticlesAux.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#CombinedStauTrackParticlesAux.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#ExtrapolatedMuonTrackParticlesAux.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#ExtrapolatedStauTrackParticlesAux.',
'xAOD::TrackParticleAuxContainer#GSFTrackParticlesAux.-caloExtension.-cellAssociation.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#GSFTrackParticlesAux.-clusterAssociation',
'xAOD::TrackParticleAuxContainer#HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnvIOTRT_CosmicsN_EFIDAux.',
'xAOD::TrackParticleAuxContainer#HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTFAux.',
'xAOD::TrackParticleAuxContainer#HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_EFIDAux.',
......
......@@ -238,7 +238,7 @@ ExcludeList=[ #"TrackCollection#Tracks",
"DetailedTrackTruthCollection#ResolvedForwardTracksDetailedTruth",
]
trackParticleAuxExclusions="-caloExtension.-cellAssociation.-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
trackParticleAuxExclusions="-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
ExcludeList=[]
#dpdOutput.addAllItemsFromInputExceptExcludeList(streamName,ExcludeList)
......
......@@ -66,7 +66,7 @@ from PrimaryDPDMaker import PrimaryDPD_OutputDefinitions as dpdOutput
ExcludeList=[]
#dpdOutput.addAllItemsFromInputExceptExcludeList(streamName,ExcludeList)
trackParticleAuxExclusions="-caloExtension.-cellAssociation.-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
trackParticleAuxExclusions="-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
from AthenaCommon.KeyStore import CfgKeyStore,CfgItemList
outList = CfgItemList( 'PHOJET',
......
......@@ -66,7 +66,7 @@ from PrimaryDPDMaker import PrimaryDPD_OutputDefinitions as dpdOutput
ExcludeList=[]
#dpdOutput.addAllItemsFromInputExceptExcludeList(streamName,ExcludeList)
trackParticleAuxExclusions="-caloExtension.-cellAssociation.-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
trackParticleAuxExclusions="-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
from AthenaCommon.KeyStore import CfgKeyStore,CfgItemList
outList = CfgItemList( 'SGLEL',
......
......@@ -111,7 +111,7 @@ ExcludeList=[ "TrackCollection#Tracks",
]
#dpdOutput.addAllItemsFromInputExceptExcludeList(streamName,ExcludeList)
trackParticleAuxExclusions="-caloExtension.-cellAssociation.-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
trackParticleAuxExclusions="-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
from AthenaCommon.KeyStore import CfgKeyStore,CfgItemList
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment