diff --git a/MooreOnlineConf/options/reco.py b/MooreOnlineConf/options/reco.py index c043a7dd562b9b8669e903e5036af3642589eaeb..41cf213f55641e643e6c420330acf8662e23f954 100644 --- a/MooreOnlineConf/options/reco.py +++ b/MooreOnlineConf/options/reco.py @@ -13,61 +13,10 @@ from Moore import options from Moore.config import run_allen_reconstruction from RecoConf.config import Reconstruction from RecoConf.standalone import reco_prefilters, standalone_hlt2_global_reco -from Hlt2Conf.settings.hlt2_binds import config_pp_2024_with_monitoring -from RecoConf.hlt1_allen import allen_gaudi_config -from RecoConf.legacy_rec_hlt1_tracking import make_RetinaCluster_raw_bank, make_velo_full_clusters, make_RetinaClusters +from Hlt2Conf.settings.hlt2_binds import config_pp_2025_with_monitoring from PyConf.Algorithms import VertexCompare - -from RecoConf.legacy_rec_hlt1_tracking import ( - make_reco_pvs, - make_PatPV3DFuture_pvs, - make_VeloClusterTrackingSIMD, -) -from RecoConf.hlt2_tracking import ( - make_PrKalmanFilter_noUT_tracks, - make_PrKalmanFilter_Seed_tracks, - make_PrKalmanFilter_Velo_tracks, - make_TrackBestTrackCreator_tracks, -) from MooreOnlineConf.utils import update_and_reset - -from Moore import options, run_moore -from RecoConf.global_tools import stateProvider_with_simplified_geom, trackMasterExtrapolator_with_simplified_geom -from RecoConf.reconstruction_objects import reconstruction -from RecoConf.hlt2_global_reco import reconstruction as hlt2_reconstruction, make_light_reco_pr_kf_without_UT -from RecoConf.hlt2_tracking import ( - make_TrackBestTrackCreator_tracks, - make_PrKalmanFilter_noUT_tracks, - make_PrKalmanFilter_Velo_tracks, - make_PrKalmanFilter_Seed_tracks, -) -from RecoConf.decoders import default_VeloCluster_source -from RecoConf.protoparticles import make_charged_protoparticles -from RecoConf.event_filters import require_gec -from Hlt2Conf.settings.defaults import get_default_hlt1_filter_code_for_hlt2 -from Moore.streams import Stream, Streams -from Hlt2Conf.lines.semileptonic import all_lines as full_lines # all full-stream lines -import sys -from DDDB.CheckDD4Hep import UseDD4Hep - -from Moore import options, run_moore -from RecoConf.global_tools import stateProvider_with_simplified_geom, trackMasterExtrapolator_with_simplified_geom -from RecoConf.reconstruction_objects import reconstruction -from RecoConf.hlt2_global_reco import reconstruction as hlt2_reconstruction, make_light_reco_pr_kf_without_UT -from RecoConf.hlt2_tracking import ( - make_TrackBestTrackCreator_tracks, - make_PrKalmanFilter_noUT_tracks, - make_PrKalmanFilter_Velo_tracks, - make_PrKalmanFilter_Seed_tracks, -) -from RecoConf.decoders import default_VeloCluster_source -from RecoConf.protoparticles import make_charged_protoparticles from RecoConf.event_filters import require_gec -from Hlt2Conf.settings.defaults import get_default_hlt1_filter_code_for_hlt2 -from Moore.streams import Stream, Streams -from Hlt2Conf.lines.semileptonic import all_lines as full_lines # all full-stream lines -import sys -from DDDB.CheckDD4Hep import UseDD4Hep task_type = os.getenv("TASK_TYPE", "GenericTask") @@ -130,7 +79,7 @@ def with_update_and_reset(): # NOTE the switch to retina clusters is done in vp_retina_clusters.py # the global event cut is added for the PbPb run case, in doubt remove for pp -with config_pp_2024_with_monitoring(), reco_prefilters.bind( +with config_pp_2025_with_monitoring(), reco_prefilters.bind( gec=False, gec_cut=GEC_cut, ),\