From 188dfa434ffb398437587488029efbe475979bc6 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Sat, 20 Feb 2021 10:17:02 +0000 Subject: [PATCH 1/2] Add track type context to instance names --- Hlt/RecoConf/python/RecoConf/hlt2_tracking.py | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py index b998946a8b0..00999188797 100644 --- a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py +++ b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py @@ -312,7 +312,8 @@ def fit_and_select(inputTracks, referenceTracks=None, get_fitter_tool=get_track_master_fitter, get_ghost_tool=get_UpgradeGhostId_tool, - do_not_refit=False): + do_not_refit=False, + trackType=""): """Perform the fit and selection of tracks: 1. Clone killing with respect to `referenceTracks` containers of (preferably) fitted tracks 2. Fit declonned container using `TrackEventFitter` @@ -326,10 +327,12 @@ def fit_and_select(inputTracks, fitted = declonned else: fitted = TrackEventFitter( + name="TrackEventFitter" + trackType, TracksInContainer=declonned, Fitter=get_fitter_tool(MaxUpdateTransports=0)).TracksOutContainer best = TrackBestTrackCreator( + name="BestTrackCreator" + trackType, TracksInContainers=[fitted], GhostIdTool=get_ghost_tool(), DoNotRefit=True, @@ -408,12 +411,15 @@ def make_light_reco_best_tracks( selector = LoKiTrackSelector(Code=fit_preselection) for trType in track_list: splitter = TrackContainerSplitter( - TracksInContainer=input_tracks[trType], Selector=selector) + name="TrackContainerSplitter" + trType, + TracksInContainer=input_tracks[trType], + Selector=selector) selected_tracks[trType] = splitter.PassedContainer dictTracks["Soft" + trType] = splitter.RejectedContainer tracks_to_merge = [dictTracks["SoftForward"], dictTracks["SoftMatch"]] dictTracks["SoftLong"] = TrackContainersMerger( + name="TrackContainersMergerSoftLong", InputLocations=tracks_to_merge).OutputLocation else: selected_tracks = { @@ -422,21 +428,26 @@ def make_light_reco_best_tracks( } dictTracks["BestForward"] = fit_and_select( - inputTracks=selected_tracks["Forward"], do_not_refit=do_not_refit) + inputTracks=selected_tracks["Forward"], + do_not_refit=do_not_refit, + trackType="Forward") dictTracks["BestMatch"] = fit_and_select( inputTracks=selected_tracks["Match"], referenceTracks=[dictTracks["BestForward"]], - do_not_refit=do_not_refit) + do_not_refit=do_not_refit, + trackType="Match") # all of these gives a very tiny more ~0.01% long tracks wrt to number of long tracks from TrackBestTrackCreator(Match, Forward) tracks_to_merge = [dictTracks["BestMatch"], dictTracks["BestForward"]] dictTracks["BestLong"] = TrackContainersMerger( + name="TrackContainersMergerLong", InputLocations=tracks_to_merge).OutputLocation dictTracks["BestDownstream"] = fit_and_select( inputTracks=selected_tracks["Downstream"], referenceTracks=[dictTracks["BestLong"]], - do_not_refit=do_not_refit) + do_not_refit=do_not_refit, + trackType="Downstream") # this gives ~0.5% less downstream tracks wrt to number of downstream tracks from TrackBestTrackCreator(Long, Downstream) seed_reference_keys = ["BestLong", "BestDownstream"] -- GitLab From 7755118982a55abb6d99e9763eca61c33343d526 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Sat, 20 Feb 2021 14:11:55 +0000 Subject: [PATCH 2/2] rename trackType nameSuffix --- Hlt/RecoConf/python/RecoConf/hlt2_tracking.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py index 00999188797..8bf3cea58a5 100644 --- a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py +++ b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py @@ -313,7 +313,7 @@ def fit_and_select(inputTracks, get_fitter_tool=get_track_master_fitter, get_ghost_tool=get_UpgradeGhostId_tool, do_not_refit=False, - trackType=""): + nameSuffix=""): """Perform the fit and selection of tracks: 1. Clone killing with respect to `referenceTracks` containers of (preferably) fitted tracks 2. Fit declonned container using `TrackEventFitter` @@ -327,12 +327,12 @@ def fit_and_select(inputTracks, fitted = declonned else: fitted = TrackEventFitter( - name="TrackEventFitter" + trackType, + name="TrackEventFitter" + nameSuffix, TracksInContainer=declonned, Fitter=get_fitter_tool(MaxUpdateTransports=0)).TracksOutContainer best = TrackBestTrackCreator( - name="BestTrackCreator" + trackType, + name="BestTrackCreator" + nameSuffix, TracksInContainers=[fitted], GhostIdTool=get_ghost_tool(), DoNotRefit=True, @@ -430,13 +430,13 @@ def make_light_reco_best_tracks( dictTracks["BestForward"] = fit_and_select( inputTracks=selected_tracks["Forward"], do_not_refit=do_not_refit, - trackType="Forward") + nameSuffix="Forward") dictTracks["BestMatch"] = fit_and_select( inputTracks=selected_tracks["Match"], referenceTracks=[dictTracks["BestForward"]], do_not_refit=do_not_refit, - trackType="Match") + nameSuffix="Match") # all of these gives a very tiny more ~0.01% long tracks wrt to number of long tracks from TrackBestTrackCreator(Match, Forward) tracks_to_merge = [dictTracks["BestMatch"], dictTracks["BestForward"]] @@ -447,7 +447,7 @@ def make_light_reco_best_tracks( inputTracks=selected_tracks["Downstream"], referenceTracks=[dictTracks["BestLong"]], do_not_refit=do_not_refit, - trackType="Downstream") + nameSuffix="Downstream") # this gives ~0.5% less downstream tracks wrt to number of downstream tracks from TrackBestTrackCreator(Long, Downstream) seed_reference_keys = ["BestLong", "BestDownstream"] -- GitLab