diff --git a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py index b998946a8b0093b2f94da01fe49788b4139f14e2..8bf3cea58a55fa90c2965a72778c78aaf9ad9f56 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, + 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` @@ -326,10 +327,12 @@ def fit_and_select(inputTracks, fitted = declonned else: fitted = TrackEventFitter( + name="TrackEventFitter" + nameSuffix, TracksInContainer=declonned, Fitter=get_fitter_tool(MaxUpdateTransports=0)).TracksOutContainer best = TrackBestTrackCreator( + name="BestTrackCreator" + nameSuffix, 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, + nameSuffix="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, + 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"]] 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, + nameSuffix="Downstream") # this gives ~0.5% less downstream tracks wrt to number of downstream tracks from TrackBestTrackCreator(Long, Downstream) seed_reference_keys = ["BestLong", "BestDownstream"]