Merge branch 'master-truth-content' into 'master'

Specify truth container names when writing to AOD/ESD and move other containers to their domain

See merge request atlas/athena!53382

Event/xAOD/xAODTruthCnv/python/xAODTruthCnvConfigNew.py

-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
 
@@ -35,12 +35,14 @@ def GEN_AOD2xAODCfg(flags, name="GEN_AOD2xAOD", **kwargs):
     acc.addEventAlgo(algo, primary = True)
 
     from OutputStreamAthenaPool.OutputStreamConfig import addToESD,addToAOD
-    toAOD = ["xAOD::TruthEventContainer#*", "xAOD::TruthEventAuxContainer#*",
-             "xAOD::TruthVertexContainer#*", "xAOD::TruthVertexAuxContainer#*",
-             "xAOD::TruthParticleContainer#*", "xAOD::TruthParticleAuxContainer#*"]
+    toAOD = ["xAOD::TruthEventContainer#TruthEvents", "xAOD::TruthEventAuxContainer#TruthEventsContainerAux.",
+             "xAOD::TruthVertexContainer#TruthVertices", "xAOD::TruthVertexAuxContainer#TruthVerticesAux.",
+             "xAOD::TruthParticleContainer#TruthParticles", "xAOD::TruthParticleAuxContainer#TruthParticlesAux.",
+    ]
+
     if writeInTimePileUpTruth:
-        toAOD.append("xAOD::TruthPileupEventContainer#*")
-        toAOD.append("xAOD::TruthPileupEventAuxContainer#*")
+        toAOD.append("xAOD::TruthPileupEventContainer#TruthPileupEvents")
+        toAOD.append("xAOD::TruthPileupEventAuxContainer#TruthPileupEventsAux.")
     toESD = []
 
     if flags.Output.doWriteESD:

Reconstruction/egamma/egammaConfig/python/egammaLRTOutputConfig.py

@@ -41,6 +41,12 @@ def egammaLRTOutputCfg(flags, name="LRTEGOutputList"):
         f"xAOD::TrackParticleContainer#LRT{outFlags.GSFTrackParticles}",
         f"xAOD::TrackParticleAuxContainer#LRT{outFlags.GSFTrackParticles}"
         f"Aux.{outFlags.GSFTrackParticlesSuppESD}"]
+    if flags.Egamma.doTruthAssociation:
+        toESD += [
+            f"xAOD::TruthParticleContainer#LRT{outFlags.TruthParticles}",
+            f"xAOD::TruthParticleAuxContainer#LRT{outFlags.TruthParticles}"
+            f"Aux.{outFlags.TruthParticlesSuppESD}"]
+
 
     toAOD += [
         f"xAOD::ElectronContainer#LRT{outFlags.Electrons}",
@@ -57,6 +63,13 @@ def egammaLRTOutputCfg(flags, name="LRTEGOutputList"):
         f"xAOD::TrackParticleContainer#LRT{outFlags.GSFTrackParticles}",
         f"xAOD::TrackParticleAuxContainer#LRT{outFlags.GSFTrackParticles}"
         f"Aux.{outFlags.GSFTrackParticlesSuppAOD}"]
+    if flags.Egamma.doTruthAssociation:
+        toAOD += [
+            f"xAOD::TruthParticleContainer#LRT{outFlags.TruthParticles}",
+            f"xAOD::TruthParticleAuxContainer#LRT{outFlags.TruthParticles}"
+            f"Aux.{outFlags.TruthParticlesSuppAOD}"]
+
+        
 
     if flags.Output.doWriteESD:
         from OutputStreamAthenaPool.OutputStreamConfig import addToESD