From 49294d82b3fd758e36f76fb92246d902e25463ce Mon Sep 17 00:00:00 2001 From: yuwen Date: Sun, 28 Aug 2022 22:32:17 +0200 Subject: [PATCH 1/4] added codes to allow modifying Xi2max value in preinclude --- .../python/TrigFastTrackFinder_Config.py | 7 ++++++- .../TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py index e35daf09d49..39af9a75c38 100755 --- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py +++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py @@ -372,6 +372,11 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder): nClustersMin = config.nClustersMin else: nClustersMin = TrackingCuts.minClusters() + + if config.Xi2max is not None: + Xi2max = config.Xi2max + else: + Xi2max = TrackingCuts.Xi2max() TrackMaker_FTF = InDet__SiTrackMaker_xk(name = 'InDetTrigSiTrackMaker_FTF_'+slice_name, RoadTool = InDetTrigSiDetElementsRoadMaker_FTF, @@ -381,7 +386,7 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder): nHolesMax = TrackingCuts.nHolesMax(), nHolesGapMax = TrackingCuts.nHolesGapMax(), SeedsFilterLevel = 0, # Do not use built-in seeds filter - Xi2max = TrackingCuts.Xi2max(), + Xi2max = Xi2max, Xi2maxNoAdd = TrackingCuts.Xi2maxNoAdd(), nWeightedClustersMin= TrackingCuts.nWeightedClustersMin(), Xi2maxMultiTracks = TrackingCuts.Xi2max(), diff --git a/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py b/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py index 89d14267d47..7b8b171c5e7 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py @@ -16,6 +16,7 @@ class _ConfigSettingsBase() : self._name = None self._suffix = None self._pTmin = 1.*GeV + self._Xi2max = 9.0 self._newConfig = True self._TripletDoPPS = True self._Triplet_D0Max = 4.0 @@ -137,6 +138,10 @@ class _ConfigSettingsBase() : def pTmin(self): return self._pTmin + @property + def Xi2max(self): + return self._Xi2max + @property def newConfig(self): return self._newConfig @@ -398,6 +403,7 @@ class _ConfigSettingsBase() : log.info( " %s :", self._name ) log.info( " %s :", self._input_name ) log.info( " pTmin : %s", self._pTmin ) + log.info( " Xi2max : %s", self._Xi2max ) log.info( " TripletDoPPS : %s", self._TripletDoPPS ) log.info( " Triplet_D0Max : %s", self._Triplet_D0Max ) log.info( " Triplet_D0_PPS_Max : %s", self._Triplet_D0_PPS_Max ) -- GitLab From 35ea4ade791a6e77da8e644b5876985a37109ae5 Mon Sep 17 00:00:00 2001 From: Ebony Zhang Date: Mon, 29 Aug 2022 00:13:00 +0200 Subject: [PATCH 2/4] Update ConfigSettingsBase.py to have self._Xi2max=None --- Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py b/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py index 7b8b171c5e7..8dadeeb7c76 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py @@ -16,7 +16,7 @@ class _ConfigSettingsBase() : self._name = None self._suffix = None self._pTmin = 1.*GeV - self._Xi2max = 9.0 + self._Xi2max = None self._newConfig = True self._TripletDoPPS = True self._Triplet_D0Max = 4.0 -- GitLab From 35a2a01846b92ea5a25fc9879093168e9c2c639e Mon Sep 17 00:00:00 2001 From: Ebony Zhang Date: Mon, 29 Aug 2022 11:25:07 +0200 Subject: [PATCH 3/4] Update TrigFastTrackFinder_Config.py to have Xi2maxMultiTracks = Xi2max --- .../TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py index 39af9a75c38..8a266fc3666 100755 --- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py +++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py @@ -389,7 +389,7 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder): Xi2max = Xi2max, Xi2maxNoAdd = TrackingCuts.Xi2maxNoAdd(), nWeightedClustersMin= TrackingCuts.nWeightedClustersMin(), - Xi2maxMultiTracks = TrackingCuts.Xi2max(), + Xi2maxMultiTracks = Xi2max, UseAssociationTool = False) from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags -- GitLab From 21bbf1c697376315ba73517d677e199f41eaaa70 Mon Sep 17 00:00:00 2001 From: Ebony Zhang Date: Mon, 29 Aug 2022 21:55:35 +0200 Subject: [PATCH 4/4] Update TrigTrackingPassFlags.py --- .../TrigInDetConfig/python/TrigTrackingPassFlags.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py index 7316b6f429e..766ab31f95e 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py @@ -13,10 +13,14 @@ def __flagsFromConfigSettings(settings): flags = createTrackingPassFlags() for setting, value in settings.__dict__.items(): setting = setting.lstrip("_") - if value is None: - flags.addFlag(setting, lambda pf: None) + if setting in flags._flagdict: + if value is not None: + flags._flagdict[setting] = value else: - flags.addFlag(setting, value) + if value is None: + flags.addFlag(setting, lambda pf: None) + else: + flags.addFlag(setting, value) flags.addFlag("trkTracks_FTF", f'HLT_IDTrkTrack_{flags.suffix}_FTF') flags.addFlag("tracks_FTF", f'HLT_IDTrack_{flags.suffix}_FTF') -- GitLab