From d3fe62827be05c3ba9ee48a7555d1acd9a50b62f Mon Sep 17 00:00:00 2001 From: thboettc Date: Thu, 2 Feb 2023 17:23:09 -0500 Subject: [PATCH 1/3] Remove GaudiAllenSeedAndMatchNoUTToV2Tracks --- Hlt/RecoConf/python/RecoConf/hlt1_allen.py | 27 ++++------------------ 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/hlt1_allen.py b/Hlt/RecoConf/python/RecoConf/hlt1_allen.py index efce1697f9a..8a0ab33ade7 100644 --- a/Hlt/RecoConf/python/RecoConf/hlt1_allen.py +++ b/Hlt/RecoConf/python/RecoConf/hlt1_allen.py @@ -268,7 +268,7 @@ def make_allen_seed_and_match_tracks_no_ut(): Configures the adaptor between the seed and match tracks reconstructed in Allen and Gaudi-LHCb tracks. """ - from PyConf.Algorithms import GaudiAllenSeedAndMatchNoUTToV2Tracks + from PyConf.Algorithms import GaudiAllenForwardToV2Tracks allen_gaudi_node() # Configure Allen sequence and apply bindings @@ -276,28 +276,9 @@ def make_allen_seed_and_match_tracks_no_ut(): allen_reco = hlt1_reconstruction( tracking_type=TrackingType.MATCHING, with_ut=False) - # Velo reconstruction - velo_tracks = allen_reco["velo_tracks"] - # SciFi reconstruction - seed_tracks = allen_reco["seeding_tracks"] - seed_and_match_tracks = allen_reco["long_tracks"] - # Kalman forward output - kalman_velo_only = allen_reco["kalman_velo_only"] - - seed_and_match_tracks_v2 = GaudiAllenSeedAndMatchNoUTToV2Tracks( - offsets_all_velo_tracks=velo_tracks["dev_offsets_all_velo_tracks"], - offsets_velo_track_hit_number=velo_tracks[ - "dev_offsets_velo_track_hit_number"], - velo_track_hits=velo_tracks["dev_velo_track_hits"], - atomics_scifi=seed_and_match_tracks["dev_offsets_long_tracks"], - scifi_track_hit_number=seed_and_match_tracks[ - "dev_offsets_scifi_track_hit_number"], - scifi_track_hits=seed_and_match_tracks["dev_scifi_track_hits"], - scifi_track_velo_indices=seed_and_match_tracks[ - "dev_scifi_track_ut_indices"], # sic: see comment in AllenConf/matching_reconstruction.py: naming convention same as in forward so that hlt1 sequence works - scifi_qop=seed_tracks["dev_seeding_qop"], - scifi_states=seed_and_match_tracks["dev_scifi_states"], - kf_tracks=kalman_velo_only["dev_kf_tracks"]).OutputTracks + seed_and_match_tracks_v2 = GaudiAllenForwardToV2Tracks( + allen_tracks_mec=allen_reco['long_track_particles'] + ['dev_multi_event_basic_particles']).OutputTracks seed_and_match_tracks_v1 = FromV2TrackV1Track( InputTracksName=seed_and_match_tracks_v2).OutputTracksName -- GitLab From 1b9d091a7d43c9aa6e6dea5721410aac1c22c8ef Mon Sep 17 00:00:00 2001 From: thboettc Date: Thu, 2 Feb 2023 18:30:46 -0500 Subject: [PATCH 2/3] Use views in GaudiAllen UT track converter --- Hlt/RecoConf/python/RecoConf/hlt1_allen.py | 28 +++++++--------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/hlt1_allen.py b/Hlt/RecoConf/python/RecoConf/hlt1_allen.py index 8a0ab33ade7..0d3e8415393 100644 --- a/Hlt/RecoConf/python/RecoConf/hlt1_allen.py +++ b/Hlt/RecoConf/python/RecoConf/hlt1_allen.py @@ -169,11 +169,8 @@ def make_allen_velo_tracks(): velo_states = allen_reco['velo_states'] velo_tracks_v2 = GaudiAllenVeloToV2Tracks( - AllenVeloTrackOffsets=velo_tracks["dev_offsets_all_velo_tracks"], - AllenVeloTrackHitOffsets=velo_tracks[ - "dev_offsets_velo_track_hit_number"], - AllenVeloTrackHits=velo_tracks["dev_velo_track_hits"], - AllenVeloKalmanStates=velo_states["dev_velo_kalman_beamline_states"] + allen_velo_tracks_mec=velo_tracks["dev_imec_velo_tracks"], + allen_velo_states_view=velo_states["dev_velo_kalman_beamline_states_view"] ).OutputTracks velo_tracks_v1 = FromV2TrackV1Track( @@ -201,25 +198,16 @@ def make_allen_velo_ut_tracks(): allen_reco = hlt1_reconstruction() # Velo reconstruction - velo_tracks = allen_reco["velo_tracks"] velo_states = allen_reco["velo_states"] # UT reconstruction ut_tracks = allen_reco["ut_tracks"] - ut_tracks_v2 = GaudiAllenUTToV2Tracks( - offsets_all_velo_tracks=velo_tracks["dev_offsets_all_velo_tracks"], - offsets_velo_track_hit_number=velo_tracks[ - "dev_offsets_velo_track_hit_number"], - velo_track_hits=velo_tracks["dev_velo_track_hits"], - velo_kalman_beamline_states=velo_states[ - "dev_velo_kalman_beamline_states"], - velo_kalman_endvelo_states=velo_states[ - "dev_velo_kalman_endvelo_states"], - atomics_ut=ut_tracks["dev_offsets_ut_tracks"], - ut_track_hit_number=ut_tracks["dev_offsets_ut_track_hit_number"], - ut_qop=ut_tracks["dev_ut_qop"], - ut_track_velo_indices=ut_tracks["dev_ut_track_velo_indices"], - ut_track_hits=ut_tracks["dev_ut_track_hits"], + ut_tracks_v2 = GaudiAllenUTToV2Tracks( + allen_ut_tracks_mec=ut_tracks["dev_imec_ut_tracks"], + allen_beamline_states_view=velo_states[ + "dev_velo_kalman_beamline_states_view"], + allen_endvelo_states_view=velo_states[ + "dev_velo_kalman_endvelo_states_view"] ).OutputTracks ut_tracks_v1 = FromV2TrackV1Track( -- GitLab From 0949574516a6a388b5e01c7e39d9df2c79c96f41 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Thu, 2 Feb 2023 23:38:12 +0000 Subject: [PATCH 3/3] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/27312073 --- Hlt/RecoConf/python/RecoConf/hlt1_allen.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/hlt1_allen.py b/Hlt/RecoConf/python/RecoConf/hlt1_allen.py index 0d3e8415393..68588e3ab6e 100644 --- a/Hlt/RecoConf/python/RecoConf/hlt1_allen.py +++ b/Hlt/RecoConf/python/RecoConf/hlt1_allen.py @@ -170,8 +170,8 @@ def make_allen_velo_tracks(): velo_tracks_v2 = GaudiAllenVeloToV2Tracks( allen_velo_tracks_mec=velo_tracks["dev_imec_velo_tracks"], - allen_velo_states_view=velo_states["dev_velo_kalman_beamline_states_view"] - ).OutputTracks + allen_velo_states_view=velo_states[ + "dev_velo_kalman_beamline_states_view"]).OutputTracks velo_tracks_v1 = FromV2TrackV1Track( InputTracksName=velo_tracks_v2).OutputTracksName @@ -202,13 +202,12 @@ def make_allen_velo_ut_tracks(): # UT reconstruction ut_tracks = allen_reco["ut_tracks"] - ut_tracks_v2 = GaudiAllenUTToV2Tracks( + ut_tracks_v2 = GaudiAllenUTToV2Tracks( allen_ut_tracks_mec=ut_tracks["dev_imec_ut_tracks"], allen_beamline_states_view=velo_states[ "dev_velo_kalman_beamline_states_view"], allen_endvelo_states_view=velo_states[ - "dev_velo_kalman_endvelo_states_view"] - ).OutputTracks + "dev_velo_kalman_endvelo_states_view"]).OutputTracks ut_tracks_v1 = FromV2TrackV1Track( InputTracksName=ut_tracks_v2).OutputTracksName -- GitLab