diff --git a/InnerDetector/InDetConfig/python/BackTrackingConfig.py b/InnerDetector/InDetConfig/python/BackTrackingConfig.py
index 2734bf5b7e2d2649ef7440df20cc2b3c356787a1..fea2473ffa16a367991f5aaaf578d4bfd53fe2e7 100644
--- a/InnerDetector/InDetConfig/python/BackTrackingConfig.py
+++ b/InnerDetector/InDetConfig/python/BackTrackingConfig.py
@@ -369,9 +369,7 @@ if __name__ == "__main__":
if not flags.InDet.Tracking.doDBMstandalone:
from InDetConfig.TRTPreProcessing import TRTPreProcessingCfg
- top_acc.merge(TRTPreProcessingCfg(flags,
- useTimeInfo = not flags.InDet.Tracking.doTRTPhaseCalculation or flags.Beam.Type=="collisions",
- usePhase = False))
+ top_acc.merge(TRTPreProcessingCfg(flags))
######################################## TRTSegmentFinding Configuration ###########################################
InputCollections = []
@@ -380,8 +378,7 @@ if __name__ == "__main__":
top_acc.merge(TRTSegmentFindingCfg( flags,
extension = "",
InputCollections = InputCollections,
- BarrelSegments = 'TRTSegments', # InDetKeys.TRT_Segments
- doPhase = False))
+ BarrelSegments = 'TRTSegments'))
########################################## BackTracking Configuration ##############################################
TrackCollectionKeys = []
diff --git a/InnerDetector/InDetConfig/python/InDetConfigFlags.py b/InnerDetector/InDetConfig/python/InDetConfigFlags.py
index 5cbf0ae9d7f4bc2f26990f9f9a74629cca4f9c12..970e8432c5cc6542ea26b9887dea9fc6235eb5c3 100644
--- a/InnerDetector/InDetConfig/python/InDetConfigFlags.py
+++ b/InnerDetector/InDetConfig/python/InDetConfigFlags.py
@@ -52,7 +52,6 @@ def createInDetConfigFlags():
icf.addFlag("InDet.Tracking.doRefitInvalidCov", False) # Try Kalman fitter if the track fit in the ambiguity processor produces non positive definitematrices.
icf.addFlag("InDet.Tracking.trtExtensionType", "xk") # which extension type ("xk"/"DAF")
icf.addFlag("InDet.Tracking.redoTRT_LR", lambda prevFlags: not prevFlags.InDet.Tracking.trtExtensionType=="DAF") # use smart TRT LR/tube hit creator and redo ROTs
- icf.addFlag("InDet.Tracking.doTRTPhaseCalculation", lambda prevFlags: prevFlags.Beam.Type=="cosmics") # control to run TRT phase calculation
### Tracking passes/configurations scheduled
diff --git a/InnerDetector/InDetConfig/python/TRTExtensionConfig.py b/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
index 1a64f3eab3cfef7eefec5e8eb343d4ad2b87bfc6..717004bc4eb1efbb893274a4913d57b5db336ca8 100644
--- a/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
@@ -50,7 +50,7 @@ def DeterministicAnnealingFilterCfg(flags, name = 'InDetDAF', **kwargs):
acc.setPrivateTools(CompFactory.Trk.DeterministicAnnealingFilter(name = name, **kwargs))
return acc
-def InDetExtensionProcessorCfg(flags, SiTrackCollection=None, ExtendedTrackCollection = None, ExtendedTracksMap = None, doPhase=True, **kwargs):
+def InDetExtensionProcessorCfg(flags, SiTrackCollection=None, ExtendedTrackCollection = None, ExtendedTracksMap = None, **kwargs):
acc = ComponentAccumulator()
ForwardTrackCollection = ExtendedTrackCollection
@@ -103,15 +103,9 @@ def InDetExtensionProcessorCfg(flags, SiTrackCollection=None, ExtendedTrackColle
kwargs.setdefault("pTminBrem", flags.InDet.Tracking.ActivePass.minPTBrem)
kwargs.setdefault("RefitPrds", False)
kwargs.setdefault("matEffects", flags.InDet.Tracking.materialInteractionsType if flags.InDet.Tracking.materialInteractions else 0)
-
- if doPhase:
- kwargs.setdefault("Cosmics", True)
-
- acc.addEventAlgo(CompFactory.InDet.InDetExtensionProcessor(name = "InDetExtensionProcessorPhase" + flags.InDet.Tracking.ActivePass.extension, **kwargs))
- else:
- kwargs.setdefault("Cosmics", flags.Beam.Type == "cosmics")
+ kwargs.setdefault("Cosmics", flags.Beam.Type == "cosmics")
- acc.addEventAlgo(CompFactory.InDet.InDetExtensionProcessor("InDetExtensionProcessor" + flags.InDet.Tracking.ActivePass.extension, **kwargs))
+ acc.addEventAlgo(CompFactory.InDet.InDetExtensionProcessor("InDetExtensionProcessor" + flags.InDet.Tracking.ActivePass.extension, **kwargs))
return acc
@@ -121,28 +115,22 @@ def InDetExtensionProcessorCfg(flags, SiTrackCollection=None, ExtendedTrackColle
# ----------- Setup TRT Extension for New tracking
#
# ------------------------------------------------------------
-def NewTrackingTRTExtensionCfg(flags, SiTrackCollection = None, ExtendedTrackCollection = None, ExtendedTracksMap = None, doPhase = True):
+def NewTrackingTRTExtensionCfg(flags, SiTrackCollection = None, ExtendedTrackCollection = None, ExtendedTracksMap = None):
from InDetConfig.TRTPreProcessing import TRTPreProcessingCfg
acc = TRTPreProcessingCfg(flags)
#
# Track extension to TRT algorithm
#
- if doPhase:
- acc.merge(TRT_TrackExtensionAlgCfg( flags,
- name = 'InDetTRT_ExtensionPhase' + flags.InDet.Tracking.ActivePass.extension,
- SiTrackCollection=SiTrackCollection,
- ExtendedTracksMap = ExtendedTracksMap))
- else:
- acc.merge(TRT_TrackExtensionAlgCfg( flags,
- name = 'InDetTRT_Extension' + flags.InDet.Tracking.ActivePass.extension,
- SiTrackCollection=SiTrackCollection,
- ExtendedTracksMap = ExtendedTracksMap,
- TrackExtensionTool = acc.popToolsAndMerge(TC.InDetTRT_ExtensionToolCfg(flags))))
+ acc.merge(TRT_TrackExtensionAlgCfg(flags,
+ name = 'InDetTRT_Extension' + flags.InDet.Tracking.ActivePass.extension,
+ SiTrackCollection=SiTrackCollection,
+ ExtendedTracksMap = ExtendedTracksMap,
+ TrackExtensionTool = acc.popToolsAndMerge(TC.InDetTRT_ExtensionToolCfg(flags))))
+
acc.merge(InDetExtensionProcessorCfg(flags,
SiTrackCollection = SiTrackCollection,
ExtendedTrackCollection = ExtendedTrackCollection,
- ExtendedTracksMap = ExtendedTracksMap,
- doPhase = doPhase))
+ ExtendedTracksMap = ExtendedTracksMap))
return acc
##########################################################################################################################
@@ -227,17 +215,14 @@ if __name__ == "__main__":
################# TRTPreProcessing Configuration ######################
if not ConfigFlags.InDet.Tracking.doDBMstandalone:
from InDetConfig.TRTPreProcessing import TRTPreProcessingCfg
- top_acc.merge(TRTPreProcessingCfg(ConfigFlags,
- useTimeInfo = not ConfigFlags.InDet.Tracking.doTRTPhaseCalculation or ConfigFlags.Beam.Type=="collisions",
- usePhase = False))
+ top_acc.merge(TRTPreProcessingCfg(ConfigFlags))
################ TRTSegmentFinding Configuration ######################
from InDetConfig.TRTSegmentFindingConfig import TRTSegmentFindingCfg
top_acc.merge(TRTSegmentFindingCfg( ConfigFlags,
extension = "",
InputCollections = InputCollections,
- BarrelSegments = 'TRTSegments',
- doPhase = False))
+ BarrelSegments = 'TRTSegments'))
####################### TrackingSiPattern #############################
from InDetConfig.TrackingSiPatternConfig import SiSPSeededTrackFinderCfg
@@ -259,8 +244,7 @@ if __name__ == "__main__":
top_acc.merge(NewTrackingTRTExtensionCfg(ConfigFlags,
SiTrackCollection=InDetSpSeededTracksKey,
ExtendedTrackCollection = ExtendedTrackCollection,
- ExtendedTracksMap = ExtendedTracksMap,
- doPhase = False))
+ ExtendedTracksMap = ExtendedTracksMap))
#######################################################################
iovsvc = top_acc.getService('IOVDbSvc')
diff --git a/InnerDetector/InDetConfig/python/TRTPreProcessing.py b/InnerDetector/InDetConfig/python/TRTPreProcessing.py
index a8f872baae050b6047a8762c96ba9e7783372725..19f403ebc08996b056256bd10e669f96c2c93248 100644
--- a/InnerDetector/InDetConfig/python/TRTPreProcessing.py
+++ b/InnerDetector/InDetConfig/python/TRTPreProcessing.py
@@ -44,7 +44,7 @@ def InDetPRD_MultiTruthMakerTRTPUCfg(flags, name = "InDetTRT_PRD_MultiTruthMaker
acc.addEventAlgo(CompFactory.InDet.PRD_MultiTruthMaker(name, **kwargs))
return acc
-def InDetTRT_DriftFunctionToolCfg(flags, useTimeInfo, usePhase, name = "InDetTRT_DriftFunctionTool", **kwargs):
+def InDetTRT_DriftFunctionToolCfg(flags, name = "InDetTRT_DriftFunctionTool", **kwargs):
acc = ComponentAccumulator()
#
# --- TRT_DriftFunctionTool
@@ -55,20 +55,12 @@ def InDetTRT_DriftFunctionToolCfg(flags, useTimeInfo, usePhase, name = "InDetTRT
acc.addPublicTool(CalDbTool)
# --- overwrite for uncalibrated DC production
- if (not useTimeInfo) or flags.InDet.noTRTTiming:
+ if flags.Beam.Type=="cosmics" or flags.InDet.noTRTTiming:
kwargs.setdefault("DummyMode", True)
kwargs.setdefault("UniversalError", 1.15)
# --- set Data/MC flag
- if( flags.Input.isMC ) :
- kwargs.setdefault("IsMC", True)
- else :
- kwargs.setdefault("IsMC", False)
-
- # --- overwrite for calibration of MC
- if usePhase and flags.Beam.Type =='cosmics' and flags.Input.isMC:
- kwargs.setdefault("AllowDigiVersionOverride", True)
- kwargs.setdefault("ForcedDigiVersion", 9)
+ kwargs.setdefault("IsMC", flags.Input.isMC)
kwargs.setdefault("TRTCalDbTool", CalDbTool)
# --- set HT corrections
@@ -120,15 +112,12 @@ def TRTDriftTimes( isData, isCosmics ):
HighGateArgon = 42.1875*ns)
-def TRT_DriftCircleToolCfg(flags, useTimeInfo, usePhase, prefix, name = "InDetTRT_DriftCircleTool", **kwargs):
+def TRT_DriftCircleToolCfg(flags, prefix, name = "InDetTRT_DriftCircleTool", **kwargs):
acc = ComponentAccumulator()
#
# --- TRT_DriftCircleTool
#
- if usePhase:
- TRT_DriftCircleTool = CompFactory.InDet.TRT_DriftCircleToolCosmics
- else:
- TRT_DriftCircleTool = CompFactory.InDet.TRT_DriftCircleTool
+ TRT_DriftCircleTool = CompFactory.InDet.TRT_DriftCircleTool
# set gating values for MC/DATA
from AthenaCommon.SystemOfUnits import ns
@@ -140,7 +129,7 @@ def TRT_DriftCircleToolCfg(flags, useTimeInfo, usePhase, prefix, name = "InDetTR
#
# --- TRT_DriftFunctionTool
#
- InDetTRT_DriftFunctionTool = acc.popToolsAndMerge(InDetTRT_DriftFunctionToolCfg(flags, useTimeInfo, usePhase, name = prefix + "DriftFunctionTool", **kwargs))
+ InDetTRT_DriftFunctionTool = acc.popToolsAndMerge(InDetTRT_DriftFunctionToolCfg(flags, name = prefix + "DriftFunctionTool", **kwargs))
acc.addPublicTool(InDetTRT_DriftFunctionTool)
from TRT_ConditionsServices.TRT_ConditionsServicesConfig import TRT_StrawStatusSummaryToolCfg
@@ -181,12 +170,12 @@ def TRT_DriftCircleToolCfg(flags, useTimeInfo, usePhase, prefix, name = "InDetTR
-def InDetTRT_RIO_MakerCfg(flags, useTimeInfo, usePhase, prefix, collection, name = "InDetTRT_RIO_Maker", **kwargs):
+def InDetTRT_RIO_MakerCfg(flags, prefix, collection, name = "InDetTRT_RIO_Maker", **kwargs):
acc = ComponentAccumulator()
#
# --- TRT_DriftCircleTool
#
- InDetTRT_DriftCircleTool = acc.popToolsAndMerge(TRT_DriftCircleToolCfg(flags, useTimeInfo, usePhase, prefix, name = "InDetTRT_DriftCircleTool"))
+ InDetTRT_DriftCircleTool = acc.popToolsAndMerge(TRT_DriftCircleToolCfg(flags, prefix, name = "InDetTRT_DriftCircleTool"))
acc.addPublicTool(InDetTRT_DriftCircleTool)
# Region selector tools for TRT
@@ -204,12 +193,12 @@ def InDetTRT_RIO_MakerCfg(flags, useTimeInfo, usePhase, prefix, collection, name
acc.addEventAlgo(CompFactory.InDet.TRT_RIO_Maker(name, **kwargs))
return acc
-def InDetTRT_RIO_MakerPUCfg(flags, useTimeInfo, usePhase, prefix, collectionPU, name = "InDetTRT_RIO_MakerPU", **kwargs):
+def InDetTRT_RIO_MakerPUCfg(flags, prefix, collectionPU, name = "InDetTRT_RIO_MakerPU", **kwargs):
acc = ComponentAccumulator()
#
# --- TRT_DriftCircleTool
#
- InDetTRT_DriftCircleTool = acc.popToolsAndMerge(TRT_DriftCircleToolCfg(flags, useTimeInfo, usePhase, prefix, name = "InDetTRT_DriftCircleTool"))
+ InDetTRT_DriftCircleTool = acc.popToolsAndMerge(TRT_DriftCircleToolCfg(flags, prefix, name = "InDetTRT_DriftCircleTool"))
acc.addPublicTool(InDetTRT_DriftCircleTool)
# Region selector tools for TRT
@@ -228,7 +217,7 @@ def InDetTRT_RIO_MakerPUCfg(flags, useTimeInfo, usePhase, prefix, collectionPU,
return acc
########################################################################################################
########################################################################################################
-def TRTPreProcessingCfg(flags, useTimeInfo = True, usePhase = False, **kwargs):
+def TRTPreProcessingCfg(flags, **kwargs):
acc = ComponentAccumulator()
from PixelConditionsAlgorithms.PixelConditionsConfig import (PixelChargeCalibCondAlgCfg, PixelConfigCondAlgCfg, PixelDeadMapCondAlgCfg, PixelCablingCondAlgCfg, PixelReadoutSpeedAlgCfg)
@@ -242,22 +231,23 @@ def TRTPreProcessingCfg(flags, useTimeInfo = True, usePhase = False, **kwargs):
#
# --- setup naming of tools and algs
#
- if useTimeInfo:
- prefix = "InDetTRT_"
- collection = 'TRT_DriftCircles' ##InDetKeys.TRT_DriftCircles
- if flags.InDet.doSplitReco:
- collectionPU = 'TRT_PU_DriftCircles' ##read from InDetKeys.TRT_PU_DriftCircles
- else:
+ if flags.Beam.Type=="cosmics":
prefix = "InDetTRT_noTime_"
collection = 'TRT_DriftCirclesUncalibrated' ##read from InDetKeys.TRT_DriftCirclesUncalibrated
if flags.InDet.doSplitReco:
collectionPU = 'TRT_PU_DriftCirclesUncalibrated' ##read from InDetKeys.TRT_PU_DriftCirclesUncalibrated
+ else:
+ prefix = "InDetTRT_"
+ collection = 'TRT_DriftCircles' ##InDetKeys.TRT_DriftCircles
+ if flags.InDet.doSplitReco:
+ collectionPU = 'TRT_PU_DriftCircles' ##read from InDetKeys.TRT_PU_DriftCircles
+
#
# --- TRT_RIO_Maker Algorithm
#
- acc.merge(InDetTRT_RIO_MakerCfg(flags, useTimeInfo, usePhase, prefix, collection, name = prefix+"RIO_Maker"))
+ acc.merge(InDetTRT_RIO_MakerCfg(flags, prefix, collection, name = prefix+"RIO_Maker"))
if flags.InDet.doSplitReco :
- acc.merge(InDetTRT_RIO_MakerPUCfg(flags, useTimeInfo, usePhase, prefix, collectionPU, name = prefix+"RIO_MakerPU", **kwargs))
+ acc.merge(InDetTRT_RIO_MakerPUCfg(flags, prefix, collectionPU, name = prefix+"RIO_MakerPU", **kwargs))
#
# Include alg to save the local occupancy inside xAOD::EventInfo
#
@@ -267,7 +257,7 @@ def TRTPreProcessingCfg(flags, useTimeInfo = True, usePhase = False, **kwargs):
#
# --- we need to do truth association if requested (not for uncalibrated hits in cosmics)
#
- if flags.InDet.doTruth and useTimeInfo:
+ if flags.InDet.doTruth and not flags.Beam.Type=="cosmics":
acc.merge(InDetPRD_MultiTruthMakerTRTCfg(flags, name = prefix + "PRD_MultiTruthMaker"))
if flags.InDet.doSplitReco :
acc.merge(InDetPRD_MultiTruthMakerTRTPUCfg(flags, name = prefix+"PRD_MultiTruthMakerPU"))
@@ -306,9 +296,7 @@ if __name__ == "__main__":
top_acc.merge( SCT_ReadoutGeometryCfg(ConfigFlags) )
if not ConfigFlags.InDet.Tracking.doDBMstandalone:
- top_acc.merge(TRTPreProcessingCfg(ConfigFlags,
- useTimeInfo = not ConfigFlags.InDet.Tracking.doTRTPhaseCalculation or ConfigFlags.Beam.Type=="collisions",
- usePhase = False))
+ top_acc.merge(TRTPreProcessingCfg(ConfigFlags))
iovsvc = top_acc.getService('IOVDbSvc')
iovsvc.OutputLevel=5
diff --git a/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py b/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py
index db23a977a49a8f430b8d217c079eac293530f1ab..193325076b10438d0ef934c7c84e7990c62d720a 100644
--- a/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py
@@ -82,7 +82,7 @@ def TRT_TrackSegmentsMakerCondAlg_ATLxkCfg(flags, name = 'InDetTRT_SeedsMakerCon
acc.addCondAlgo(InDetTRT_TrackSegmentsMakerCondAlg)
return acc
-def TRT_TrackSegmentsFinderCfg(flags, name = 'InDetTRT_TrackSegmentsFinder', extension = '', BarrelSegments = None, InputCollections =None, doPhase = False, **kwargs):
+def TRT_TrackSegmentsFinderCfg(flags, name = 'InDetTRT_TrackSegmentsFinder', extension = '', BarrelSegments = None, InputCollections =None, **kwargs):
from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg
acc = MagneticFieldSvcCfg(flags)
@@ -95,43 +95,32 @@ def TRT_TrackSegmentsFinderCfg(flags, name = 'InDetTRT_TrackSegmentsFinder', ext
#
# --- cosmics barrel segments (use TRT track segements even for NewT)
#
- if doPhase:
- InDetTRT_TrackSegmentsMakerPhase = acc.popToolsAndMerge(TRT_TrackSegmentsMaker_BarrelCosmicsCfg(flags, name='InDetTRTSegmentsMakerPhase'+extension))
- acc.addPublicTool(InDetTRT_TrackSegmentsMakerPhase)
-
- kwargs.setdefault("SegmentsMakerTool", InDetTRT_TrackSegmentsMakerPhase)
- kwargs.setdefault("SegmentsLocation", BarrelSegments)
- else:
- InDetTRT_TrackSegmentsMaker = acc.popToolsAndMerge(TRT_TrackSegmentsMaker_BarrelCosmicsCfg(flags, name='InDetTRTSegmentsMaker'+extension,
- TRT_ClustersContainer = 'TRT_DriftCircles')) # InDetKeys.TRT_DriftCircles
- acc.addPublicTool(InDetTRT_TrackSegmentsMaker)
-
- if flags.Detector.EnableCalo and flags.InDet.Tracking.ActivePass.RoISeededBackTracking:
- from InDetConfig.InDetRecCaloSeededROISelectionConfig import CaloClusterROI_SelectorCfg
- acc.merge(CaloClusterROI_SelectorCfg(flags))
- kwargs.setdefault("SegmentsMakerTool", InDetTRT_TrackSegmentsMaker)
- kwargs.setdefault("SegmentsLocation", BarrelSegments)
- kwargs.setdefault("useCaloSeeds", True)
- kwargs.setdefault("InputClusterContainerName", 'InDetCaloClusterROIs') # InDetKeys.CaloClusterROIContainer
- else:
- kwargs.setdefault("SegmentsMakerTool", InDetTRT_TrackSegmentsMaker)
- kwargs.setdefault("SegmentsLocation", BarrelSegments)
- kwargs.setdefault("InputClusterContainerName", "")
+ InDetTRT_TrackSegmentsMaker = acc.popToolsAndMerge(TRT_TrackSegmentsMaker_BarrelCosmicsCfg(flags, name='InDetTRTSegmentsMaker'+extension,
+ TRT_ClustersContainer = 'TRT_DriftCircles')) # InDetKeys.TRT_DriftCircles
+ acc.addPublicTool(InDetTRT_TrackSegmentsMaker)
+
else:
#
- # --- offline version of TRT segemnt making
+ # --- offline version of TRT segment making
#
InDetTRT_TrackSegmentsMaker = acc.popToolsAndMerge(TRT_TrackSegmentsMaker_ATLxkCfg( flags,
name = 'InDetTRT_SeedsMaker'+extension,
extension = extension,
InputCollections = InputCollections))
acc.addPublicTool(InDetTRT_TrackSegmentsMaker)
- kwargs.setdefault("SegmentsMakerTool", InDetTRT_TrackSegmentsMaker)
acc.merge(TRT_TrackSegmentsMakerCondAlg_ATLxkCfg(flags,
name = 'InDetTRT_SeedsMakerCondAlg'+ extension,
extension = extension))
+ kwargs.setdefault("SegmentsMakerTool", InDetTRT_TrackSegmentsMaker)
+ kwargs.setdefault("SegmentsLocation", BarrelSegments)
+
+ if flags.InDet.Tracking.ActivePass.RoISeededBackTracking:
+ from InDetConfig.InDetRecCaloSeededROISelectionConfig import CaloClusterROI_SelectorCfg
+ acc.merge(CaloClusterROI_SelectorCfg(flags))
+ kwargs.setdefault("useCaloSeeds", True)
+
acc.addEventAlgo(CompFactory.InDet.TRT_TrackSegmentsFinder( name = name, **kwargs))
return acc
@@ -161,7 +150,7 @@ def SegmentDriftCircleAssValidationCfg(flags, name="InDetSegmentDriftCircleAssVa
acc.addEventAlgo(InDetSegmentDriftCircleAssValidation)
return acc
-def TRTSegmentFindingCfg(flags, extension = "", InputCollections = None, BarrelSegments = None, doPhase = False):
+def TRTSegmentFindingCfg(flags, extension = "", InputCollections = None, BarrelSegments = None):
acc = ComponentAccumulator()
#
@@ -186,8 +175,7 @@ def TRTSegmentFindingCfg(flags, extension = "", InputCollections = None, BarrelS
name = 'InDetTRT_TrackSegmentsFinder'+extension,
extension =extension,
BarrelSegments=BarrelSegments,
- InputCollections = InputCollections,
- doPhase = doPhase))
+ InputCollections = InputCollections))
#
# --- load TRT validation alg
#
@@ -208,6 +196,9 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
flags.Input.Files=defaultTestFiles.RDO_RUN2
+ # disable calo for this test
+ flags.Detector.EnableCalo = False
+
numThreads=1
flags.Concurrency.NumThreads=numThreads
flags.Concurrency.NumConcurrentEvents=numThreads # Might change this later, but good enough for the moment.
@@ -226,9 +217,7 @@ if __name__ == "__main__":
if not flags.InDet.Tracking.doDBMstandalone:
from InDetConfig.TRTPreProcessing import TRTPreProcessingCfg
- top_acc.merge(TRTPreProcessingCfg(flags,
- useTimeInfo = not flags.InDet.Tracking.doTRTPhaseCalculation or flags.Beam.Type =="collisions",
- usePhase = False))
+ top_acc.merge(TRTPreProcessingCfg(flags))
top_acc.merge(TRTSegmentFindingCfg( flags,
extension = "",
diff --git a/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py b/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
index a43971bbe8f0dad3853e5a19634f45cd71a7a791..c8e22b9cd4418c8be7826a66a23779f63140c334 100644
--- a/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
@@ -217,7 +217,7 @@ if __name__ == "__main__":
############################# TRTPreProcessing configuration ############################
if not ConfigFlags.InDet.Tracking.doDBMstandalone:
from InDetConfig.TRTPreProcessing import TRTPreProcessingCfg
- top_acc.merge(TRTPreProcessingCfg(ConfigFlags,(not ConfigFlags.InDet.Tracking.doTRTPhaseCalculation or ConfigFlags.Beam.Type =="collisions"),False))
+ top_acc.merge(TRTPreProcessingCfg(ConfigFlags))
########################### TRTSegmentFindingCfg configuration ##########################
# NewTracking collection keys
InputCombinedInDetTracks = []
diff --git a/InnerDetector/InDetConfig/python/TrackRecoConfig.py b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
index 3f75e0fc39765c94a6d4663e3084efeac97fe9dd..7ab9d82b09b21e478858da4dfbbf0984c99afe8c 100644
--- a/InnerDetector/InDetConfig/python/TrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
@@ -453,8 +453,7 @@ def InDetTrackRecoCfg(flags):
result.merge(NewTrackingTRTExtensionCfg(current_flags,
SiTrackCollection = ResolvedTracks,
ExtendedTrackCollection = ExtendedTracks,
- ExtendedTracksMap = ExtendedTracksMap,
- doPhase=False))
+ ExtendedTracksMap = ExtendedTracksMap))
TrackContainer = ExtendedTracks
diff --git a/InnerDetector/InDetConfig/python/TrackTruthConfig.py b/InnerDetector/InDetConfig/python/TrackTruthConfig.py
index 68b0981c30c1738ea979f40af7bf57d7f6d50006..725cdd1b0309a799e55b9f901667765efdf4d1b5 100644
--- a/InnerDetector/InDetConfig/python/TrackTruthConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackTruthConfig.py
@@ -96,9 +96,7 @@ if __name__ == "__main__":
top_acc.merge(InDetRecPreProcessingSiliconCfg(ConfigFlags))
#################### TRTPreProcessing Configurations #####################
from InDetConfig.TRTPreProcessing import TRTPreProcessingCfg
- top_acc.merge(TRTPreProcessingCfg(ConfigFlags,
- useTimeInfo = not ConfigFlags.InDet.Tracking.doTRTPhaseCalculation or ConfigFlags.Beam.Type=="collisions",
- usePhase = False))
+ top_acc.merge(TRTPreProcessingCfg(ConfigFlags))
#//// TrackingSiPatternConfig configurations from Temporary location /////
################# SiSPSeededTrackFinder Configurations ###################
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
index 615fa9bb246e7272e42a0a96054e97238ac97fde..900b9703f18e6190b5111c578d694eaa7bbe8027 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
@@ -783,7 +783,7 @@ def TRTRIOMakerCfg(flags):
TRTRDOLocation = TRT_RDO_Key,
isRoI_Seeded = True,
RoIs = flags.InDet.Tracking.ActivePass.roi,
- TRT_DriftCircleTool = acc.getPrimaryAndMerge(TRT_DriftCircleToolCfg(flags, useTimeInfo=True, usePhase=False, prefix=prefix+"_", name=f"{prefix}_DriftCircleTool")))
+ TRT_DriftCircleTool = acc.getPrimaryAndMerge(TRT_DriftCircleToolCfg(flags, prefix=prefix+"_", name=f"{prefix}_DriftCircleTool")))
acc.addEventAlgo( alg )
return acc