From 161bc8293a823b248678ced731a2caba9f6be3a4 Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tamara.vazquez.schroeder@cern.ch>
Date: Thu, 14 Dec 2017 14:23:43 +0000
Subject: [PATCH] Revert "Merge branch 'CleanInDetTrackValid_21.0' into '21.0'"
This reverts merge request !7318
Former-commit-id: ce3077fcb1d89fbf877389fe43cfcde630656c5e
---
.../python/InDetDxAODJobProperties.py | 8 +++++++
.../share/InDetDxAOD.py | 22 +++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODJobProperties.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODJobProperties.py
index 52b4f019eb6..75ad92e83fa 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/python/InDetDxAODJobProperties.py
+++ b/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
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
index de693a2ef77..45d35002e40 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
+++ b/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
--
GitLab