From e284cb3821aa3ce759b6bcad06042ed2b0ff9f47 Mon Sep 17 00:00:00 2001 From: cprouve Date: Wed, 13 Dec 2023 17:41:01 +0100 Subject: [PATCH 1/2] adjust the flavourtagging algo names to the new names --- ...flavour_taggers_on_example_b2jpsik_lines.py | 18 +++++++++--------- ...skaon_tagger_on_example_bs2jpsiphi_lines.py | 6 +++--- .../rd/builders/flavour_tagging_particles.py | 18 +++++++++--------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_flavour_taggers_on_example_b2jpsik_lines.py b/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_flavour_taggers_on_example_b2jpsik_lines.py index e8f57b0bfcd..c7015f98a3c 100644 --- a/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_flavour_taggers_on_example_b2jpsik_lines.py +++ b/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_flavour_taggers_on_example_b2jpsik_lines.py @@ -37,9 +37,9 @@ from Hlt2Conf.flavourTagging import ( make_oppositeside_tagging_muons) from PyConf.Algorithms import ( - FunctionalSSPionTagger, FunctionalSSProtonTagger, FunctionalOSKaonTagger, - FunctionalOSElectronTagger, FunctionalOSMuonTagger, - FunctionalOSVertexChargeTagger, FlavourTagsMerger) + Run2SSPionTagger, Run2SSProtonTagger, Run2OSKaonTagger, + Run2OSElectronTagger, Run2OSMuonTagger, + Run2OSVertexChargeTagger, FlavourTagsMerger) default_ft_decoding_version.global_bind(value=6) @@ -126,29 +126,29 @@ def b2jpsik_with_flavourtagging(b2jpsik, name): ssPions = noUT_sameside_tagging_pions() # ssPions = make_sameside_tagging_pions() - ssPionTagging = FunctionalSSPionTagger( + ssPionTagging = Run2SSPionTagger( BCandidates=b2jpsik, TaggingPions=ssPions, PrimaryVertices=pvs) ssProtons = noUT_sameside_tagging_protons() # ssProtons = make_sameside_tagging_protons() - ssProtonTagging = FunctionalSSProtonTagger( + ssProtonTagging = Run2SSProtonTagger( BCandidates=b2jpsik, TaggingProtons=ssProtons, PrimaryVertices=pvs) osKaons = make_oppositeside_tagging_kaons() - osKaonTagging = FunctionalOSKaonTagger( + osKaonTagging = Run2OSKaonTagger( BCandidates=b2jpsik, TaggingKaons=osKaons, PrimaryVertices=pvs) osElectrons = make_oppositeside_tagging_electrons() - osElectronTagging = FunctionalOSElectronTagger( + osElectronTagging = Run2OSElectronTagger( BCandidates=b2jpsik, TaggingElectrons=osElectrons, PrimaryVertices=pvs) osMuons = make_oppositeside_tagging_muons() - osMuonTagging = FunctionalOSMuonTagger( + osMuonTagging = Run2OSMuonTagger( BCandidates=b2jpsik, TaggingMuons=osMuons, PrimaryVertices=pvs) osVertexParticles = noUT_oppositeside_vertex_charge_tagging_particles() # osVertexParticles = make_oppositeside_vertex_charge_tagging_particles() - osVertexChargeTagging = FunctionalOSVertexChargeTagger( + osVertexChargeTagging = Run2OSVertexChargeTagger( BCandidates=b2jpsik, TaggingParticles=osVertexParticles, PrimaryVertices=pvs) diff --git a/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_sskaon_tagger_on_example_bs2jpsiphi_lines.py b/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_sskaon_tagger_on_example_bs2jpsiphi_lines.py index 71397154292..009e31620f3 100644 --- a/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_sskaon_tagger_on_example_bs2jpsiphi_lines.py +++ b/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_sskaon_tagger_on_example_bs2jpsiphi_lines.py @@ -29,7 +29,7 @@ from Hlt2Conf.lines.bandq.builders import b_hadrons from Hlt2Conf.lines import charmonium_to_dimuon # from Hlt2Conf.flavourTagging import make_sameside_tagging_kaons -from PyConf.Algorithms import FunctionalSSKaonTagger +from PyConf.Algorithms import Run2SSKaonTagger default_ft_decoding_version.global_bind(value=6) @@ -67,7 +67,7 @@ def default_bs2jpsiphi_line_with_flavourtagging(): ssKaons = noUT_sameside_tagging_kaons() # ssKaons = make_sameside_tagging_kaons() - ssKaonTagging = FunctionalSSKaonTagger( + ssKaonTagging = Run2SSKaonTagger( BCandidates=bs2jpsiphi, TaggingKaons=ssKaons, PrimaryVertices=pvs) return Hlt2Line( @@ -90,7 +90,7 @@ def modified_bs2jpsiphi_line_with_flavourtagging(): ssKaons = noUT_sameside_tagging_kaons() # ssKaons = make_sameside_tagging_kaons() - ssKaonTagging = FunctionalSSKaonTagger( + ssKaonTagging = Run2SSKaonTagger( BCandidates=bs2jpsiphi, TaggingKaons=ssKaons, PrimaryVertices=pvs) return Hlt2Line( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/flavour_tagging_particles.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/flavour_tagging_particles.py index 75f6e5dd944..059f2513d58 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/flavour_tagging_particles.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/flavour_tagging_particles.py @@ -20,9 +20,9 @@ from Hlt2Conf.flavourTagging import ( make_oppositeside_tagging_electrons, make_oppositeside_tagging_muons) from PyConf.Algorithms import ( - FunctionalSSPionTagger, FunctionalSSProtonTagger, FunctionalOSKaonTagger, - FunctionalOSElectronTagger, FunctionalOSMuonTagger, - FunctionalOSVertexChargeTagger, FlavourTagsMerger) + Run2SSPionTagger, Run2SSProtonTagger, Run2OSKaonTagger, + Run2OSElectronTagger, Run2OSMuonTagger, + Run2OSVertexChargeTagger, FlavourTagsMerger) from RecoConf.reconstruction_objects import make_pvs from GaudiKernel.SystemOfUnits import GeV import Functors as F @@ -103,31 +103,31 @@ def noUT_oppositeside_vertex_charge_tagging_particles(pvs=make_pvs, def extra_outputs_for_FlavourTagging_ForSprucing(BCandidates, pvs): ssPions = noUT_sameside_tagging_pions() # ssPions = make_sameside_tagging_pions() - ssPionTagging = FunctionalSSPionTagger( + ssPionTagging = Run2SSPionTagger( BCandidates=BCandidates, TaggingPions=ssPions, PrimaryVertices=pvs) ssProtons = noUT_sameside_tagging_protons() # ssProtons = make_sameside_tagging_protons() - ssProtonTagging = FunctionalSSProtonTagger( + ssProtonTagging = Run2SSProtonTagger( BCandidates=BCandidates, TaggingProtons=ssProtons, PrimaryVertices=pvs) osKaons = make_oppositeside_tagging_kaons() - osKaonTagging = FunctionalOSKaonTagger( + osKaonTagging = Run2OSKaonTagger( BCandidates=BCandidates, TaggingKaons=osKaons, PrimaryVertices=pvs) osElectrons = make_oppositeside_tagging_electrons() - osElectronTagging = FunctionalOSElectronTagger( + osElectronTagging = Run2OSElectronTagger( BCandidates=BCandidates, TaggingElectrons=osElectrons, PrimaryVertices=pvs) osMuons = make_oppositeside_tagging_muons() - osMuonTagging = FunctionalOSMuonTagger( + osMuonTagging = Run2OSMuonTagger( BCandidates=BCandidates, TaggingMuons=osMuons, PrimaryVertices=pvs) osVertexParticles = noUT_oppositeside_vertex_charge_tagging_particles() # osVertexParticles = make_oppositeside_vertex_charge_tagging_particles() - osVertexChargeTagging = FunctionalOSVertexChargeTagger( + osVertexChargeTagging = Run2OSVertexChargeTagger( BCandidates=BCandidates, TaggingParticles=osVertexParticles, PrimaryVertices=pvs) -- GitLab From e30e7b13c2d2ce940be1fd5e67367ee412bd0d46 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Wed, 7 Feb 2024 09:57:27 +0000 Subject: [PATCH 2/2] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/35895634 --- .../hlt2_flavour_taggers_on_example_b2jpsik_lines.py | 8 ++++---- .../lines/rd/builders/flavour_tagging_particles.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_flavour_taggers_on_example_b2jpsik_lines.py b/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_flavour_taggers_on_example_b2jpsik_lines.py index 6760748d867..be56851f9e9 100644 --- a/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_flavour_taggers_on_example_b2jpsik_lines.py +++ b/Hlt/Hlt2Conf/options/FlavourTagging/hlt2_flavour_taggers_on_example_b2jpsik_lines.py @@ -36,10 +36,10 @@ from Hlt2Conf.flavourTagging import ( make_oppositeside_tagging_electrons, make_oppositeside_tagging_muons) -from PyConf.Algorithms import ( - Run2SSPionTagger, Run2SSProtonTagger, Run2OSKaonTagger, - Run2OSElectronTagger, Run2OSMuonTagger, - Run2OSVertexChargeTagger, FlavourTagsMerger) +from PyConf.Algorithms import (Run2SSPionTagger, Run2SSProtonTagger, + Run2OSKaonTagger, Run2OSElectronTagger, + Run2OSMuonTagger, Run2OSVertexChargeTagger, + FlavourTagsMerger) default_ft_decoding_version.global_bind(value=6) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/flavour_tagging_particles.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/flavour_tagging_particles.py index 059f2513d58..b83ff795aec 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/flavour_tagging_particles.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/flavour_tagging_particles.py @@ -19,10 +19,10 @@ from Hlt2Conf.flavourTagging import ( make_oppositeside_tagging_kaons, make_oppositeside_tagging_electrons, make_oppositeside_tagging_muons) -from PyConf.Algorithms import ( - Run2SSPionTagger, Run2SSProtonTagger, Run2OSKaonTagger, - Run2OSElectronTagger, Run2OSMuonTagger, - Run2OSVertexChargeTagger, FlavourTagsMerger) +from PyConf.Algorithms import (Run2SSPionTagger, Run2SSProtonTagger, + Run2OSKaonTagger, Run2OSElectronTagger, + Run2OSMuonTagger, Run2OSVertexChargeTagger, + FlavourTagsMerger) from RecoConf.reconstruction_objects import make_pvs from GaudiKernel.SystemOfUnits import GeV import Functors as F -- GitLab