Merge branch 'revert-2a414893' into '21.0'

Revert "Merge branch 'CleanInDetTrackValid_21.0' into '21.0'"

See merge request atlas/athena!7423

Former-commit-id: 0000215177a1f3571ebbbdcf0e86f18686e9f97d

InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODJobProperties.py

@@ -74,6 +74,14 @@ class DumpUnassociatedHits(JobProperty):
     pass
 jobproperties.InDetDxAODJobPropertyContainer.add_JobProperty(DumpUnassociatedHits)
 
+class DumpLArCollisionTime(JobProperty):
+    """dump LAr collision time """
+    statusOn = True
+    allowedTypes = ["bool"]
+    StoredValue = True
+    pass
+jobproperties.InDetDxAODJobPropertyContainer.add_JobProperty(DumpLArCollisionTime)
+
 class DumpTruthInfo(JobProperty):
     """dump truth in fo """
     statusOn = True

InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py

@@ -30,6 +30,9 @@ dumpBytestreamErrors=InDetDxAODFlags.DumpByteStreamErrors() #True
 # Unassociated hits decorations
 dumpUnassociatedHits= InDetDxAODFlags.DumpUnassociatedHits() #True
 
+# Add LArCollisionTime augmentation tool
+dumpLArCollisionTime=InDetDxAODFlags.DumpLArCollisionTime() #True
+
 # Force to do not dump truth info if set to False
 #  (otherwise determined by autoconf below)
 dumpTruthInfo=InDetDxAODFlags.DumpTruthInfo() # True
@@ -481,6 +484,25 @@ if dumpUnassociatedHits:
         print unassociatedHitsDecorator
         print unassociatedHitsDecorator.properties()
 
+# Add LArCollisionTime augmentation tool
+if dumpLArCollisionTime:
+    from LArCellRec.LArCollisionTimeGetter import LArCollisionTimeGetter
+    from RecExConfig.ObjKeyStore           import cfgKeyStore
+    # We can only do this if we have the cell container.
+    if cfgKeyStore.isInInput ('CaloCellContainer', 'AllCalo'):
+        LArCollisionTimeGetter (IDDerivationSequence)
+
+        from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__LArCollisionTimeDecorator
+        lArCollisionTimeDecorator = DerivationFramework__LArCollisionTimeDecorator (name ='lArCollisionTimeDecorator',
+                                                                                    ContainerName = "EventInfo",
+                                                                                    DecorationPrefix = prefixName+"LArCollTime_",
+                                                                                    OutputLevel =INFO)
+        ToolSvc += lArCollisionTimeDecorator
+        augmentationTools+=[lArCollisionTimeDecorator]
+        if (printIdTrkDxAODConf):
+            print lArCollisionTimeDecorator
+            print lArCollisionTimeDecorator.properties()
+
 # Add decoration with truth parameters if running on simulation
 if isIdTrkDxAODSimulation:
     from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParametersForTruthParticles