Added ITk configs for GSF TrackStateOnSurfaceDecorator

Added ITk configs for GSF TrackStateOnSurfaceDecorator

PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetToolsConfig.py

@@ -234,6 +234,8 @@ def GSFTrackStateOnSurfaceDecoratorCfg(
     return TrackStateOnSurfaceDecoratorCfg(flags, name, **kwargs)
 
 def GSFTSOS_CommonKernelCfg(flags, name="GSFTSOS_CommonKernel"):
+    if flags.Detector.GeometryITk:
+        return ITkGSFTSOS_CommonKernelCfg(flags)
     acc = ComponentAccumulator()
     GSFTrackStateOnSurfaceDecorator = acc.getPrimaryAndMerge(
         GSFTrackStateOnSurfaceDecoratorCfg(flags))
@@ -330,6 +332,24 @@ def ITkSiSPTSOS_CommonKernelCfg(flags, name="ITkSiSPTSOS_CommonKernel"):
         name, AugmentationTools=[ITkSiSPTrackStateOnSurfaceDecorator]))
     return acc
 
+def ITkGSFTrackStateOnSurfaceDecoratorCfg(
+        flags, name="ITkGSFTrackStateOnSurfaceDecorator", **kwargs):
+    kwargs.setdefault("ContainerName", "GSFTrackParticles")
+    kwargs.setdefault("DecorationPrefix", "GSF_")
+    kwargs.setdefault("PixelMsosName", "GSF_ITkPixel_MSOSs")
+    kwargs.setdefault("SctMsosName", "GSF_ITkStrip_MSOSs")
+    kwargs.setdefault("TrtMsosName", "")
+    kwargs.setdefault("PRDtoTrackMap", "")
+    return ITkTrackStateOnSurfaceDecoratorCfg(flags, name, **kwargs)
+
+def ITkGSFTSOS_CommonKernelCfg(flags, name="ITkGSFTSOS_CommonKernel"):
+    acc = ComponentAccumulator()
+    GSFTrackStateOnSurfaceDecorator = acc.getPrimaryAndMerge(
+        ITkGSFTrackStateOnSurfaceDecoratorCfg(flags))
+    acc.addEventAlgo(CompFactory.DerivationFramework.CommonAugmentation(
+        name, AugmentationTools=[GSFTrackStateOnSurfaceDecorator]))
+    return acc
+
 # Expression of Z0 at the primary vertex
 
 

Reconstruction/egamma/egammaConfig/python/egammaOutputConfig.py

-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = "Prepare EGamma output list"
 
@@ -104,14 +104,22 @@ def egammaOutputCfg(flags, name="EGOutputList"):
         if (flags.Tracking.writeExtendedSi_PRDInfo or
             flags.Tracking.writeExtendedTRT_PRDInfo):
             extension = "GSF_"
-            toAOD += [
-                f"xAOD::TrackStateValidationContainer#{extension}Pixel_MSOSs",
-                f"xAOD::TrackStateValidationAuxContainer#{extension}Pixel_MSOSsAux.",
-                f"xAOD::TrackStateValidationContainer#{extension}SCT_MSOSs",
-                f"xAOD::TrackStateValidationAuxContainer#{extension}SCT_MSOSsAux.",
-                f"xAOD::TrackStateValidationContainer#{extension}TRT_MSOSs",
-                f"xAOD::TrackStateValidationAuxContainer#{extension}TRT_MSOSsAux."
-            ]
+            if flags.Detector.GeometryITk:
+                toAOD += [
+                    f"xAOD::TrackStateValidationContainer#{extension}ITkPixel_MSOSs",
+                    f"xAOD::TrackStateValidationAuxContainer#{extension}ITkPixel_MSOSsAux.",
+                    f"xAOD::TrackStateValidationContainer#{extension}ITkStrip_MSOSs",
+                    f"xAOD::TrackStateValidationAuxContainer#{extension}ITkStrip_MSOSsAux."
+                ]
+            else:
+                toAOD += [
+                    f"xAOD::TrackStateValidationContainer#{extension}Pixel_MSOSs",
+                    f"xAOD::TrackStateValidationAuxContainer#{extension}Pixel_MSOSsAux.",
+                    f"xAOD::TrackStateValidationContainer#{extension}SCT_MSOSs",
+                    f"xAOD::TrackStateValidationAuxContainer#{extension}SCT_MSOSsAux.",
+                    f"xAOD::TrackStateValidationContainer#{extension}TRT_MSOSs",
+                    f"xAOD::TrackStateValidationAuxContainer#{extension}TRT_MSOSsAux."
+                ]
 
     if flags.Egamma.doConversionBuilding:
         toESD += [