diff --git a/Event/xAOD/xAODTrackingCnv/python/xAODTrackingCnvConfig.py b/Event/xAOD/xAODTrackingCnv/python/xAODTrackingCnvConfig.py index 9bbbf1f2ecca21c090fe63e3cf28c7bdaa75dcb2..04178604d0900515830e326792a66bcaafe6be46 100644 --- a/Event/xAOD/xAODTrackingCnv/python/xAODTrackingCnvConfig.py +++ b/Event/xAOD/xAODTrackingCnv/python/xAODTrackingCnvConfig.py @@ -191,9 +191,11 @@ def TrigTrackParticleCnvAlgCfg(flags, name="TrigTrackParticleCnvAlg", flags, TrackParticleCreator = kwargs["TrackParticleCreator"]))) - - if flags.Tracking.perigeeExpression == "Vertex": + #temporarily - move base methods to ActiveConfig + if flags.Tracking.ActiveConfig.perigeeExpression == "Vertex": kwargs.setdefault("PrimaryVerticesName", "PrimaryVertices") + else: + kwargs.setdefault("PrimaryVerticesName", "") result.merge(TrackParticleCnvAlgCfg(flags, name, ClusterSplitProbabilityName, diff --git a/InnerDetector/InDetConfig/python/SiSPSeededTrackFinderConfig.py b/InnerDetector/InDetConfig/python/SiSPSeededTrackFinderConfig.py index e0b269fba35772da9695f5df3def8dd88fd256cc..f48dfcde799883c6725c301b61c52194b6bfd90d 100644 --- a/InnerDetector/InDetConfig/python/SiSPSeededTrackFinderConfig.py +++ b/InnerDetector/InDetConfig/python/SiSPSeededTrackFinderConfig.py @@ -90,7 +90,7 @@ def TrigSiSPSeededTrackFinderCfg(flags, name="InDetTrigSiSpTrackFinder", **kwarg TrigSiSpacePointsSeedMakerCfg(flags))) # Heavy-ion config (TODO the steering for the trigger) - kwargs.setdefault("useMBTSTimeDiff", flags.Reco.EnableHI) + kwargs.setdefault("useMBTSTimeDiff", False) kwargs.setdefault("useZvertexTool", False) kwargs.setdefault("useZBoundFinding", flags.Tracking.ActiveConfig.doZBoundary) diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py index 19bf8c83527cca1317d97735e0f0608688ad1939..717a8d7b4eff70db479c76ac3f16193b56f32080 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py @@ -44,7 +44,7 @@ def signatureSpecificSettingOfFlags(flags,mode): flags.nWeightedClustersMin= [6] flags.seedFilterLevel = 0 - + if flags.isLRT: flags.minClusters = 8 if mode=="InDet" else [8] flags.nHolesGapMax = 1 if mode=="InDet" else [1] @@ -118,7 +118,8 @@ def signatureSpecificSettingOfFlags(flags,mode): flags.addFlag("trtExtensionType", "xf") flags.addFlag("doBremRecovery", False) #setTrue for electron once validated flags.addFlag("doTruth", False) - + flags.addFlag("perigeeExpression","BeamLine") #always use beamline regardless of Reco.EnableHI + def createTrigTrackingPassFlags(mode="InDet"): def __flagsFromConfigSettings(settings, mode): if mode == "InDet":