Merge branch '21.0-SCTAxAOD' into '21.0'

TrackStateOnSurfaceDecorator of DAOD_SCTVALID is run only when tracking is not disabled

See merge request atlas/athena!10978

Former-commit-id: bb33c7733fc1e5193167b30ec79e00e25fab02c3

InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/SCTxAOD.py

@@ -105,17 +105,19 @@ svcMgr.DecisionSvc.CalcStats = True
 # Add the TSOS augmentation tool to the derivation framework
 augmentationTools=[]
 
-from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackStateOnSurfaceDecorator
-DFTSOS = DerivationFramework__TrackStateOnSurfaceDecorator(name = "SCTxAOD_DFTrackStateOnSurfaceDecorator",
-                                                          ContainerName = "InDetTrackParticles",
-                                                          DecorationPrefix = prefixName,
-                                                          StoreTRT   = False,
-                                                          StoreSCT   = True,
-                                                          StorePixel = False,
-                                                          IsSimulation = isSctDxAODSimulation,
-                                                          OutputLevel = INFO)
-ToolSvc += DFTSOS
-augmentationTools+=[DFTSOS]
+from InDetRecExample.InDetJobProperties import InDetFlags
+if not InDetFlags.disableTracking():
+    from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackStateOnSurfaceDecorator
+    DFTSOS = DerivationFramework__TrackStateOnSurfaceDecorator(name = "SCTxAOD_DFTrackStateOnSurfaceDecorator",
+                                                               ContainerName = "InDetTrackParticles",
+                                                               DecorationPrefix = prefixName,
+                                                               StoreTRT   = False,
+                                                               StoreSCT   = True,
+                                                               StorePixel = False,
+                                                               IsSimulation = isSctDxAODSimulation,
+                                                               OutputLevel = INFO)
+    ToolSvc += DFTSOS
+    augmentationTools+=[DFTSOS]
 
 
 # Add BS error augmentation tool