From 57122437d69020e93c923154b2be1d5a3d2109a1 Mon Sep 17 00:00:00 2001 From: Francesca Date: Thu, 7 Nov 2024 19:30:08 +0000 Subject: [PATCH 01/28] Separate RelTables isolation method --- Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py | 18 ++ .../lines/bnoc/builders/bnoc_isolation.py | 184 +++++++++++++++++- .../python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py | 7 + .../python/Hlt2Conf/lines/bnoc/utils.py | 4 +- 4 files changed, 211 insertions(+), 2 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py index 0a0a72b7344..f3c2e266d50 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py @@ -12,6 +12,7 @@ # Central isolation algorithm from PyConf import configurable from PyConf.Algorithms import SelectionFromRelationTable, WeightedRelTableAlg +from PyConf.Algorithms import LHCb__Phys__RelationTables__FunctorsToRelTable as FunctorsToRelTable @configurable @@ -35,3 +36,20 @@ def extra_outputs_for_isolation(name, ref_particles, extra_particles, selection) extra_outputs = [(name, selection_to_persist.OutputLocation)] return extra_outputs + +@configurable +def extra_outputs_for_relinfo_isolation(name, ref_particles, extra_particles, selection, mom_functors, part_functors): + + FunctorsRelTableAlg = FunctorsToRelTable( + name = f"{name}_FunctorsRelTable", + InputCandidates=ref_particles, + InputOtherTracks=extra_particles, + Cut=selection, + ThreeMomFunctors=mom_functors, + ParticleFunctors=part_functors, + ) + + extra_outputs = [(name, FunctorsRelTableAlg.OutputLocation)] + + return extra_outputs + diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index c1c059dc0ae..8e29943f6e5 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -20,7 +20,7 @@ from RecoConf.standard_particles import ( make_up_pions, ) -from Hlt2Conf.isolation import extra_outputs_for_isolation +from Hlt2Conf.isolation import extra_outputs_for_isolation, extra_outputs_for_relinfo_isolation @configurable @@ -127,3 +127,185 @@ def make_iso_particles( ) return iso_parts + + +@configurable +def make_reltable_for_cone_isolation( + names=[], + candidates=[], + cut=(F.SQRT @ F.DR2 < 1.5), + LongTrackIso=True, + TTrackIso=False, + DownstreamTrackIso=False, + UpstreamTrackIso=False, + NeutralIso=True, + PiZerosIso=False, +): + """ + Add to the extra_outputs different kind of isolations by properly setting the given flag + Args: + names: List of names for reference particles and label for coneangle + candidates: List of containers of reference particles to relate extra particles + cut: Predicate to select extra tracks used in computation of isolation information for a given table + LongTrackIso: Boolean value to make isolation with long tracks + TTrackIso: Boolean value to make isolation with tt tracks + DownstreamTrackIso: Boolean value to make isolation with downstream tracks + UpstreamTrackIso: Boolean value to make isolation with upstream tracks + NeutralIso: Boolean value to make isolation with neutral particles + PiZerosIso: Boolean value to make isolation with merged pi0 -> gamma gamma + """ + extra_outputs = [] + assert ( + len(names) == len(candidates) + ), 'Different number of names and candidate containers for particle isolation!' + + three_mom_functors = [ + F.CONE_ASYM(F.X_COORDINATE), + F.CONE_ASYM(F.Y_COORDINATE), + F.CONE_ASYM(F.Z_COORDINATE), + F.CONE_ASYM(F.MAGNITUDE), + F.CONE_ASYM(F.RHO_COORDINATE), + F.CONE_DELTA(F.ETA_COORDINATE), + F.CONE_DELTA(F.PHI_COORDINATE), + ] + part_functors = [F.CONE_MULT(),] + + mom_functor_dict = {} + for mom_functor in three_mom_functors : + mom_functor_dict[ F.RelatedInfo_Functor_Index[mom_functor.code()] ] = mom_functor + + part_functor_dict = {} + for part_functor in part_functors : + part_functor_dict[ F.RelatedInfo_Functor_Index[part_functor.code()] ] = part_functor + + for name, cand in zip(names, candidates): + if LongTrackIso: + extra_outputs += extra_outputs_for_relinfo_isolation( + name=name + "_LongTrackIsolation", + extra_particles=make_long_pions(), + ref_particles=cand, + selection=cut, + mom_functors=mom_functor_dict, + part_functors=part_functor_dict,) + if TTrackIso: + extra_outputs += extra_outputs_for_relinfo_isolation( + name=name + "_TTrackIsolation", + extra_particles=make_ttrack_pions(), + ref_particles=cand, + selection=cut, + mom_functors=mom_functor_dict, + part_functors=part_functor_dict,) + if DownstreamTrackIso: + extra_outputs += extra_outputs_for_relinfo_isolation( + name=name + "_DownstreamTrackIsolation", + extra_particles=make_down_pions(), + ref_particles=cand, + selection=cut, + mom_functors=mom_functor_dict, + part_functors=part_functor_dict,) + if UpstreamTrackIso: + extra_outputs += extra_outputs_for_relinfo_isolation( + name=name + "_UpstreamTrackIsolation", + extra_particles=make_up_pions(), + ref_particles=cand, + selection=cut, + mom_functors=mom_functor_dict, + part_functors=part_functor_dict,) + if NeutralIso: + extra_outputs += extra_outputs_for_relinfo_isolation( + name=name + "_NeutralIsolation", + extra_particles=make_photons(), + ref_particles=cand, + selection=cut, + mom_functors=mom_functor_dict, + part_functors=part_functor_dict,) + if PiZerosIso: + extra_outputs += extra_outputs_for_relinfo_isolation( + name=name + "_PiZerosIsolation", + extra_particles=make_merged_pi0s(), + ref_particles=cand, + selection=cut, + mom_functors=mom_functor_dict, + part_functors=part_functor_dict,) + return extra_outputs + +@configurable +def make_reltable_for_vertex_isolation( + names=[], + candidates=[], + cut=(F.SQRT @ F.DR2 < 1.5), +): + """ + Add to the extra_outputs different kind of isolations by properly setting the given flag + Args: + names: List of names for reference particles and label for coneangle + candidates: List of containers of reference particles to relate extra particles + cut: Predicate to select extra tracks used in computation of isolation information for a given table + """ + extra_outputs = [] + assert ( + len(names) == len(candidates) + ), 'Different number of names and candidate containers for particle isolation!' + + part_functors = [F.SMALLEST_DELTACHI2()] + + part_functor_dict = {} + for part_functor in part_functors : + part_functor_dict[ F.RelatedInfo_Functor_Index[part_functor.code()] ] = part_functor + + for name, cand in zip(names, candidates): + + extra_outputs += extra_outputs_for_relinfo_isolation( + name=name + "_VertexIsolation", + extra_particles=make_long_pions(), + ref_particles=cand, + selection=cut, + mom_functors={}, + part_functors=part_functor_dict,) + + return extra_outputs + +@configurable +def make_iso_reltables(line_alg, + name='B', + coneangles=[1.0], + VertexIso=True, + LongTrackIso=True, + TTrackIso=False, + DownstreamTrackIso=False, + UpstreamTrackIso=True, + NeutralIso=True, + PiZerosIso=False): + + candidate = line_alg + + reltables = [] + + if coneangles: + for coneangle in coneangles: + cut = ((F.SQRT @ F.DR2 < coneangle) & ~F.FIND_IN_TREE()) + + cone_reltable = make_reltable_for_cone_isolation( + names=[name+f"_DeltaR_{str(coneangle)[0]}{str(coneangle)[-1]}"], + candidates=[candidate], + cut=cut, + LongTrackIso=LongTrackIso, + TTrackIso=TTrackIso, + DownstreamTrackIso=DownstreamTrackIso, + UpstreamTrackIso=UpstreamTrackIso, + NeutralIso=NeutralIso, + PiZerosIso=PiZerosIso, + ) + + reltables+=cone_reltable + + if VertexIso: + cut = (~F.FIND_IN_TREE()) + vertex_reltable = make_reltable_for_vertex_isolation( + names=[name], + candidates=[candidate], + cut=cut, + ) + reltables+=vertex_reltable + + return reltables \ No newline at end of file diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py index 62af85bdc00..c7d4791c0b5 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py @@ -674,6 +674,13 @@ isolation_lines = { "BdsToPhiPhi": { "flavour_tagging": True, "pv_tracks": True, + 'reltables_kwargs': { + 'name': 'B0', + 'coneangles': [1.0, 1.5], + 'VertexIso': True, + 'NeutralIso': True, + 'PiZerosIso': True, + }, "iso_kwargs": { "name": "B0", "coneangle": 1.0, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/utils.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/utils.py index bd4d74bd0c7..bfe43c34d54 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/utils.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/utils.py @@ -23,7 +23,7 @@ from Moore.lines import Hlt2Line, SpruceLine from PyConf.utilities import ConfigurationError from Hlt2Conf.lines.bnoc.builders.basic_builder import Topo_prefilter_extra_outputs -from Hlt2Conf.lines.bnoc.builders.bnoc_isolation import make_iso_particles +from Hlt2Conf.lines.bnoc.builders.bnoc_isolation import make_iso_particles, make_iso_reltables from Hlt2Conf.lines.bnoc.prefilters import bnoc_prefilters @@ -276,6 +276,8 @@ def make_generic_line( ) if iso_kwargs is not None: extra_outputs += make_iso_particles(line_alg[-1], **iso_kwargs) + if reltables_kwargs is not None: + extra_outputs += make_iso_reltables(line_alg[-1], **reltables_kwargs) return Line( name=name, -- GitLab From 698e31b21391e52afc2a5ee6cc3dc312e33cb016 Mon Sep 17 00:00:00 2001 From: Francesca Date: Sun, 17 Nov 2024 20:25:51 +0000 Subject: [PATCH 02/28] Update functor naming --- .../Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index 8e29943f6e5..b963d5c7bbc 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -160,13 +160,13 @@ def make_reltable_for_cone_isolation( ), 'Different number of names and candidate containers for particle isolation!' three_mom_functors = [ - F.CONE_ASYM(F.X_COORDINATE), - F.CONE_ASYM(F.Y_COORDINATE), - F.CONE_ASYM(F.Z_COORDINATE), - F.CONE_ASYM(F.MAGNITUDE), - F.CONE_ASYM(F.RHO_COORDINATE), - F.CONE_DELTA(F.ETA_COORDINATE), - F.CONE_DELTA(F.PHI_COORDINATE), + F.CONE_ASYM_PX(), + F.CONE_ASYM_PY(), + F.CONE_ASYM_PZ(), + F.CONE_ASYM_P(), + F.CONE_ASYM_PT(), + F.CONE_DELTA_ETA(), + F.CONE_DELTA_PHI(), ] part_functors = [F.CONE_MULT(),] -- GitLab From 7eba49490a585f7024ee94c5eed1f79158334a05 Mon Sep 17 00:00:00 2001 From: Francesca Date: Mon, 18 Nov 2024 13:16:31 +0000 Subject: [PATCH 03/28] Update to make isolation variables more configurable --- .../lines/bnoc/builders/bnoc_isolation.py | 32 ++++++++++++------- .../python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py | 2 ++ 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index b963d5c7bbc..09f0cc78367 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -140,6 +140,8 @@ def make_reltable_for_cone_isolation( UpstreamTrackIso=False, NeutralIso=True, PiZerosIso=False, + wantConeAsym = False, + wantConeDelta = False, ): """ Add to the extra_outputs different kind of isolations by properly setting the given flag @@ -159,16 +161,20 @@ def make_reltable_for_cone_isolation( len(names) == len(candidates) ), 'Different number of names and candidate containers for particle isolation!' - three_mom_functors = [ - F.CONE_ASYM_PX(), - F.CONE_ASYM_PY(), - F.CONE_ASYM_PZ(), - F.CONE_ASYM_P(), - F.CONE_ASYM_PT(), - F.CONE_DELTA_ETA(), - F.CONE_DELTA_PHI(), - ] - part_functors = [F.CONE_MULT(),] + three_mom_functors = [] + if wantConeAsym: + three_mom_functors += [ + F.CONE_ASYM_PX(), + F.CONE_ASYM_PY(), + F.CONE_ASYM_PZ(), + F.CONE_ASYM_P(), + F.CONE_ASYM_PT(), + ] + if wantConeDelta: + three_mom_functors += [F.CONE_DELTA_ETA(), + F.CONE_DELTA_PHI(),] + + part_functors = [F.CONE_MULT()] mom_functor_dict = {} for mom_functor in three_mom_functors : @@ -275,7 +281,9 @@ def make_iso_reltables(line_alg, DownstreamTrackIso=False, UpstreamTrackIso=True, NeutralIso=True, - PiZerosIso=False): + PiZerosIso=False, + wantConeAsym=False, + wantConeDelta=False): candidate = line_alg @@ -295,6 +303,8 @@ def make_iso_reltables(line_alg, UpstreamTrackIso=UpstreamTrackIso, NeutralIso=NeutralIso, PiZerosIso=PiZerosIso, + wantConeAsym=wantConeAsym, + wantConeDelta=wantConeDelta ) reltables+=cone_reltable diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py index c7d4791c0b5..200047ba3f0 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py @@ -680,6 +680,8 @@ isolation_lines = { 'VertexIso': True, 'NeutralIso': True, 'PiZerosIso': True, + 'wantConeAsym': True, + 'wantConeDelta': True, }, "iso_kwargs": { "name": "B0", -- GitLab From 04f7318f586a858307179f5fd57125e4d81b8deb Mon Sep 17 00:00:00 2001 From: Francesca Date: Mon, 18 Nov 2024 14:31:28 +0000 Subject: [PATCH 04/28] Put all isolation option defaults to False --- .../Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py | 12 ++++++------ Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index 09f0cc78367..fabc236f1a7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -134,11 +134,11 @@ def make_reltable_for_cone_isolation( names=[], candidates=[], cut=(F.SQRT @ F.DR2 < 1.5), - LongTrackIso=True, + LongTrackIso=False, TTrackIso=False, DownstreamTrackIso=False, UpstreamTrackIso=False, - NeutralIso=True, + NeutralIso=False, PiZerosIso=False, wantConeAsym = False, wantConeDelta = False, @@ -275,12 +275,12 @@ def make_reltable_for_vertex_isolation( def make_iso_reltables(line_alg, name='B', coneangles=[1.0], - VertexIso=True, - LongTrackIso=True, + VertexIso=False, + LongTrackIso=False, TTrackIso=False, DownstreamTrackIso=False, - UpstreamTrackIso=True, - NeutralIso=True, + UpstreamTrackIso=False, + NeutralIso=False, PiZerosIso=False, wantConeAsym=False, wantConeDelta=False): diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py index 200047ba3f0..ef15a2a96ce 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py @@ -678,8 +678,8 @@ isolation_lines = { 'name': 'B0', 'coneangles': [1.0, 1.5], 'VertexIso': True, + 'LongTrackIso':True, 'NeutralIso': True, - 'PiZerosIso': True, 'wantConeAsym': True, 'wantConeDelta': True, }, -- GitLab From e99a24d5a49c5d9671580f0663e916990f82ad9e Mon Sep 17 00:00:00 2001 From: Francesca Date: Tue, 28 Jan 2025 11:31:32 +0000 Subject: [PATCH 05/28] Update Moore isolation branch --- Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py | 1 - .../lines/bnoc/builders/bnoc_isolation.py | 11 +++++++++++ .../python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py | 16 ++++++++-------- Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/utils.py | 2 ++ 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py index f3c2e266d50..1890f3ebc6c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py @@ -41,7 +41,6 @@ def extra_outputs_for_isolation(name, ref_particles, extra_particles, selection) def extra_outputs_for_relinfo_isolation(name, ref_particles, extra_particles, selection, mom_functors, part_functors): FunctorsRelTableAlg = FunctorsToRelTable( - name = f"{name}_FunctorsRelTable", InputCandidates=ref_particles, InputOtherTracks=extra_particles, Cut=selection, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index fabc236f1a7..9f3f0a89774 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -155,6 +155,8 @@ def make_reltable_for_cone_isolation( UpstreamTrackIso: Boolean value to make isolation with upstream tracks NeutralIso: Boolean value to make isolation with neutral particles PiZerosIso: Boolean value to make isolation with merged pi0 -> gamma gamma + wantConeAsym: Boolean value to compute cone asymmetry variables additionally + wantConeDelta: Boolean value to compute cone delta variables additionally """ extra_outputs = [] assert ( @@ -162,6 +164,15 @@ def make_reltable_for_cone_isolation( ), 'Different number of names and candidate containers for particle isolation!' three_mom_functors = [] + + three_mom_functors += [ + F.CONE_PX(), + F.CONE_PY(), + F.CONE_PZ(), + F.CONE_P(), + F.CONE_PT(), + ] + if wantConeAsym: three_mom_functors += [ F.CONE_ASYM_PX(), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py index ef15a2a96ce..a3b3422db13 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py @@ -674,14 +674,14 @@ isolation_lines = { "BdsToPhiPhi": { "flavour_tagging": True, "pv_tracks": True, - 'reltables_kwargs': { - 'name': 'B0', - 'coneangles': [1.0, 1.5], - 'VertexIso': True, - 'LongTrackIso':True, - 'NeutralIso': True, - 'wantConeAsym': True, - 'wantConeDelta': True, + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso":True, + "NeutralIso": True, + "wantConeAsym": True, + "wantConeDelta": True, }, "iso_kwargs": { "name": "B0", diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/utils.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/utils.py index bfe43c34d54..0c0ca16b8e7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/utils.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/utils.py @@ -185,6 +185,7 @@ def make_generic_line( min_twobody_mva=0.1, min_threebody_mva=0.1, iso_kwargs=None, + reltables_kwargs=None, spruce_hlt2_filters=None, **kwargs, ): @@ -211,6 +212,7 @@ def make_generic_line( and not require_GEC and not require_topo and iso_kwargs is None + and reltables_kwargs is None ): @register_line_builder(line_dict) -- GitLab From 0b8ec5eee64dd4858a2a3d650ae8c1750dd070ba Mon Sep 17 00:00:00 2001 From: Francesca Date: Fri, 31 Jan 2025 15:09:13 +0000 Subject: [PATCH 06/28] Update naming of SMALLEST_DELTACHI2 to SMALLEST_REF_ENDVERTEX_IPCHI2 --- .../python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index 9f3f0a89774..32fad09dd2f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -264,7 +264,7 @@ def make_reltable_for_vertex_isolation( len(names) == len(candidates) ), 'Different number of names and candidate containers for particle isolation!' - part_functors = [F.SMALLEST_DELTACHI2()] + part_functors = [F.SMALLEST_REF_ENDVERTEX_IPCHI2()] part_functor_dict = {} for part_functor in part_functors : -- GitLab From 053fd2449f90f163a6a84c44a50a98b5f76cd583 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Mon, 3 Feb 2025 12:27:42 +0000 Subject: [PATCH 07/28] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/50328890 --- Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py | 25 +-- .../lines/bnoc/builders/bnoc_isolation.py | 178 ++++++++++-------- .../python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py | 2 +- .../python/Hlt2Conf/lines/bnoc/utils.py | 5 +- 4 files changed, 117 insertions(+), 93 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py index 1890f3ebc6c..9814d66d16b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py @@ -11,8 +11,10 @@ # Central isolation algorithm from PyConf import configurable +from PyConf.Algorithms import ( + LHCb__Phys__RelationTables__FunctorsToRelTable as FunctorsToRelTable, +) from PyConf.Algorithms import SelectionFromRelationTable, WeightedRelTableAlg -from PyConf.Algorithms import LHCb__Phys__RelationTables__FunctorsToRelTable as FunctorsToRelTable @configurable @@ -37,18 +39,19 @@ def extra_outputs_for_isolation(name, ref_particles, extra_particles, selection) return extra_outputs + @configurable -def extra_outputs_for_relinfo_isolation(name, ref_particles, extra_particles, selection, mom_functors, part_functors): - +def extra_outputs_for_relinfo_isolation( + name, ref_particles, extra_particles, selection, mom_functors, part_functors +): FunctorsRelTableAlg = FunctorsToRelTable( - InputCandidates=ref_particles, - InputOtherTracks=extra_particles, - Cut=selection, - ThreeMomFunctors=mom_functors, - ParticleFunctors=part_functors, - ) + InputCandidates=ref_particles, + InputOtherTracks=extra_particles, + Cut=selection, + ThreeMomFunctors=mom_functors, + ParticleFunctors=part_functors, + ) extra_outputs = [(name, FunctorsRelTableAlg.OutputLocation)] - - return extra_outputs + return extra_outputs diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index 32fad09dd2f..6cd21ad2fda 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -20,7 +20,10 @@ from RecoConf.standard_particles import ( make_up_pions, ) -from Hlt2Conf.isolation import extra_outputs_for_isolation, extra_outputs_for_relinfo_isolation +from Hlt2Conf.isolation import ( + extra_outputs_for_isolation, + extra_outputs_for_relinfo_isolation, +) @configurable @@ -131,20 +134,20 @@ def make_iso_particles( @configurable def make_reltable_for_cone_isolation( - names=[], - candidates=[], - cut=(F.SQRT @ F.DR2 < 1.5), - LongTrackIso=False, - TTrackIso=False, - DownstreamTrackIso=False, - UpstreamTrackIso=False, - NeutralIso=False, - PiZerosIso=False, - wantConeAsym = False, - wantConeDelta = False, + names=[], + candidates=[], + cut=(F.SQRT @ F.DR2 < 1.5), + LongTrackIso=False, + TTrackIso=False, + DownstreamTrackIso=False, + UpstreamTrackIso=False, + NeutralIso=False, + PiZerosIso=False, + wantConeAsym=False, + wantConeDelta=False, ): """ - Add to the extra_outputs different kind of isolations by properly setting the given flag + Add to the extra_outputs different kind of isolations by properly setting the given flag Args: names: List of names for reference particles and label for coneangle candidates: List of containers of reference particles to relate extra particles @@ -159,10 +162,10 @@ def make_reltable_for_cone_isolation( wantConeDelta: Boolean value to compute cone delta variables additionally """ extra_outputs = [] - assert ( - len(names) == len(candidates) - ), 'Different number of names and candidate containers for particle isolation!' - + assert len(names) == len(candidates), ( + "Different number of names and candidate containers for particle isolation!" + ) + three_mom_functors = [] three_mom_functors += [ @@ -170,30 +173,34 @@ def make_reltable_for_cone_isolation( F.CONE_PY(), F.CONE_PZ(), F.CONE_P(), - F.CONE_PT(), + F.CONE_PT(), ] if wantConeAsym: - three_mom_functors += [ - F.CONE_ASYM_PX(), - F.CONE_ASYM_PY(), - F.CONE_ASYM_PZ(), - F.CONE_ASYM_P(), - F.CONE_ASYM_PT(), - ] + three_mom_functors += [ + F.CONE_ASYM_PX(), + F.CONE_ASYM_PY(), + F.CONE_ASYM_PZ(), + F.CONE_ASYM_P(), + F.CONE_ASYM_PT(), + ] if wantConeDelta: - three_mom_functors += [F.CONE_DELTA_ETA(), - F.CONE_DELTA_PHI(),] - + three_mom_functors += [ + F.CONE_DELTA_ETA(), + F.CONE_DELTA_PHI(), + ] + part_functors = [F.CONE_MULT()] - + mom_functor_dict = {} - for mom_functor in three_mom_functors : - mom_functor_dict[ F.RelatedInfo_Functor_Index[mom_functor.code()] ] = mom_functor + for mom_functor in three_mom_functors: + mom_functor_dict[F.RelatedInfo_Functor_Index[mom_functor.code()]] = mom_functor part_functor_dict = {} - for part_functor in part_functors : - part_functor_dict[ F.RelatedInfo_Functor_Index[part_functor.code()] ] = part_functor + for part_functor in part_functors: + part_functor_dict[F.RelatedInfo_Functor_Index[part_functor.code()]] = ( + part_functor + ) for name, cand in zip(names, candidates): if LongTrackIso: @@ -203,7 +210,8 @@ def make_reltable_for_cone_isolation( ref_particles=cand, selection=cut, mom_functors=mom_functor_dict, - part_functors=part_functor_dict,) + part_functors=part_functor_dict, + ) if TTrackIso: extra_outputs += extra_outputs_for_relinfo_isolation( name=name + "_TTrackIsolation", @@ -211,7 +219,8 @@ def make_reltable_for_cone_isolation( ref_particles=cand, selection=cut, mom_functors=mom_functor_dict, - part_functors=part_functor_dict,) + part_functors=part_functor_dict, + ) if DownstreamTrackIso: extra_outputs += extra_outputs_for_relinfo_isolation( name=name + "_DownstreamTrackIsolation", @@ -219,7 +228,8 @@ def make_reltable_for_cone_isolation( ref_particles=cand, selection=cut, mom_functors=mom_functor_dict, - part_functors=part_functor_dict,) + part_functors=part_functor_dict, + ) if UpstreamTrackIso: extra_outputs += extra_outputs_for_relinfo_isolation( name=name + "_UpstreamTrackIsolation", @@ -227,7 +237,8 @@ def make_reltable_for_cone_isolation( ref_particles=cand, selection=cut, mom_functors=mom_functor_dict, - part_functors=part_functor_dict,) + part_functors=part_functor_dict, + ) if NeutralIso: extra_outputs += extra_outputs_for_relinfo_isolation( name=name + "_NeutralIsolation", @@ -235,7 +246,8 @@ def make_reltable_for_cone_isolation( ref_particles=cand, selection=cut, mom_functors=mom_functor_dict, - part_functors=part_functor_dict,) + part_functors=part_functor_dict, + ) if PiZerosIso: extra_outputs += extra_outputs_for_relinfo_isolation( name=name + "_PiZerosIsolation", @@ -243,69 +255,75 @@ def make_reltable_for_cone_isolation( ref_particles=cand, selection=cut, mom_functors=mom_functor_dict, - part_functors=part_functor_dict,) + part_functors=part_functor_dict, + ) return extra_outputs + @configurable def make_reltable_for_vertex_isolation( - names=[], - candidates=[], - cut=(F.SQRT @ F.DR2 < 1.5), + names=[], + candidates=[], + cut=(F.SQRT @ F.DR2 < 1.5), ): """ - Add to the extra_outputs different kind of isolations by properly setting the given flag + Add to the extra_outputs different kind of isolations by properly setting the given flag Args: names: List of names for reference particles and label for coneangle candidates: List of containers of reference particles to relate extra particles cut: Predicate to select extra tracks used in computation of isolation information for a given table """ extra_outputs = [] - assert ( - len(names) == len(candidates) - ), 'Different number of names and candidate containers for particle isolation!' - + assert len(names) == len(candidates), ( + "Different number of names and candidate containers for particle isolation!" + ) + part_functors = [F.SMALLEST_REF_ENDVERTEX_IPCHI2()] - + part_functor_dict = {} - for part_functor in part_functors : - part_functor_dict[ F.RelatedInfo_Functor_Index[part_functor.code()] ] = part_functor + for part_functor in part_functors: + part_functor_dict[F.RelatedInfo_Functor_Index[part_functor.code()]] = ( + part_functor + ) for name, cand in zip(names, candidates): - extra_outputs += extra_outputs_for_relinfo_isolation( name=name + "_VertexIsolation", extra_particles=make_long_pions(), ref_particles=cand, selection=cut, mom_functors={}, - part_functors=part_functor_dict,) + part_functors=part_functor_dict, + ) return extra_outputs -@configurable -def make_iso_reltables(line_alg, - name='B', - coneangles=[1.0], - VertexIso=False, - LongTrackIso=False, - TTrackIso=False, - DownstreamTrackIso=False, - UpstreamTrackIso=False, - NeutralIso=False, - PiZerosIso=False, - wantConeAsym=False, - wantConeDelta=False): +@configurable +def make_iso_reltables( + line_alg, + name="B", + coneangles=[1.0], + VertexIso=False, + LongTrackIso=False, + TTrackIso=False, + DownstreamTrackIso=False, + UpstreamTrackIso=False, + NeutralIso=False, + PiZerosIso=False, + wantConeAsym=False, + wantConeDelta=False, +): candidate = line_alg - + reltables = [] - + if coneangles: for coneangle in coneangles: - cut = ((F.SQRT @ F.DR2 < coneangle) & ~F.FIND_IN_TREE()) + cut = (F.SQRT @ F.DR2 < coneangle) & ~F.FIND_IN_TREE() cone_reltable = make_reltable_for_cone_isolation( - names=[name+f"_DeltaR_{str(coneangle)[0]}{str(coneangle)[-1]}"], + names=[name + f"_DeltaR_{str(coneangle)[0]}{str(coneangle)[-1]}"], candidates=[candidate], cut=cut, LongTrackIso=LongTrackIso, @@ -315,18 +333,18 @@ def make_iso_reltables(line_alg, NeutralIso=NeutralIso, PiZerosIso=PiZerosIso, wantConeAsym=wantConeAsym, - wantConeDelta=wantConeDelta + wantConeDelta=wantConeDelta, ) - - reltables+=cone_reltable - + + reltables += cone_reltable + if VertexIso: - cut = (~F.FIND_IN_TREE()) - vertex_reltable = make_reltable_for_vertex_isolation( - names=[name], - candidates=[candidate], - cut=cut, + cut = ~F.FIND_IN_TREE() + vertex_reltable = make_reltable_for_vertex_isolation( + names=[name], + candidates=[candidate], + cut=cut, ) - reltables+=vertex_reltable + reltables += vertex_reltable - return reltables \ No newline at end of file + return reltables diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py index a3b3422db13..7801b595ede 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py @@ -678,7 +678,7 @@ isolation_lines = { "name": "B0", "coneangles": [1.0, 1.5], "VertexIso": True, - "LongTrackIso":True, + "LongTrackIso": True, "NeutralIso": True, "wantConeAsym": True, "wantConeDelta": True, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/utils.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/utils.py index 0c0ca16b8e7..2c633dc352f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/utils.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/utils.py @@ -23,7 +23,10 @@ from Moore.lines import Hlt2Line, SpruceLine from PyConf.utilities import ConfigurationError from Hlt2Conf.lines.bnoc.builders.basic_builder import Topo_prefilter_extra_outputs -from Hlt2Conf.lines.bnoc.builders.bnoc_isolation import make_iso_particles, make_iso_reltables +from Hlt2Conf.lines.bnoc.builders.bnoc_isolation import ( + make_iso_particles, + make_iso_reltables, +) from Hlt2Conf.lines.bnoc.prefilters import bnoc_prefilters -- GitLab From 51ad39bcb2986d617349ec483706d9973c400bc2 Mon Sep 17 00:00:00 2001 From: Francesca Date: Wed, 5 Feb 2025 18:50:49 +0000 Subject: [PATCH 08/28] Add integrationtest option file --- .../lhcbintegrationtests_options_isolation.py | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Hlt/Moore/python/Moore/tests/lhcbintegrationtests_options_isolation.py diff --git a/Hlt/Moore/python/Moore/tests/lhcbintegrationtests_options_isolation.py b/Hlt/Moore/python/Moore/tests/lhcbintegrationtests_options_isolation.py new file mode 100644 index 00000000000..1a1ec0fa6a7 --- /dev/null +++ b/Hlt/Moore/python/Moore/tests/lhcbintegrationtests_options_isolation.py @@ -0,0 +1,36 @@ +############################################################################### +# (c) Copyright 2025 CERN for the benefit of the LHCb Collaboration # +# # +# This software is distributed under the terms of the GNU General Public # +# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". # +# # +# In applying this licence, CERN does not waive the privileges and immunities # +# granted to it by virtue of its status as an Intergovernmental Organization # +# or submit itself to any jurisdiction. # +############################################################################### +from Hlt2Conf.lines.bnoc import all_lines +from Moore import Options, run_moore +from RecoConf.reconstruction_objects import reconstruction +from Hlt2Conf.settings.defaults import get_default_hlt1_filter_code_for_hlt2 + +from RecoConf.global_tools import ( + stateProvider_with_simplified_geom, + trackMasterExtrapolator_with_simplified_geom, +) + +def main(options: Options): + + test_lines = ["BdsToPhiPhi"] + + def make_lines(): + lines = [all_lines["Hlt2BnoC_"+hlt2_line_name]() for hlt2_line_name in test_lines] + + return lines + + public_tools = [ + trackMasterExtrapolator_with_simplified_geom(), + stateProvider_with_simplified_geom(), + ] + with reconstruction.bind(from_file=False), get_default_hlt1_filter_code_for_hlt2.bind( + code=""): + return run_moore(options, make_lines, public_tools) -- GitLab From 394a1d1e27362e6cbf10c6bcbcdd68bd262fcf53 Mon Sep 17 00:00:00 2001 From: Francesca Date: Fri, 21 Feb 2025 14:10:43 +0000 Subject: [PATCH 09/28] Quick fix to reltables naming --- .../python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index 6cd21ad2fda..dcc92bffab7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -323,7 +323,7 @@ def make_iso_reltables( cut = (F.SQRT @ F.DR2 < coneangle) & ~F.FIND_IN_TREE() cone_reltable = make_reltable_for_cone_isolation( - names=[name + f"_DeltaR_{str(coneangle)[0]}{str(coneangle)[-1]}"], + names=[name + f"_DeltaR_{str(coneangle).replace('.', '')}"], candidates=[candidate], cut=cut, LongTrackIso=LongTrackIso, -- GitLab From b121bda6eb72f044d00b1f1eaa5661129f7cd99a Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Fri, 21 Feb 2025 14:11:41 +0000 Subject: [PATCH 10/28] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/51475819 --- .../lhcbintegrationtests_options_isolation.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Hlt/Moore/python/Moore/tests/lhcbintegrationtests_options_isolation.py b/Hlt/Moore/python/Moore/tests/lhcbintegrationtests_options_isolation.py index 1a1ec0fa6a7..829e752fe0c 100644 --- a/Hlt/Moore/python/Moore/tests/lhcbintegrationtests_options_isolation.py +++ b/Hlt/Moore/python/Moore/tests/lhcbintegrationtests_options_isolation.py @@ -9,21 +9,22 @@ # or submit itself to any jurisdiction. # ############################################################################### from Hlt2Conf.lines.bnoc import all_lines -from Moore import Options, run_moore -from RecoConf.reconstruction_objects import reconstruction from Hlt2Conf.settings.defaults import get_default_hlt1_filter_code_for_hlt2 - +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 -def main(options: Options): +def main(options: Options): test_lines = ["BdsToPhiPhi"] def make_lines(): - lines = [all_lines["Hlt2BnoC_"+hlt2_line_name]() for hlt2_line_name in test_lines] + lines = [ + all_lines["Hlt2BnoC_" + hlt2_line_name]() for hlt2_line_name in test_lines + ] return lines @@ -31,6 +32,8 @@ def main(options: Options): trackMasterExtrapolator_with_simplified_geom(), stateProvider_with_simplified_geom(), ] - with reconstruction.bind(from_file=False), get_default_hlt1_filter_code_for_hlt2.bind( - code=""): + with ( + reconstruction.bind(from_file=False), + get_default_hlt1_filter_code_for_hlt2.bind(code=""), + ): return run_moore(options, make_lines, public_tools) -- GitLab From b383bce70f51e3fbfb6a53b4340c07914c1ef11d Mon Sep 17 00:00:00 2001 From: mmonk Date: Thu, 6 Mar 2025 15:23:24 +0000 Subject: [PATCH 11/28] Restore persistancy for non-particles in Turbo spruce pass --- Hlt/Moore/python/Moore/lines.py | 31 +++++++++++++++++++--------- Hlt/Moore/python/Moore/production.py | 2 +- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Hlt/Moore/python/Moore/lines.py b/Hlt/Moore/python/Moore/lines.py index 05e5440fcc2..628a20d107c 100644 --- a/Hlt/Moore/python/Moore/lines.py +++ b/Hlt/Moore/python/Moore/lines.py @@ -496,12 +496,14 @@ class Hlt2Line(DecisionLine): # this line made a positive decision self.objects_to_persist = [] if self.produces_output: - output_node, self.objects_to_persist = self._output_node( - self.node, - self.output_producer, - self.extra_outputs, - self.persistreco, - self.tagging_particles, + output_node, self.objects_to_persist, self.extra_output_locations = ( + self._output_node( + self.node, + self.output_producer, + self.extra_outputs, + self.persistreco, + self.tagging_particles, + ) ) # Wrap the decision and output nodes if output_node is not None: @@ -548,9 +550,13 @@ class Hlt2Line(DecisionLine): extra_outputs.append(tuple(entry_new)) is_output_producer = True if self.output_producer else False + extra_output_locs = [ + (loc[0], *locs) + for loc, locs in zip(self.extra_outputs, self.extra_output_locations) + ] return { "name": self.name, - "extra_outputs": extra_outputs, + "extra_outputs": extra_output_locs, "persistreco": self.persistreco, "tagging_particles": self.tagging_particles, "calo_digits": self.calo_digits, @@ -608,7 +614,7 @@ class Hlt2Line(DecisionLine): ) ) - algs, objects_to_persist = Hlt2Line._line_outputs( + algs, objects_to_persist, extra_output_locations = Hlt2Line._line_outputs( main_output, additional_outputs, persistreco, tagging_particles ) # Algorithms already in the decision CF don't need to be in the @@ -629,7 +635,7 @@ class Hlt2Line(DecisionLine): else: output_node = None - return output_node, objects_to_persist + return output_node, objects_to_persist, extra_output_locations @staticmethod def _line_outputs( @@ -681,6 +687,7 @@ class Hlt2Line(DecisionLine): from .persistence.particle_moving import ( copy_to_final_location, + get_final_location, is_particle_producer, particle_output, ) @@ -692,6 +699,7 @@ class Hlt2Line(DecisionLine): rec_summary = reco["RecSummary"] algs = [] objects_to_persist = [] + extra_output_locations = [] main_output, main_location_components = main_output_location main_producer = _producer(main_output) @@ -727,6 +735,9 @@ class Hlt2Line(DecisionLine): ) ) else: + extra_output_locations.append( + get_final_location(output, location_components) + ) mover = copy_to_final_location(output, location_components) if mover: algs.append(mover) @@ -761,7 +772,7 @@ class Hlt2Line(DecisionLine): algs.append(rec_summary) objects_to_persist.append(rec_summary) - return algs, objects_to_persist + return algs, objects_to_persist, extra_output_locations class SpruceLine(Hlt2Line): diff --git a/Hlt/Moore/python/Moore/production.py b/Hlt/Moore/python/Moore/production.py index b2afe531c50..cc003ec7b3f 100644 --- a/Hlt/Moore/python/Moore/production.py +++ b/Hlt/Moore/python/Moore/production.py @@ -612,7 +612,7 @@ def _make_pass_spruceline(line_attributes, custom_prescales={}): Returns: SpruceLine: The SpruceLine with the attributes of the matching Hlt2Line. """ - from PyConf.reading import get_particles, upfront_decoder + from PyConf.reading import _get_unpacked, get_particles, upfront_decoder linename = line_attributes["name"] filter = f"{linename}Decision" -- GitLab From ec98352362ec2ee15798fd83cb75e30c615ac8d9 Mon Sep 17 00:00:00 2001 From: Francesca Date: Thu, 6 Mar 2025 15:45:57 +0000 Subject: [PATCH 12/28] Update BnoC Isolation book-keeping --- .../lines/bnoc/builders/bnoc_isolation.py | 59 ++- .../python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py | 466 ++++++++++++++---- .../python/Hlt2Conf/lines/bnoc/spruce_bnoc.py | 417 +++++++++++----- 3 files changed, 716 insertions(+), 226 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index dcc92bffab7..11f17b44f2c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -143,8 +143,14 @@ def make_reltable_for_cone_isolation( UpstreamTrackIso=False, NeutralIso=False, PiZerosIso=False, - wantConeAsym=False, - wantConeDelta=False, + wantConeDeltaEta=False, + wantConeDeltaPhi=False, + wantConeP=False, + wantConePT=False, + wantConeThreeMom=False, + wantConePAsym=False, + wantConePTAsym=False, + wantConeThreeMomAsym=False, ): """ Add to the extra_outputs different kind of isolations by properly setting the given flag @@ -167,28 +173,27 @@ def make_reltable_for_cone_isolation( ) three_mom_functors = [] - - three_mom_functors += [ + + if wantConeThreeMom: + three_mom_functors += [ F.CONE_PX(), F.CONE_PY(), - F.CONE_PZ(), - F.CONE_P(), - F.CONE_PT(), - ] - - if wantConeAsym: + F.CONE_PZ(),] + + if wantConeDeltaEta: three_mom_functors += [F.CONE_DELTA_ETA()] + if wantConeDeltaPhi: three_mom_functors += [F.CONE_DELTA_PHI()] + + if wantConePAsym: three_mom_functors += [F.CONE_ASYM_P()] + if wantConePTAsym: three_mom_functors += [F.CONE_ASYM_PT()] + if wantConeThreeMomAsym: three_mom_functors += [ F.CONE_ASYM_PX(), F.CONE_ASYM_PY(), F.CONE_ASYM_PZ(), - F.CONE_ASYM_P(), - F.CONE_ASYM_PT(), - ] - if wantConeDelta: - three_mom_functors += [ - F.CONE_DELTA_ETA(), - F.CONE_DELTA_PHI(), ] + + if wantConeP: three_mom_functors += [F.CONE_P()] + if wantConePT: three_mom_functors += [F.CONE_PT()] part_functors = [F.CONE_MULT()] @@ -311,8 +316,14 @@ def make_iso_reltables( UpstreamTrackIso=False, NeutralIso=False, PiZerosIso=False, - wantConeAsym=False, - wantConeDelta=False, + wantConeDeltaEta=False, + wantConeDeltaPhi=False, + wantConeP=False, + wantConePT=False, + wantConeThreeMom=False, + wantConePAsym=False, + wantConePTAsym=False, + wantConeThreeMomAsym=False, ): candidate = line_alg @@ -332,8 +343,14 @@ def make_iso_reltables( UpstreamTrackIso=UpstreamTrackIso, NeutralIso=NeutralIso, PiZerosIso=PiZerosIso, - wantConeAsym=wantConeAsym, - wantConeDelta=wantConeDelta, + wantConeDeltaEta=wantConeDeltaEta, + wantConeDeltaPhi=wantConeDeltaPhi, + wantConeP=wantConeP, + wantConePT=wantConePT, + wantConeThreeMom=wantConeThreeMom, + wantConePAsym=wantConePAsym, + wantConePTAsym=wantConePTAsym, + wantConeThreeMomAsym=wantConeThreeMomAsym, ) reltables += cone_reltable diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py index 7801b595ede..f84c6d94f62 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py @@ -146,12 +146,6 @@ default_lines = [ "BuToPpPpDeutm", "BuToPpPpPmPmKp", "BuToPpPpPmPmPip", - "Lb0ToL0KmPip_DD", - "Lb0ToL0KmPip_LL", - "Lb0ToL0KpKm_DD", - "Lb0ToL0KpKm_LL", - "Lb0ToL0KpPim_DD", - "Lb0ToL0KpPim_LL", "Lb0ToL0KS_DDDD", "Lb0ToL0KS_DDLL", "Lb0ToL0KS_LLDD", @@ -290,16 +284,6 @@ default_lines = [ # Lines with applied prescale prescale_lines = { - "BdsToKstzPhi_FakeKstDouble": {"prescale": 0.1}, - "BdsToKstzPhi_FakeKstK": {"prescale": 0.1}, - "BdsToKstzPhi_FakeKstPi": {"prescale": 0.1}, - "BdsToKstzPhi_FakePhiDouble": {"prescale": 0.1}, - "BdsToKstzPhi_FakePhiK": {"prescale": 0.1}, - "BdsToKstzRho_FakeKstDouble": {"prescale": 0.1}, - "BdsToKstzRho_FakeKstK": {"prescale": 0.1}, - "BdsToKstzRho_FakeKstPi": {"prescale": 0.1}, - "BdsToKstzRho_FakeRhoDouble": {"prescale": 0.1}, - "BdsToKstzRho_FakeRhoPi": {"prescale": 0.1}, "BuToPpPpDeutm_SS": {"prescale": 0.1}, } @@ -480,19 +464,8 @@ flavour_tagging_lines = { # 0.1 that all the below lines currently use (see # flavour_tagging_gec_topo_lines for examples) gec_topo_lines = { - "BcToKpKpKm_NoPID": {"require_GEC": True, "require_topo": True}, "BcToL0barPp_DD": {"require_GEC": True, "require_topo": True}, "BcToL0barPp_LL": {"require_GEC": True, "require_topo": True}, - "BuToKpKpKm_NoPID": { - "require_GEC": True, - "require_topo": True, - "min_twobody_mva": 0.13, - "min_threebody_mva": 0.13, - }, - "BuToPpPmKp_NoPID": { - "require_GEC": True, - "require_topo": True, - }, "BuToKSPpPmPip_DD": { "require_GEC": True, "require_topo": True, @@ -516,11 +489,15 @@ isolation_lines = { "BdsToKSKpKm_DD": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, "require_GEC": True, "require_topo": True, @@ -530,11 +507,15 @@ isolation_lines = { "BdsToKSKpKm_LL": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, "require_GEC": True, "require_topo": True, @@ -544,11 +525,15 @@ isolation_lines = { "BdsToKSKpPim_DD": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, "require_GEC": True, "require_topo": True, @@ -558,11 +543,15 @@ isolation_lines = { "BdsToKSKpPim_LL": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, "require_GEC": True, "require_topo": True, @@ -572,11 +561,15 @@ isolation_lines = { "BdsToKSPipPim_DD": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, "require_GEC": True, "require_topo": True, @@ -586,11 +579,15 @@ isolation_lines = { "BdsToKSPipPim_LL": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, "require_GEC": True, "require_topo": True, @@ -600,75 +597,237 @@ isolation_lines = { "BdsToPipPimPi0_NoPID_merged": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToPipPimPi0_NoPID_resolved": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "Lb0ToPpPimPi0_NoPID_merged": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "Lambda_b0", - "coneangle": 1.0, + "coneangles": [1.0], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "Lb0ToPpPimPi0_NoPID_resolved": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "Lambda_b0", - "coneangle": 1.0, + "coneangles": [1.0], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToKstzKstzb": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B_s0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToKstzPhi": { - "iso_kwargs": { + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "BdsToKstzPhi_FakeKstDouble": { + "prescale": 0.1, + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "BdsToKstzPhi_FakeKstK": { + "prescale": 0.1, + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "BdsToKstzPhi_FakeKstPi": { + "prescale": 0.1, + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "BdsToKstzPhi_FakePhiDouble": { + "prescale": 0.1, + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "BdsToKstzPhi_FakePhiK": { + "prescale": 0.1, + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToKstzRho": { - "iso_kwargs": { + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "BdsToKstzRho_FakeKstDouble": { + "prescale": 0.1, + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "BdsToKstzRho_FakeKstK": { + "prescale": 0.1, + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "BdsToKstzRho_FakeKstPi": { + "prescale": 0.1, + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "BdsToKstzRho_FakeRhoDouble": { + "prescale": 0.1, + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "BdsToKstzRho_FakeRhoPi":{ + "prescale": 0.1, + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToPhiKpKm": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToPhiPhi": { @@ -676,57 +835,184 @@ isolation_lines = { "pv_tracks": True, "reltables_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], + "coneangles": [1.8], "VertexIso": True, "LongTrackIso": True, "NeutralIso": True, - "wantConeAsym": True, - "wantConeDelta": True, - }, - "iso_kwargs": { - "name": "B0", - "coneangle": 1.0, - "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, "raw_banks": ["VP", "UT", "FT", "Rich", "Muon", "Calo"], }, "BdsToPhiRho": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B_s0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToRhoRho": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToPpPpPmPm": { - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToPpPm": { - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "BcToKpKpKm_NoPID": { + "require_GEC": True, + "require_topo": True, + "reltables_kwargs": { + "name": "B+", + "coneangles": [1.0, 1.5, 2.0], + "VertexIso": False, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, + "BuToKpKpKm_NoPID": { + "require_GEC": True, + "require_topo": True, + "min_twobody_mva": 0.13, + "min_threebody_mva": 0.13, + "reltables_kwargs": { + "name": "B+", + "coneangles": [1.0, 1.5, 2.0], + "VertexIso": False, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "BuToPpPmKp_NoPID": { + "require_GEC": True, + "require_topo": True, + "reltables_kwargs": { + "name": "B+", + "coneangles": [1.0, 1.5, 2.0], + "VertexIso": False, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "Lb0ToL0KmPip_DD": { + "reltables_kwargs": { + "name": "Lambda_b0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "Lb0ToL0KmPip_LL": { + "reltables_kwargs": { + "name": "Lambda_b0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "Lb0ToL0KpKm_DD": { + "reltables_kwargs": { + "name": "Lambda_b0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "Lb0ToL0KpKm_LL": { + "reltables_kwargs": { + "name": "Lambda_b0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "Lb0ToL0KpPim_DD": { + "reltables_kwargs": { + "name": "Lambda_b0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, + "Lb0ToL0KpPim_LL": { + "reltables_kwargs": { + "name": "Lambda_b0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, + }, } # Special lines with settings not belonging to any remaining group diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py index e36cd07b5f9..4f51c3f5965 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py @@ -303,354 +303,541 @@ default_lines = [ "BuTopipipipipi", ] -flavour_tagging_lines = { +flavour_tagging_lines = {} + +isolation_lines = { "BdsToKpKpKmKm": { "pv_tracks": True, + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, }, "BdsToKpKpKmPim": { "pv_tracks": True, + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, }, "BdsToKpKmPipPim": { "pv_tracks": True, + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, }, "BdsToPipPipPimPim": { "pv_tracks": True, + "reltables_kwargs": { + "name": "B0", + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, + "NeutralIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, + }, }, -} - -isolation_lines = { "BdsToKpPipPimPim": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToKsPipPimPi0_NoPID_DD_merged": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToKsPipPimPi0_NoPID_DD_resolved": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToKsPipPimPi0_NoPID_LL_merged": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToKsPipPimPi0_NoPID_LL_resolved": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToPi0Pi0_merged": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.5, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToPi0Pi0_resolved": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.5, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToPipPipPimPimPi0_NoPID_merged": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BdsToPipPipPimPimPi0_NoPID_resolved": { "flavour_tagging": True, "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BuToKsPipPi0_NoPID_DD_merged": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B+", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BuToKsPipPi0_NoPID_DD_resolved": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B+", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BuToKsPipPi0_NoPID_LL_merged": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B+", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BuToKsPipPi0_NoPID_LL_resolved": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B+", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BuToKsPipPipPimPi0_NoPID_DD_merged": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B+", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BuToKsPipPipPimPi0_NoPID_DD_resolved": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B+", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BuToKsPipPipPimPi0_NoPID_LL_merged": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B+", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BuToKsPipPipPimPi0_NoPID_LL_resolved": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B+", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BuToPipPipPimPi0_NoPID_merged": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B+", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "BuToPipPipPimPi0_NoPID_resolved": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "B+", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "Lb0ToLmdPipPimPi0_NoPID_DD_merged": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "Lambda_b0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "Lb0ToLmdPipPimPi0_NoPID_DD_resolved": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "Lambda_b0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "Lb0ToLmdPipPimPi0_NoPID_LL_merged": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "Lambda_b0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "Lb0ToLmdPipPimPi0_NoPID_LL_resolved": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "Lambda_b0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "Lb0ToSigma0Phi_LL": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "Lambda_b0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "Lb0ToSigma0Phi_DD": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "Lambda_b0", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "XibToLmdPimPi0_NoPID_DD_merged": { - "iso_kwargs": { + "reltables_kwargs": { "name": "Xi_b-", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "XibToLmdPimPi0_NoPID_DD_resolved": { - "iso_kwargs": { + "reltables_kwargs": { "name": "Xi_b-", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "XibToLmdPimPi0_NoPID_LL_merged": { - "iso_kwargs": { + "reltables_kwargs": { "name": "Xi_b-", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "XibToLmdPimPi0_NoPID_LL_resolved": { - "iso_kwargs": { + "reltables_kwargs": { "name": "Xi_b-", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "XibToLmdPipPimPimPi0_NoPID_DD_merged": { - "iso_kwargs": { + "reltables_kwargs": { "name": "Xi_b-", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "XibToLmdPipPimPimPi0_NoPID_DD_resolved": { - "iso_kwargs": { + "reltables_kwargs": { "name": "Xi_b-", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "XibToLmdPipPimPimPi0_NoPID_LL_merged": { - "iso_kwargs": { + "reltables_kwargs": { "name": "Xi_b-", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "XibToLmdPipPimPimPi0_NoPID_LL_resolved": { - "iso_kwargs": { + "reltables_kwargs": { "name": "Xi_b-", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "XibmToSigma0Km_LL": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "Xi_b-", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "XibmToSigma0Km_DD": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "Xi_b-", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "XibmToSigma0Pim_LL": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "Xi_b-", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, "XibmToSigma0Pim_DD": { "pv_tracks": True, - "iso_kwargs": { + "reltables_kwargs": { "name": "Xi_b-", - "coneangle": 1.0, + "coneangles": [1.0, 1.5], + "VertexIso": True, + "LongTrackIso": True, "NeutralIso": True, - "PiZerosIso": True, + "wantConeThreeMom": True, + "wantConeDeltaPhi": True, + "wantConePTAsym": True, }, }, } -- GitLab From 020f8ed33c0043bad6246a0ff30f245dc6626bc4 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Thu, 6 Mar 2025 15:51:00 +0000 Subject: [PATCH 13/28] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/52365675 --- .../lines/bnoc/builders/bnoc_isolation.py | 33 +++++++++++-------- .../python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py | 30 ++++++++--------- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index 11f17b44f2c..aa0bd4537a6 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -173,27 +173,34 @@ def make_reltable_for_cone_isolation( ) three_mom_functors = [] - + if wantConeThreeMom: three_mom_functors += [ - F.CONE_PX(), - F.CONE_PY(), - F.CONE_PZ(),] - - if wantConeDeltaEta: three_mom_functors += [F.CONE_DELTA_ETA()] - if wantConeDeltaPhi: three_mom_functors += [F.CONE_DELTA_PHI()] - - if wantConePAsym: three_mom_functors += [F.CONE_ASYM_P()] - if wantConePTAsym: three_mom_functors += [F.CONE_ASYM_PT()] + F.CONE_PX(), + F.CONE_PY(), + F.CONE_PZ(), + ] + + if wantConeDeltaEta: + three_mom_functors += [F.CONE_DELTA_ETA()] + if wantConeDeltaPhi: + three_mom_functors += [F.CONE_DELTA_PHI()] + + if wantConePAsym: + three_mom_functors += [F.CONE_ASYM_P()] + if wantConePTAsym: + three_mom_functors += [F.CONE_ASYM_PT()] if wantConeThreeMomAsym: three_mom_functors += [ F.CONE_ASYM_PX(), F.CONE_ASYM_PY(), F.CONE_ASYM_PZ(), ] - - if wantConeP: three_mom_functors += [F.CONE_P()] - if wantConePT: three_mom_functors += [F.CONE_PT()] + + if wantConeP: + three_mom_functors += [F.CONE_P()] + if wantConePT: + three_mom_functors += [F.CONE_PT()] part_functors = [F.CONE_MULT()] diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py index f84c6d94f62..3b9d59d3ef2 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py @@ -651,7 +651,7 @@ isolation_lines = { "BdsToKstzKstzb": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "reltables_kwargs": { "name": "B_s0", "coneangles": [1.0, 1.5], "VertexIso": True, @@ -663,7 +663,7 @@ isolation_lines = { }, }, "BdsToKstzPhi": { - "reltables_kwargs": { + "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], "VertexIso": True, @@ -740,7 +740,7 @@ isolation_lines = { }, }, "BdsToKstzRho": { - "reltables_kwargs": { + "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], "VertexIso": True, @@ -803,7 +803,7 @@ isolation_lines = { "wantConePTAsym": True, }, }, - "BdsToKstzRho_FakeRhoPi":{ + "BdsToKstzRho_FakeRhoPi": { "prescale": 0.1, "reltables_kwargs": { "name": "B0", @@ -819,7 +819,7 @@ isolation_lines = { "BdsToPhiKpKm": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], "VertexIso": True, @@ -848,7 +848,7 @@ isolation_lines = { "BdsToPhiRho": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "reltables_kwargs": { "name": "B_s0", "coneangles": [1.0, 1.5], "VertexIso": True, @@ -862,7 +862,7 @@ isolation_lines = { "BdsToRhoRho": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], "VertexIso": True, @@ -874,7 +874,7 @@ isolation_lines = { }, }, "BdsToPpPpPmPm": { - "reltables_kwargs": { + "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], "VertexIso": True, @@ -886,7 +886,7 @@ isolation_lines = { }, }, "BdsToPpPm": { - "reltables_kwargs": { + "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], "VertexIso": True, @@ -898,7 +898,7 @@ isolation_lines = { }, }, "BcToKpKpKm_NoPID": { - "require_GEC": True, + "require_GEC": True, "require_topo": True, "reltables_kwargs": { "name": "B+", @@ -965,7 +965,7 @@ isolation_lines = { "wantConePTAsym": True, }, }, - "Lb0ToL0KpKm_DD": { + "Lb0ToL0KpKm_DD": { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], @@ -977,7 +977,7 @@ isolation_lines = { "wantConePTAsym": True, }, }, - "Lb0ToL0KpKm_LL": { + "Lb0ToL0KpKm_LL": { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], @@ -989,7 +989,7 @@ isolation_lines = { "wantConePTAsym": True, }, }, - "Lb0ToL0KpPim_DD": { + "Lb0ToL0KpPim_DD": { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], @@ -1001,7 +1001,7 @@ isolation_lines = { "wantConePTAsym": True, }, }, - "Lb0ToL0KpPim_LL": { + "Lb0ToL0KpPim_LL": { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], @@ -1012,7 +1012,7 @@ isolation_lines = { "wantConeDeltaPhi": True, "wantConePTAsym": True, }, - }, + }, } # Special lines with settings not belonging to any remaining group -- GitLab From 87745d25ae40b6f51650e659bda4969cca4b634c Mon Sep 17 00:00:00 2001 From: Francesca Date: Fri, 7 Mar 2025 13:55:17 +0000 Subject: [PATCH 14/28] Revert "Restore persistancy for non-particles in Turbo spruce pass" This reverts commit c8d713e2586e8b797336d913c45621061fcb96e6. --- Hlt/Moore/python/Moore/lines.py | 31 ++++++------------- .../Moore/persistence/particle_moving.py | 16 ++-------- Hlt/Moore/python/Moore/production.py | 2 +- 3 files changed, 13 insertions(+), 36 deletions(-) diff --git a/Hlt/Moore/python/Moore/lines.py b/Hlt/Moore/python/Moore/lines.py index 628a20d107c..05e5440fcc2 100644 --- a/Hlt/Moore/python/Moore/lines.py +++ b/Hlt/Moore/python/Moore/lines.py @@ -496,14 +496,12 @@ class Hlt2Line(DecisionLine): # this line made a positive decision self.objects_to_persist = [] if self.produces_output: - output_node, self.objects_to_persist, self.extra_output_locations = ( - self._output_node( - self.node, - self.output_producer, - self.extra_outputs, - self.persistreco, - self.tagging_particles, - ) + output_node, self.objects_to_persist = self._output_node( + self.node, + self.output_producer, + self.extra_outputs, + self.persistreco, + self.tagging_particles, ) # Wrap the decision and output nodes if output_node is not None: @@ -550,13 +548,9 @@ class Hlt2Line(DecisionLine): extra_outputs.append(tuple(entry_new)) is_output_producer = True if self.output_producer else False - extra_output_locs = [ - (loc[0], *locs) - for loc, locs in zip(self.extra_outputs, self.extra_output_locations) - ] return { "name": self.name, - "extra_outputs": extra_output_locs, + "extra_outputs": extra_outputs, "persistreco": self.persistreco, "tagging_particles": self.tagging_particles, "calo_digits": self.calo_digits, @@ -614,7 +608,7 @@ class Hlt2Line(DecisionLine): ) ) - algs, objects_to_persist, extra_output_locations = Hlt2Line._line_outputs( + algs, objects_to_persist = Hlt2Line._line_outputs( main_output, additional_outputs, persistreco, tagging_particles ) # Algorithms already in the decision CF don't need to be in the @@ -635,7 +629,7 @@ class Hlt2Line(DecisionLine): else: output_node = None - return output_node, objects_to_persist, extra_output_locations + return output_node, objects_to_persist @staticmethod def _line_outputs( @@ -687,7 +681,6 @@ class Hlt2Line(DecisionLine): from .persistence.particle_moving import ( copy_to_final_location, - get_final_location, is_particle_producer, particle_output, ) @@ -699,7 +692,6 @@ class Hlt2Line(DecisionLine): rec_summary = reco["RecSummary"] algs = [] objects_to_persist = [] - extra_output_locations = [] main_output, main_location_components = main_output_location main_producer = _producer(main_output) @@ -735,9 +727,6 @@ class Hlt2Line(DecisionLine): ) ) else: - extra_output_locations.append( - get_final_location(output, location_components) - ) mover = copy_to_final_location(output, location_components) if mover: algs.append(mover) @@ -772,7 +761,7 @@ class Hlt2Line(DecisionLine): algs.append(rec_summary) objects_to_persist.append(rec_summary) - return algs, objects_to_persist, extra_output_locations + return algs, objects_to_persist class SpruceLine(Hlt2Line): diff --git a/Hlt/Moore/python/Moore/persistence/particle_moving.py b/Hlt/Moore/python/Moore/persistence/particle_moving.py index 791bc57de6b..be55886d527 100644 --- a/Hlt/Moore/python/Moore/persistence/particle_moving.py +++ b/Hlt/Moore/python/Moore/persistence/particle_moving.py @@ -71,9 +71,8 @@ def cloning_map(): } -def get_final_location(input, path_components): - """ - Determine the final output location from a DataHandle. +def copy_to_final_location(input, path_components): + """Return an algorithm that copies Particle objects. Args: input (DataHandle): input container to be copied. @@ -93,18 +92,7 @@ def get_final_location(input, path_components): # We will add the suffix in this method to ensure consistency base = os.path.join("/Event", *path_components) output_loc = os.path.join(base, input_type) - return output_loc, input_type - - -def copy_to_final_location(input, path_components): - """Return an algorithm that copies Particle objects. - Args: - input (DataHandle): input container to be copied. - path_components (list of str): Definition of TES path, relative to - '/Event', under which to store copied objects. - """ - output_loc, input_type = get_final_location(input, path_components) # Keep track of forced output locations to make sure we don't write to the # same place twice assert output_loc not in _FORCED_LOCATIONS, ( diff --git a/Hlt/Moore/python/Moore/production.py b/Hlt/Moore/python/Moore/production.py index cc003ec7b3f..b2afe531c50 100644 --- a/Hlt/Moore/python/Moore/production.py +++ b/Hlt/Moore/python/Moore/production.py @@ -612,7 +612,7 @@ def _make_pass_spruceline(line_attributes, custom_prescales={}): Returns: SpruceLine: The SpruceLine with the attributes of the matching Hlt2Line. """ - from PyConf.reading import _get_unpacked, get_particles, upfront_decoder + from PyConf.reading import get_particles, upfront_decoder linename = line_attributes["name"] filter = f"{linename}Decision" -- GitLab From 3ee8867ba023db50a7ea832e369fa6254013610b Mon Sep 17 00:00:00 2001 From: mmonk Date: Thu, 6 Mar 2025 15:23:24 +0000 Subject: [PATCH 15/28] Restore persistancy for non-particles in Turbo spruce pass --- Hlt/Moore/python/Moore/lines.py | 31 +++++++++++++------ .../Moore/persistence/particle_moving.py | 16 ++++++++-- Hlt/Moore/python/Moore/production.py | 2 +- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/Hlt/Moore/python/Moore/lines.py b/Hlt/Moore/python/Moore/lines.py index 05e5440fcc2..628a20d107c 100644 --- a/Hlt/Moore/python/Moore/lines.py +++ b/Hlt/Moore/python/Moore/lines.py @@ -496,12 +496,14 @@ class Hlt2Line(DecisionLine): # this line made a positive decision self.objects_to_persist = [] if self.produces_output: - output_node, self.objects_to_persist = self._output_node( - self.node, - self.output_producer, - self.extra_outputs, - self.persistreco, - self.tagging_particles, + output_node, self.objects_to_persist, self.extra_output_locations = ( + self._output_node( + self.node, + self.output_producer, + self.extra_outputs, + self.persistreco, + self.tagging_particles, + ) ) # Wrap the decision and output nodes if output_node is not None: @@ -548,9 +550,13 @@ class Hlt2Line(DecisionLine): extra_outputs.append(tuple(entry_new)) is_output_producer = True if self.output_producer else False + extra_output_locs = [ + (loc[0], *locs) + for loc, locs in zip(self.extra_outputs, self.extra_output_locations) + ] return { "name": self.name, - "extra_outputs": extra_outputs, + "extra_outputs": extra_output_locs, "persistreco": self.persistreco, "tagging_particles": self.tagging_particles, "calo_digits": self.calo_digits, @@ -608,7 +614,7 @@ class Hlt2Line(DecisionLine): ) ) - algs, objects_to_persist = Hlt2Line._line_outputs( + algs, objects_to_persist, extra_output_locations = Hlt2Line._line_outputs( main_output, additional_outputs, persistreco, tagging_particles ) # Algorithms already in the decision CF don't need to be in the @@ -629,7 +635,7 @@ class Hlt2Line(DecisionLine): else: output_node = None - return output_node, objects_to_persist + return output_node, objects_to_persist, extra_output_locations @staticmethod def _line_outputs( @@ -681,6 +687,7 @@ class Hlt2Line(DecisionLine): from .persistence.particle_moving import ( copy_to_final_location, + get_final_location, is_particle_producer, particle_output, ) @@ -692,6 +699,7 @@ class Hlt2Line(DecisionLine): rec_summary = reco["RecSummary"] algs = [] objects_to_persist = [] + extra_output_locations = [] main_output, main_location_components = main_output_location main_producer = _producer(main_output) @@ -727,6 +735,9 @@ class Hlt2Line(DecisionLine): ) ) else: + extra_output_locations.append( + get_final_location(output, location_components) + ) mover = copy_to_final_location(output, location_components) if mover: algs.append(mover) @@ -761,7 +772,7 @@ class Hlt2Line(DecisionLine): algs.append(rec_summary) objects_to_persist.append(rec_summary) - return algs, objects_to_persist + return algs, objects_to_persist, extra_output_locations class SpruceLine(Hlt2Line): diff --git a/Hlt/Moore/python/Moore/persistence/particle_moving.py b/Hlt/Moore/python/Moore/persistence/particle_moving.py index be55886d527..791bc57de6b 100644 --- a/Hlt/Moore/python/Moore/persistence/particle_moving.py +++ b/Hlt/Moore/python/Moore/persistence/particle_moving.py @@ -71,8 +71,9 @@ def cloning_map(): } -def copy_to_final_location(input, path_components): - """Return an algorithm that copies Particle objects. +def get_final_location(input, path_components): + """ + Determine the final output location from a DataHandle. Args: input (DataHandle): input container to be copied. @@ -92,7 +93,18 @@ def copy_to_final_location(input, path_components): # We will add the suffix in this method to ensure consistency base = os.path.join("/Event", *path_components) output_loc = os.path.join(base, input_type) + return output_loc, input_type + + +def copy_to_final_location(input, path_components): + """Return an algorithm that copies Particle objects. + Args: + input (DataHandle): input container to be copied. + path_components (list of str): Definition of TES path, relative to + '/Event', under which to store copied objects. + """ + output_loc, input_type = get_final_location(input, path_components) # Keep track of forced output locations to make sure we don't write to the # same place twice assert output_loc not in _FORCED_LOCATIONS, ( diff --git a/Hlt/Moore/python/Moore/production.py b/Hlt/Moore/python/Moore/production.py index b2afe531c50..cc003ec7b3f 100644 --- a/Hlt/Moore/python/Moore/production.py +++ b/Hlt/Moore/python/Moore/production.py @@ -612,7 +612,7 @@ def _make_pass_spruceline(line_attributes, custom_prescales={}): Returns: SpruceLine: The SpruceLine with the attributes of the matching Hlt2Line. """ - from PyConf.reading import get_particles, upfront_decoder + from PyConf.reading import _get_unpacked, get_particles, upfront_decoder linename = line_attributes["name"] filter = f"{linename}Decision" -- GitLab From 1a8f93d267d7ea1096d940fb4b42223a574be93a Mon Sep 17 00:00:00 2001 From: Francesca Date: Thu, 20 Mar 2025 17:12:38 +0000 Subject: [PATCH 16/28] Revert "Restore persistancy for non-particles in Turbo spruce pass" This reverts commit ec6cda6666ba2b54b5f05557dfc5402250976d99. --- Hlt/Moore/python/Moore/lines.py | 31 ++++++------------- .../Moore/persistence/particle_moving.py | 16 ++-------- Hlt/Moore/python/Moore/production.py | 2 +- 3 files changed, 13 insertions(+), 36 deletions(-) diff --git a/Hlt/Moore/python/Moore/lines.py b/Hlt/Moore/python/Moore/lines.py index 628a20d107c..05e5440fcc2 100644 --- a/Hlt/Moore/python/Moore/lines.py +++ b/Hlt/Moore/python/Moore/lines.py @@ -496,14 +496,12 @@ class Hlt2Line(DecisionLine): # this line made a positive decision self.objects_to_persist = [] if self.produces_output: - output_node, self.objects_to_persist, self.extra_output_locations = ( - self._output_node( - self.node, - self.output_producer, - self.extra_outputs, - self.persistreco, - self.tagging_particles, - ) + output_node, self.objects_to_persist = self._output_node( + self.node, + self.output_producer, + self.extra_outputs, + self.persistreco, + self.tagging_particles, ) # Wrap the decision and output nodes if output_node is not None: @@ -550,13 +548,9 @@ class Hlt2Line(DecisionLine): extra_outputs.append(tuple(entry_new)) is_output_producer = True if self.output_producer else False - extra_output_locs = [ - (loc[0], *locs) - for loc, locs in zip(self.extra_outputs, self.extra_output_locations) - ] return { "name": self.name, - "extra_outputs": extra_output_locs, + "extra_outputs": extra_outputs, "persistreco": self.persistreco, "tagging_particles": self.tagging_particles, "calo_digits": self.calo_digits, @@ -614,7 +608,7 @@ class Hlt2Line(DecisionLine): ) ) - algs, objects_to_persist, extra_output_locations = Hlt2Line._line_outputs( + algs, objects_to_persist = Hlt2Line._line_outputs( main_output, additional_outputs, persistreco, tagging_particles ) # Algorithms already in the decision CF don't need to be in the @@ -635,7 +629,7 @@ class Hlt2Line(DecisionLine): else: output_node = None - return output_node, objects_to_persist, extra_output_locations + return output_node, objects_to_persist @staticmethod def _line_outputs( @@ -687,7 +681,6 @@ class Hlt2Line(DecisionLine): from .persistence.particle_moving import ( copy_to_final_location, - get_final_location, is_particle_producer, particle_output, ) @@ -699,7 +692,6 @@ class Hlt2Line(DecisionLine): rec_summary = reco["RecSummary"] algs = [] objects_to_persist = [] - extra_output_locations = [] main_output, main_location_components = main_output_location main_producer = _producer(main_output) @@ -735,9 +727,6 @@ class Hlt2Line(DecisionLine): ) ) else: - extra_output_locations.append( - get_final_location(output, location_components) - ) mover = copy_to_final_location(output, location_components) if mover: algs.append(mover) @@ -772,7 +761,7 @@ class Hlt2Line(DecisionLine): algs.append(rec_summary) objects_to_persist.append(rec_summary) - return algs, objects_to_persist, extra_output_locations + return algs, objects_to_persist class SpruceLine(Hlt2Line): diff --git a/Hlt/Moore/python/Moore/persistence/particle_moving.py b/Hlt/Moore/python/Moore/persistence/particle_moving.py index 791bc57de6b..be55886d527 100644 --- a/Hlt/Moore/python/Moore/persistence/particle_moving.py +++ b/Hlt/Moore/python/Moore/persistence/particle_moving.py @@ -71,9 +71,8 @@ def cloning_map(): } -def get_final_location(input, path_components): - """ - Determine the final output location from a DataHandle. +def copy_to_final_location(input, path_components): + """Return an algorithm that copies Particle objects. Args: input (DataHandle): input container to be copied. @@ -93,18 +92,7 @@ def get_final_location(input, path_components): # We will add the suffix in this method to ensure consistency base = os.path.join("/Event", *path_components) output_loc = os.path.join(base, input_type) - return output_loc, input_type - - -def copy_to_final_location(input, path_components): - """Return an algorithm that copies Particle objects. - Args: - input (DataHandle): input container to be copied. - path_components (list of str): Definition of TES path, relative to - '/Event', under which to store copied objects. - """ - output_loc, input_type = get_final_location(input, path_components) # Keep track of forced output locations to make sure we don't write to the # same place twice assert output_loc not in _FORCED_LOCATIONS, ( diff --git a/Hlt/Moore/python/Moore/production.py b/Hlt/Moore/python/Moore/production.py index cc003ec7b3f..b2afe531c50 100644 --- a/Hlt/Moore/python/Moore/production.py +++ b/Hlt/Moore/python/Moore/production.py @@ -612,7 +612,7 @@ def _make_pass_spruceline(line_attributes, custom_prescales={}): Returns: SpruceLine: The SpruceLine with the attributes of the matching Hlt2Line. """ - from PyConf.reading import _get_unpacked, get_particles, upfront_decoder + from PyConf.reading import get_particles, upfront_decoder linename = line_attributes["name"] filter = f"{linename}Decision" -- GitLab From 7a001f38cd73a29a88e9e209e718b7c3aaa5f7f6 Mon Sep 17 00:00:00 2001 From: Francesca Date: Thu, 20 Mar 2025 17:04:55 +0000 Subject: [PATCH 17/28] Updates for new indexing scheme --- Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py | 5 +- .../lines/bnoc/builders/bnoc_isolation.py | 105 ++------ .../python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py | 228 ++++++------------ 3 files changed, 96 insertions(+), 242 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py index 9814d66d16b..9b0999e3683 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py @@ -42,14 +42,13 @@ def extra_outputs_for_isolation(name, ref_particles, extra_particles, selection) @configurable def extra_outputs_for_relinfo_isolation( - name, ref_particles, extra_particles, selection, mom_functors, part_functors + name, ref_particles, extra_particles, selection, variables, ): FunctorsRelTableAlg = FunctorsToRelTable( InputCandidates=ref_particles, InputOtherTracks=extra_particles, Cut=selection, - ThreeMomFunctors=mom_functors, - ParticleFunctors=part_functors, + Variables=variables, ) extra_outputs = [(name, FunctorsRelTableAlg.OutputLocation)] diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index aa0bd4537a6..e0c4869656e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -143,14 +143,7 @@ def make_reltable_for_cone_isolation( UpstreamTrackIso=False, NeutralIso=False, PiZerosIso=False, - wantConeDeltaEta=False, - wantConeDeltaPhi=False, - wantConeP=False, - wantConePT=False, - wantConeThreeMom=False, - wantConePAsym=False, - wantConePTAsym=False, - wantConeThreeMomAsym=False, + Variables=[], ): """ Add to the extra_outputs different kind of isolations by properly setting the given flag @@ -172,48 +165,6 @@ def make_reltable_for_cone_isolation( "Different number of names and candidate containers for particle isolation!" ) - three_mom_functors = [] - - if wantConeThreeMom: - three_mom_functors += [ - F.CONE_PX(), - F.CONE_PY(), - F.CONE_PZ(), - ] - - if wantConeDeltaEta: - three_mom_functors += [F.CONE_DELTA_ETA()] - if wantConeDeltaPhi: - three_mom_functors += [F.CONE_DELTA_PHI()] - - if wantConePAsym: - three_mom_functors += [F.CONE_ASYM_P()] - if wantConePTAsym: - three_mom_functors += [F.CONE_ASYM_PT()] - if wantConeThreeMomAsym: - three_mom_functors += [ - F.CONE_ASYM_PX(), - F.CONE_ASYM_PY(), - F.CONE_ASYM_PZ(), - ] - - if wantConeP: - three_mom_functors += [F.CONE_P()] - if wantConePT: - three_mom_functors += [F.CONE_PT()] - - part_functors = [F.CONE_MULT()] - - mom_functor_dict = {} - for mom_functor in three_mom_functors: - mom_functor_dict[F.RelatedInfo_Functor_Index[mom_functor.code()]] = mom_functor - - part_functor_dict = {} - for part_functor in part_functors: - part_functor_dict[F.RelatedInfo_Functor_Index[part_functor.code()]] = ( - part_functor - ) - for name, cand in zip(names, candidates): if LongTrackIso: extra_outputs += extra_outputs_for_relinfo_isolation( @@ -221,8 +172,7 @@ def make_reltable_for_cone_isolation( extra_particles=make_long_pions(), ref_particles=cand, selection=cut, - mom_functors=mom_functor_dict, - part_functors=part_functor_dict, + variables=Variables, ) if TTrackIso: extra_outputs += extra_outputs_for_relinfo_isolation( @@ -230,8 +180,7 @@ def make_reltable_for_cone_isolation( extra_particles=make_ttrack_pions(), ref_particles=cand, selection=cut, - mom_functors=mom_functor_dict, - part_functors=part_functor_dict, + variables=Variables, ) if DownstreamTrackIso: extra_outputs += extra_outputs_for_relinfo_isolation( @@ -239,8 +188,7 @@ def make_reltable_for_cone_isolation( extra_particles=make_down_pions(), ref_particles=cand, selection=cut, - mom_functors=mom_functor_dict, - part_functors=part_functor_dict, + variables=Variables, ) if UpstreamTrackIso: extra_outputs += extra_outputs_for_relinfo_isolation( @@ -248,8 +196,7 @@ def make_reltable_for_cone_isolation( extra_particles=make_up_pions(), ref_particles=cand, selection=cut, - mom_functors=mom_functor_dict, - part_functors=part_functor_dict, + variables=Variables, ) if NeutralIso: extra_outputs += extra_outputs_for_relinfo_isolation( @@ -257,8 +204,7 @@ def make_reltable_for_cone_isolation( extra_particles=make_photons(), ref_particles=cand, selection=cut, - mom_functors=mom_functor_dict, - part_functors=part_functor_dict, + variables=Variables, ) if PiZerosIso: extra_outputs += extra_outputs_for_relinfo_isolation( @@ -266,8 +212,7 @@ def make_reltable_for_cone_isolation( extra_particles=make_merged_pi0s(), ref_particles=cand, selection=cut, - mom_functors=mom_functor_dict, - part_functors=part_functor_dict, + variables=Variables, ) return extra_outputs @@ -277,6 +222,7 @@ def make_reltable_for_vertex_isolation( names=[], candidates=[], cut=(F.SQRT @ F.DR2 < 1.5), + Variables=["SMALLEST_REF_ENDVERTEX_IPCHI2"] ): """ Add to the extra_outputs different kind of isolations by properly setting the given flag @@ -290,22 +236,13 @@ def make_reltable_for_vertex_isolation( "Different number of names and candidate containers for particle isolation!" ) - part_functors = [F.SMALLEST_REF_ENDVERTEX_IPCHI2()] - - part_functor_dict = {} - for part_functor in part_functors: - part_functor_dict[F.RelatedInfo_Functor_Index[part_functor.code()]] = ( - part_functor - ) - for name, cand in zip(names, candidates): extra_outputs += extra_outputs_for_relinfo_isolation( name=name + "_VertexIsolation", extra_particles=make_long_pions(), ref_particles=cand, selection=cut, - mom_functors={}, - part_functors=part_functor_dict, + variables=Variables, ) return extra_outputs @@ -323,20 +260,14 @@ def make_iso_reltables( UpstreamTrackIso=False, NeutralIso=False, PiZerosIso=False, - wantConeDeltaEta=False, - wantConeDeltaPhi=False, - wantConeP=False, - wantConePT=False, - wantConeThreeMom=False, - wantConePAsym=False, - wantConePTAsym=False, - wantConeThreeMomAsym=False, + coneVariables=[], + vertexIsoVariables=[], ): candidate = line_alg reltables = [] - if coneangles: + if coneVariables: for coneangle in coneangles: cut = (F.SQRT @ F.DR2 < coneangle) & ~F.FIND_IN_TREE() @@ -350,24 +281,18 @@ def make_iso_reltables( UpstreamTrackIso=UpstreamTrackIso, NeutralIso=NeutralIso, PiZerosIso=PiZerosIso, - wantConeDeltaEta=wantConeDeltaEta, - wantConeDeltaPhi=wantConeDeltaPhi, - wantConeP=wantConeP, - wantConePT=wantConePT, - wantConeThreeMom=wantConeThreeMom, - wantConePAsym=wantConePAsym, - wantConePTAsym=wantConePTAsym, - wantConeThreeMomAsym=wantConeThreeMomAsym, + Variables=coneVariables, ) reltables += cone_reltable - if VertexIso: + if vertexIsoVariables: cut = ~F.FIND_IN_TREE() vertex_reltable = make_reltable_for_vertex_isolation( names=[name], candidates=[candidate], cut=cut, + Variables=vertexIsoVariables, ) reltables += vertex_reltable diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py index 3b9d59d3ef2..0319a3d34f8 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py @@ -492,12 +492,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, "require_GEC": True, "require_topo": True, @@ -510,12 +508,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, "require_GEC": True, "require_topo": True, @@ -528,12 +524,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, "require_GEC": True, "require_topo": True, @@ -546,12 +540,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, "require_GEC": True, "require_topo": True, @@ -564,12 +556,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, "require_GEC": True, "require_topo": True, @@ -582,12 +572,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, "require_GEC": True, "require_topo": True, @@ -600,12 +588,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToPipPimPi0_NoPID_resolved": { @@ -614,12 +600,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToPpPimPi0_NoPID_merged": { @@ -627,12 +611,10 @@ isolation_lines = { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToPpPimPi0_NoPID_resolved": { @@ -640,12 +622,10 @@ isolation_lines = { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKstzKstzb": { @@ -654,24 +634,20 @@ isolation_lines = { "reltables_kwargs": { "name": "B_s0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKstzPhi": { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKstzPhi_FakeKstDouble": { @@ -679,12 +655,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKstzPhi_FakeKstK": { @@ -692,12 +666,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKstzPhi_FakeKstPi": { @@ -705,12 +677,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKstzPhi_FakePhiDouble": { @@ -718,12 +688,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKstzPhi_FakePhiK": { @@ -731,24 +699,20 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKstzRho": { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKstzRho_FakeKstDouble": { @@ -756,12 +720,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKstzRho_FakeKstK": { @@ -769,12 +731,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKstzRho_FakeKstPi": { @@ -782,12 +742,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKstzRho_FakeRhoDouble": { @@ -795,12 +753,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKstzRho_FakeRhoPi": { @@ -808,12 +764,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToPhiKpKm": { @@ -822,12 +776,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToPhiPhi": { @@ -836,12 +788,16 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.8], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + }, + "iso_kwargs": { + "name": "B0", + "coneangle": 1.0, + "NeutralIso": True, + "PiZerosIso": True, }, "raw_banks": ["VP", "UT", "FT", "Rich", "Muon", "Calo"], }, @@ -851,12 +807,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B_s0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToRhoRho": { @@ -865,36 +819,30 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToPpPpPmPm": { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToPpPm": { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BcToKpKpKm_NoPID": { @@ -906,9 +854,7 @@ isolation_lines = { "VertexIso": False, "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BuToKpKpKm_NoPID": { @@ -922,9 +868,7 @@ isolation_lines = { "VertexIso": False, "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BuToPpPmKp_NoPID": { @@ -936,81 +880,67 @@ isolation_lines = { "VertexIso": False, "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToL0KmPip_DD": { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToL0KmPip_LL": { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToL0KpKm_DD": { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToL0KpKm_LL": { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToL0KpPim_DD": { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToL0KpPim_LL": { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, } -- GitLab From 60669293d7345f6857c92117d742fc90040ca569 Mon Sep 17 00:00:00 2001 From: Francesca Date: Thu, 20 Mar 2025 17:50:54 +0000 Subject: [PATCH 18/28] Update also spruce lines --- .../python/Hlt2Conf/lines/bnoc/spruce_bnoc.py | 246 ++++++------------ 1 file changed, 82 insertions(+), 164 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py index 4f51c3f5965..bee07ffdd78 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py @@ -311,12 +311,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKpKpKmPim": { @@ -324,12 +322,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKpKmPipPim": { @@ -337,12 +333,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToPipPipPimPim": { @@ -350,12 +344,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKpPipPimPim": { @@ -364,12 +356,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKsPipPimPi0_NoPID_DD_merged": { @@ -378,12 +368,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKsPipPimPi0_NoPID_DD_resolved": { @@ -392,12 +380,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKsPipPimPi0_NoPID_LL_merged": { @@ -406,12 +392,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToKsPipPimPi0_NoPID_LL_resolved": { @@ -420,12 +404,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToPi0Pi0_merged": { @@ -434,12 +416,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToPi0Pi0_resolved": { @@ -448,12 +428,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToPipPipPimPimPi0_NoPID_merged": { @@ -462,12 +440,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BdsToPipPipPimPimPi0_NoPID_resolved": { @@ -476,12 +452,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BuToKsPipPi0_NoPID_DD_merged": { @@ -489,12 +463,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B+", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BuToKsPipPi0_NoPID_DD_resolved": { @@ -502,12 +474,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B+", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BuToKsPipPi0_NoPID_LL_merged": { @@ -515,12 +485,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B+", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BuToKsPipPi0_NoPID_LL_resolved": { @@ -528,12 +496,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B+", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BuToKsPipPipPimPi0_NoPID_DD_merged": { @@ -541,12 +507,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B+", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BuToKsPipPipPimPi0_NoPID_DD_resolved": { @@ -554,12 +518,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B+", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BuToKsPipPipPimPi0_NoPID_LL_merged": { @@ -567,12 +529,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B+", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BuToKsPipPipPimPi0_NoPID_LL_resolved": { @@ -580,12 +540,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B+", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BuToPipPipPimPi0_NoPID_merged": { @@ -593,12 +551,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B+", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "BuToPipPipPimPi0_NoPID_resolved": { @@ -606,12 +562,10 @@ isolation_lines = { "reltables_kwargs": { "name": "B+", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToLmdPipPimPi0_NoPID_DD_merged": { @@ -619,12 +573,10 @@ isolation_lines = { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToLmdPipPimPi0_NoPID_DD_resolved": { @@ -632,12 +584,10 @@ isolation_lines = { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToLmdPipPimPi0_NoPID_LL_merged": { @@ -645,12 +595,10 @@ isolation_lines = { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToLmdPipPimPi0_NoPID_LL_resolved": { @@ -658,12 +606,10 @@ isolation_lines = { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToSigma0Phi_LL": { @@ -671,12 +617,10 @@ isolation_lines = { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "Lb0ToSigma0Phi_DD": { @@ -684,108 +628,90 @@ isolation_lines = { "reltables_kwargs": { "name": "Lambda_b0", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "XibToLmdPimPi0_NoPID_DD_merged": { "reltables_kwargs": { "name": "Xi_b-", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "XibToLmdPimPi0_NoPID_DD_resolved": { "reltables_kwargs": { "name": "Xi_b-", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "XibToLmdPimPi0_NoPID_LL_merged": { "reltables_kwargs": { "name": "Xi_b-", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "XibToLmdPimPi0_NoPID_LL_resolved": { "reltables_kwargs": { "name": "Xi_b-", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "XibToLmdPipPimPimPi0_NoPID_DD_merged": { "reltables_kwargs": { "name": "Xi_b-", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "XibToLmdPipPimPimPi0_NoPID_DD_resolved": { "reltables_kwargs": { "name": "Xi_b-", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "XibToLmdPipPimPimPi0_NoPID_LL_merged": { "reltables_kwargs": { "name": "Xi_b-", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "XibToLmdPipPimPimPi0_NoPID_LL_resolved": { "reltables_kwargs": { "name": "Xi_b-", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "XibmToSigma0Km_LL": { @@ -793,12 +719,10 @@ isolation_lines = { "reltables_kwargs": { "name": "Xi_b-", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "XibmToSigma0Km_DD": { @@ -806,12 +730,10 @@ isolation_lines = { "reltables_kwargs": { "name": "Xi_b-", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "XibmToSigma0Pim_LL": { @@ -819,12 +741,10 @@ isolation_lines = { "reltables_kwargs": { "name": "Xi_b-", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, "XibmToSigma0Pim_DD": { @@ -832,12 +752,10 @@ isolation_lines = { "reltables_kwargs": { "name": "Xi_b-", "coneangles": [1.0, 1.5], - "VertexIso": True, + "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "wantConeThreeMom": True, - "wantConeDeltaPhi": True, - "wantConePTAsym": True, + "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], }, }, } -- GitLab From c189e31105f86a9628d7d2145e2f7107e61113a9 Mon Sep 17 00:00:00 2001 From: Francesca Date: Thu, 20 Mar 2025 18:12:30 +0000 Subject: [PATCH 19/28] Fix some unrelated options --- .../python/Moore/persistence/particle_moving.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Hlt/Moore/python/Moore/persistence/particle_moving.py b/Hlt/Moore/python/Moore/persistence/particle_moving.py index be55886d527..791bc57de6b 100644 --- a/Hlt/Moore/python/Moore/persistence/particle_moving.py +++ b/Hlt/Moore/python/Moore/persistence/particle_moving.py @@ -71,8 +71,9 @@ def cloning_map(): } -def copy_to_final_location(input, path_components): - """Return an algorithm that copies Particle objects. +def get_final_location(input, path_components): + """ + Determine the final output location from a DataHandle. Args: input (DataHandle): input container to be copied. @@ -92,7 +93,18 @@ def copy_to_final_location(input, path_components): # We will add the suffix in this method to ensure consistency base = os.path.join("/Event", *path_components) output_loc = os.path.join(base, input_type) + return output_loc, input_type + + +def copy_to_final_location(input, path_components): + """Return an algorithm that copies Particle objects. + Args: + input (DataHandle): input container to be copied. + path_components (list of str): Definition of TES path, relative to + '/Event', under which to store copied objects. + """ + output_loc, input_type = get_final_location(input, path_components) # Keep track of forced output locations to make sure we don't write to the # same place twice assert output_loc not in _FORCED_LOCATIONS, ( -- GitLab From c0f6ff8cbe11b8ec25d9c86961794471f6c14f0f Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Thu, 20 Mar 2025 18:24:09 +0000 Subject: [PATCH 20/28] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/53076792 --- Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py | 6 +- .../lines/bnoc/builders/bnoc_isolation.py | 2 +- .../python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py | 342 ++++++++++++++-- .../python/Hlt2Conf/lines/bnoc/spruce_bnoc.py | 369 ++++++++++++++++-- 4 files changed, 638 insertions(+), 81 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py index 9b0999e3683..91d25cb5040 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/isolation.py @@ -42,7 +42,11 @@ def extra_outputs_for_isolation(name, ref_particles, extra_particles, selection) @configurable def extra_outputs_for_relinfo_isolation( - name, ref_particles, extra_particles, selection, variables, + name, + ref_particles, + extra_particles, + selection, + variables, ): FunctorsRelTableAlg = FunctorsToRelTable( InputCandidates=ref_particles, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index e0c4869656e..f4c40b05cd5 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -222,7 +222,7 @@ def make_reltable_for_vertex_isolation( names=[], candidates=[], cut=(F.SQRT @ F.DR2 < 1.5), - Variables=["SMALLEST_REF_ENDVERTEX_IPCHI2"] + Variables=["SMALLEST_REF_ENDVERTEX_IPCHI2"], ): """ Add to the extra_outputs different kind of isolations by properly setting the given flag diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py index 0319a3d34f8..c687efd1da5 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py @@ -495,7 +495,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, "require_GEC": True, "require_topo": True, @@ -511,7 +518,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, "require_GEC": True, "require_topo": True, @@ -527,7 +541,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, "require_GEC": True, "require_topo": True, @@ -543,7 +564,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, "require_GEC": True, "require_topo": True, @@ -559,7 +587,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, "require_GEC": True, "require_topo": True, @@ -575,7 +610,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, "require_GEC": True, "require_topo": True, @@ -591,7 +633,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToPipPimPi0_NoPID_resolved": { @@ -603,7 +652,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToPpPimPi0_NoPID_merged": { @@ -614,7 +670,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToPpPimPi0_NoPID_resolved": { @@ -625,7 +688,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKstzKstzb": { @@ -637,7 +707,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKstzPhi": { @@ -647,7 +724,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKstzPhi_FakeKstDouble": { @@ -658,7 +742,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKstzPhi_FakeKstK": { @@ -669,7 +760,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKstzPhi_FakeKstPi": { @@ -680,7 +778,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKstzPhi_FakePhiDouble": { @@ -691,7 +796,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKstzPhi_FakePhiK": { @@ -702,7 +814,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKstzRho": { @@ -712,7 +831,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKstzRho_FakeKstDouble": { @@ -723,7 +849,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKstzRho_FakeKstK": { @@ -734,7 +867,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKstzRho_FakeKstPi": { @@ -745,7 +885,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKstzRho_FakeRhoDouble": { @@ -756,7 +903,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKstzRho_FakeRhoPi": { @@ -767,7 +921,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToPhiKpKm": { @@ -779,7 +940,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToPhiPhi": { @@ -791,7 +959,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, "iso_kwargs": { "name": "B0", @@ -810,7 +985,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToRhoRho": { @@ -822,7 +1004,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToPpPpPmPm": { @@ -832,7 +1021,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToPpPm": { @@ -842,7 +1038,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BcToKpKpKm_NoPID": { @@ -854,7 +1057,14 @@ isolation_lines = { "VertexIso": False, "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BuToKpKpKm_NoPID": { @@ -868,7 +1078,14 @@ isolation_lines = { "VertexIso": False, "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BuToPpPmKp_NoPID": { @@ -880,7 +1097,14 @@ isolation_lines = { "VertexIso": False, "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToL0KmPip_DD": { @@ -890,7 +1114,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToL0KmPip_LL": { @@ -900,7 +1131,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToL0KpKm_DD": { @@ -910,7 +1148,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToL0KpKm_LL": { @@ -920,7 +1165,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToL0KpPim_DD": { @@ -930,7 +1182,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToL0KpPim_LL": { @@ -940,7 +1199,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, } diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py index bee07ffdd78..5f0e2180a8a 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py @@ -314,7 +314,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKpKpKmPim": { @@ -325,7 +332,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKpKmPipPim": { @@ -336,7 +350,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToPipPipPimPim": { @@ -347,7 +368,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKpPipPimPim": { @@ -359,7 +387,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKsPipPimPi0_NoPID_DD_merged": { @@ -371,7 +406,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKsPipPimPi0_NoPID_DD_resolved": { @@ -383,7 +425,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKsPipPimPi0_NoPID_LL_merged": { @@ -395,7 +444,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToKsPipPimPi0_NoPID_LL_resolved": { @@ -407,7 +463,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToPi0Pi0_merged": { @@ -419,7 +482,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToPi0Pi0_resolved": { @@ -431,7 +501,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToPipPipPimPimPi0_NoPID_merged": { @@ -443,7 +520,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BdsToPipPipPimPimPi0_NoPID_resolved": { @@ -455,7 +539,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BuToKsPipPi0_NoPID_DD_merged": { @@ -466,7 +557,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BuToKsPipPi0_NoPID_DD_resolved": { @@ -477,7 +575,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BuToKsPipPi0_NoPID_LL_merged": { @@ -488,7 +593,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BuToKsPipPi0_NoPID_LL_resolved": { @@ -499,7 +611,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BuToKsPipPipPimPi0_NoPID_DD_merged": { @@ -510,7 +629,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BuToKsPipPipPimPi0_NoPID_DD_resolved": { @@ -521,7 +647,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BuToKsPipPipPimPi0_NoPID_LL_merged": { @@ -532,7 +665,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BuToKsPipPipPimPi0_NoPID_LL_resolved": { @@ -543,7 +683,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BuToPipPipPimPi0_NoPID_merged": { @@ -554,7 +701,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "BuToPipPipPimPi0_NoPID_resolved": { @@ -565,7 +719,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToLmdPipPimPi0_NoPID_DD_merged": { @@ -576,7 +737,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToLmdPipPimPi0_NoPID_DD_resolved": { @@ -587,7 +755,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToLmdPipPimPi0_NoPID_LL_merged": { @@ -598,7 +773,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToLmdPipPimPi0_NoPID_LL_resolved": { @@ -609,7 +791,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToSigma0Phi_LL": { @@ -620,7 +809,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "Lb0ToSigma0Phi_DD": { @@ -631,7 +827,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "XibToLmdPimPi0_NoPID_DD_merged": { @@ -641,7 +844,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "XibToLmdPimPi0_NoPID_DD_resolved": { @@ -651,7 +861,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "XibToLmdPimPi0_NoPID_LL_merged": { @@ -661,7 +878,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "XibToLmdPimPi0_NoPID_LL_resolved": { @@ -671,7 +895,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "XibToLmdPipPimPimPi0_NoPID_DD_merged": { @@ -681,7 +912,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "XibToLmdPipPimPimPi0_NoPID_DD_resolved": { @@ -691,7 +929,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "XibToLmdPipPimPimPi0_NoPID_LL_merged": { @@ -701,7 +946,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "XibToLmdPipPimPimPi0_NoPID_LL_resolved": { @@ -711,7 +963,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "XibmToSigma0Km_LL": { @@ -722,7 +981,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "XibmToSigma0Km_DD": { @@ -733,7 +999,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "XibmToSigma0Pim_LL": { @@ -744,7 +1017,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, "XibmToSigma0Pim_DD": { @@ -755,7 +1035,14 @@ isolation_lines = { "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, - "coneVariables": ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_ASYM_PT", "CONE_DELTA_PHI"], + "coneVariables": [ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_ASYM_PT", + "CONE_DELTA_PHI", + ], }, }, } -- GitLab From 7fc7c3a549892b2ae1edffc73c314b56e35ae432 Mon Sep 17 00:00:00 2001 From: Francesca Date: Fri, 21 Mar 2025 11:27:50 +0000 Subject: [PATCH 21/28] Update options for PhiPhi line --- Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py index c687efd1da5..ca7980c0db7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py @@ -955,7 +955,7 @@ isolation_lines = { "pv_tracks": True, "reltables_kwargs": { "name": "B0", - "coneangles": [1.8], + "coneangles": [1.0, 1.8], "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], "LongTrackIso": True, "NeutralIso": True, @@ -968,12 +968,6 @@ isolation_lines = { "CONE_DELTA_PHI", ], }, - "iso_kwargs": { - "name": "B0", - "coneangle": 1.0, - "NeutralIso": True, - "PiZerosIso": True, - }, "raw_banks": ["VP", "UT", "FT", "Rich", "Muon", "Calo"], }, "BdsToPhiRho": { -- GitLab From ed734530420f44ea1d91f28d936000dac95fac74 Mon Sep 17 00:00:00 2001 From: Francesca Date: Tue, 25 Mar 2025 14:01:36 +0000 Subject: [PATCH 22/28] Add P2InfoRelations isolation extra_outputs into turbospruce unit test --- .../python/Hlt2Conf/lines/test/spruce_test.py | 14 +++++++++++++ .../spruce_turbopass_overlap_check.py | 20 ++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py index e0d2a431c0a..c80bf1425e9 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py @@ -24,6 +24,7 @@ from RecoConf.reconstruction_objects import make_pvs, upfront_reconstruction from RecoConf.standard_particles import ( make_has_rich_long_kaons, make_has_rich_long_pions, + make_long_pions, make_photons, ) from SelAlgorithms.monitoring import histogram_1d, monitor @@ -344,6 +345,10 @@ from Moore.persistence.persistreco import persistreco_line_outputs from RecoConf.reconstruction_objects import reconstruction from Hlt2Conf.lines.topological_b import make_filtered_topo_threebody +from Hlt2Conf.isolation import ( + extra_outputs_for_relinfo_isolation, +) + def threebody_line(name="Hlt2Topo3Body", prescale=1): @@ -354,6 +359,15 @@ def threebody_line(name="Hlt2Topo3Body", prescale=1): ] candidates = make_filtered_topo_threebody(MVACut=0.998) + + extra_objs += extra_outputs_for_relinfo_isolation( + name=name + "_LongTrackIsolation", + extra_particles=make_long_pions(), + ref_particles=candidates, + selection= ~F.FIND_IN_TREE(), + variables= ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_P", "CONE_ASYM_PX", "CONE_ASYM_PY", "CONE_ASYM_PZ", "CONE_ASYM_P", "CONE_ASYM_PT", "CONE_DELTA_ETA", "CONE_DELTA_PHI", "SMALLEST_REF_ENDVERTEX_IPCHI2"], + ) + return Hlt2Line( name=name, algs=[candidates], diff --git a/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py b/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py index 5d8dc294194..eb739b41487 100644 --- a/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py +++ b/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py @@ -208,7 +208,25 @@ for ii in range(nevents): print( f"Selective reco locations propagated. There are {persistreco.size()} {reco}" ) - + + # Check Isolation P2InfoRelations is present + + isorelations = TES[f"/Event/Turbo/{linetwo}/{linetwo}_LongTrackIsolation/P2InfoRelations"].relations() + if not isorelations or isorelations.size() <= 0: + print("Isolation extra_outputs not as expected") + raise RuntimeError( + f"Check ERROR - Isolation Reltables relations not propogated as expected" + ) + elif not isorelations[0].to() or isorelations[0].to().size() != 13: + print("Isolation extra_outputs not as expected") + raise RuntimeError( + f"Check ERROR - Isolation Reltables gives relation table with {isorelations[0].to().size()} variables, expected 13" + ) + else: + print( + f"Isolation P2InfoRelations in extra_outputs locations propagated. There are {isorelations.size()} relations with {isorelations[0].to().size()} variables saved for the first candidate." + ) + # Cannot check absense of CALO objs with linetwo # Check PV tracks -- GitLab From b72f351bc7b325f3b2bc1dabcb33aafc214b854b Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Tue, 25 Mar 2025 14:07:05 +0000 Subject: [PATCH 23/28] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/53274793 --- .../python/Hlt2Conf/lines/test/spruce_test.py | 31 +++++++++++++------ .../spruce_turbopass_overlap_check.py | 18 ++++++----- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py index c80bf1425e9..0565c1bea7d 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py @@ -344,11 +344,10 @@ def Test_extraoutputs_hlt2_line(name="Hlt2Test_ExtraOutputs", prescale=1): from Moore.persistence.persistreco import persistreco_line_outputs from RecoConf.reconstruction_objects import reconstruction -from Hlt2Conf.lines.topological_b import make_filtered_topo_threebody from Hlt2Conf.isolation import ( extra_outputs_for_relinfo_isolation, ) - +from Hlt2Conf.lines.topological_b import make_filtered_topo_threebody def threebody_line(name="Hlt2Topo3Body", prescale=1): @@ -359,14 +358,28 @@ def threebody_line(name="Hlt2Topo3Body", prescale=1): ] candidates = make_filtered_topo_threebody(MVACut=0.998) - + extra_objs += extra_outputs_for_relinfo_isolation( - name=name + "_LongTrackIsolation", - extra_particles=make_long_pions(), - ref_particles=candidates, - selection= ~F.FIND_IN_TREE(), - variables= ["CONE_MULT", "CONE_PX", "CONE_PY", "CONE_PZ", "CONE_P", "CONE_ASYM_PX", "CONE_ASYM_PY", "CONE_ASYM_PZ", "CONE_ASYM_P", "CONE_ASYM_PT", "CONE_DELTA_ETA", "CONE_DELTA_PHI", "SMALLEST_REF_ENDVERTEX_IPCHI2"], - ) + name=name + "_LongTrackIsolation", + extra_particles=make_long_pions(), + ref_particles=candidates, + selection=~F.FIND_IN_TREE(), + variables=[ + "CONE_MULT", + "CONE_PX", + "CONE_PY", + "CONE_PZ", + "CONE_P", + "CONE_ASYM_PX", + "CONE_ASYM_PY", + "CONE_ASYM_PZ", + "CONE_ASYM_P", + "CONE_ASYM_PT", + "CONE_DELTA_ETA", + "CONE_DELTA_PHI", + "SMALLEST_REF_ENDVERTEX_IPCHI2", + ], + ) return Hlt2Line( name=name, diff --git a/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py b/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py index eb739b41487..c32d451f8e2 100644 --- a/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py +++ b/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py @@ -208,14 +208,16 @@ for ii in range(nevents): print( f"Selective reco locations propagated. There are {persistreco.size()} {reco}" ) - + # Check Isolation P2InfoRelations is present - - isorelations = TES[f"/Event/Turbo/{linetwo}/{linetwo}_LongTrackIsolation/P2InfoRelations"].relations() + + isorelations = TES[ + f"/Event/Turbo/{linetwo}/{linetwo}_LongTrackIsolation/P2InfoRelations" + ].relations() if not isorelations or isorelations.size() <= 0: print("Isolation extra_outputs not as expected") raise RuntimeError( - f"Check ERROR - Isolation Reltables relations not propogated as expected" + "Check ERROR - Isolation Reltables relations not propogated as expected" ) elif not isorelations[0].to() or isorelations[0].to().size() != 13: print("Isolation extra_outputs not as expected") @@ -223,10 +225,10 @@ for ii in range(nevents): f"Check ERROR - Isolation Reltables gives relation table with {isorelations[0].to().size()} variables, expected 13" ) else: - print( - f"Isolation P2InfoRelations in extra_outputs locations propagated. There are {isorelations.size()} relations with {isorelations[0].to().size()} variables saved for the first candidate." - ) - + print( + f"Isolation P2InfoRelations in extra_outputs locations propagated. There are {isorelations.size()} relations with {isorelations[0].to().size()} variables saved for the first candidate." + ) + # Cannot check absense of CALO objs with linetwo # Check PV tracks -- GitLab From d8d4be04c6dcf08a1b466bf1469ca20d1c0757b3 Mon Sep 17 00:00:00 2001 From: Francesca Date: Wed, 26 Mar 2025 14:18:04 +0000 Subject: [PATCH 24/28] Revert BnoC line book-keepping code to master, add reltables_kwargs to BdsToPhiPhi line as part of integration tests (decouple these BnoC book-keeping changes from more technical MR here) --- .../python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py | 644 +++--------------- .../python/Hlt2Conf/lines/bnoc/spruce_bnoc.py | 622 ++++------------- 2 files changed, 202 insertions(+), 1064 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py index ca7980c0db7..cf6bad15277 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/hlt2_bnoc.py @@ -146,6 +146,12 @@ default_lines = [ "BuToPpPpDeutm", "BuToPpPpPmPmKp", "BuToPpPpPmPmPip", + "Lb0ToL0KmPip_DD", + "Lb0ToL0KmPip_LL", + "Lb0ToL0KpKm_DD", + "Lb0ToL0KpKm_LL", + "Lb0ToL0KpPim_DD", + "Lb0ToL0KpPim_LL", "Lb0ToL0KS_DDDD", "Lb0ToL0KS_DDLL", "Lb0ToL0KS_LLDD", @@ -284,6 +290,16 @@ default_lines = [ # Lines with applied prescale prescale_lines = { + "BdsToKstzPhi_FakeKstDouble": {"prescale": 0.1}, + "BdsToKstzPhi_FakeKstK": {"prescale": 0.1}, + "BdsToKstzPhi_FakeKstPi": {"prescale": 0.1}, + "BdsToKstzPhi_FakePhiDouble": {"prescale": 0.1}, + "BdsToKstzPhi_FakePhiK": {"prescale": 0.1}, + "BdsToKstzRho_FakeKstDouble": {"prescale": 0.1}, + "BdsToKstzRho_FakeKstK": {"prescale": 0.1}, + "BdsToKstzRho_FakeKstPi": {"prescale": 0.1}, + "BdsToKstzRho_FakeRhoDouble": {"prescale": 0.1}, + "BdsToKstzRho_FakeRhoPi": {"prescale": 0.1}, "BuToPpPpDeutm_SS": {"prescale": 0.1}, } @@ -464,8 +480,19 @@ flavour_tagging_lines = { # 0.1 that all the below lines currently use (see # flavour_tagging_gec_topo_lines for examples) gec_topo_lines = { + "BcToKpKpKm_NoPID": {"require_GEC": True, "require_topo": True}, "BcToL0barPp_DD": {"require_GEC": True, "require_topo": True}, "BcToL0barPp_LL": {"require_GEC": True, "require_topo": True}, + "BuToKpKpKm_NoPID": { + "require_GEC": True, + "require_topo": True, + "min_twobody_mva": 0.13, + "min_threebody_mva": 0.13, + }, + "BuToPpPmKp_NoPID": { + "require_GEC": True, + "require_topo": True, + }, "BuToKSPpPmPip_DD": { "require_GEC": True, "require_topo": True, @@ -489,20 +516,11 @@ isolation_lines = { "BdsToKSKpKm_DD": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, "require_GEC": True, "require_topo": True, @@ -512,20 +530,11 @@ isolation_lines = { "BdsToKSKpKm_LL": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, "require_GEC": True, "require_topo": True, @@ -535,20 +544,11 @@ isolation_lines = { "BdsToKSKpPim_DD": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, "require_GEC": True, "require_topo": True, @@ -558,20 +558,11 @@ isolation_lines = { "BdsToKSKpPim_LL": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, "require_GEC": True, "require_topo": True, @@ -581,20 +572,11 @@ isolation_lines = { "BdsToKSPipPim_DD": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, "require_GEC": True, "require_topo": True, @@ -604,20 +586,11 @@ isolation_lines = { "BdsToKSPipPim_LL": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, "require_GEC": True, "require_topo": True, @@ -627,332 +600,86 @@ isolation_lines = { "BdsToPipPimPi0_NoPID_merged": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToPipPimPi0_NoPID_resolved": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "Lb0ToPpPimPi0_NoPID_merged": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "Lambda_b0", - "coneangles": [1.0], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "Lb0ToPpPimPi0_NoPID_resolved": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "Lambda_b0", - "coneangles": [1.0], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToKstzKstzb": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B_s0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToKstzPhi": { - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "BdsToKstzPhi_FakeKstDouble": { - "prescale": 0.1, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "BdsToKstzPhi_FakeKstK": { - "prescale": 0.1, - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "BdsToKstzPhi_FakeKstPi": { - "prescale": 0.1, - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "BdsToKstzPhi_FakePhiDouble": { - "prescale": 0.1, - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "BdsToKstzPhi_FakePhiK": { - "prescale": 0.1, - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToKstzRho": { - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "BdsToKstzRho_FakeKstDouble": { - "prescale": 0.1, - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "BdsToKstzRho_FakeKstK": { - "prescale": 0.1, - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "BdsToKstzRho_FakeKstPi": { - "prescale": 0.1, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "BdsToKstzRho_FakeRhoDouble": { - "prescale": 0.1, - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "BdsToKstzRho_FakeRhoPi": { - "prescale": 0.1, - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToPhiKpKm": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToPhiPhi": { "flavour_tagging": True, "pv_tracks": True, + "iso_kwargs": { + "name": "B0", + "coneangle": 1.0, + "NeutralIso": True, + "PiZerosIso": True, + }, "reltables_kwargs": { "name": "B0", "coneangles": [1.0, 1.8], @@ -973,234 +700,37 @@ isolation_lines = { "BdsToPhiRho": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B_s0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToRhoRho": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToPpPpPmPm": { - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToPpPm": { - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "BcToKpKpKm_NoPID": { - "require_GEC": True, - "require_topo": True, - "reltables_kwargs": { - "name": "B+", - "coneangles": [1.0, 1.5, 2.0], - "VertexIso": False, - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "BuToKpKpKm_NoPID": { - "require_GEC": True, - "require_topo": True, - "min_twobody_mva": 0.13, - "min_threebody_mva": 0.13, - "reltables_kwargs": { - "name": "B+", - "coneangles": [1.0, 1.5, 2.0], - "VertexIso": False, - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "BuToPpPmKp_NoPID": { - "require_GEC": True, - "require_topo": True, - "reltables_kwargs": { - "name": "B+", - "coneangles": [1.0, 1.5, 2.0], - "VertexIso": False, - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "Lb0ToL0KmPip_DD": { - "reltables_kwargs": { - "name": "Lambda_b0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "Lb0ToL0KmPip_LL": { - "reltables_kwargs": { - "name": "Lambda_b0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "Lb0ToL0KpKm_DD": { - "reltables_kwargs": { - "name": "Lambda_b0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "Lb0ToL0KpKm_LL": { - "reltables_kwargs": { - "name": "Lambda_b0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "Lb0ToL0KpPim_DD": { - "reltables_kwargs": { - "name": "Lambda_b0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, - }, - "Lb0ToL0KpPim_LL": { - "reltables_kwargs": { - "name": "Lambda_b0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, } diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py index 5f0e2180a8a..e36cd07b5f9 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/spruce_bnoc.py @@ -303,746 +303,354 @@ default_lines = [ "BuTopipipipipi", ] -flavour_tagging_lines = {} - -isolation_lines = { +flavour_tagging_lines = { "BdsToKpKpKmKm": { "pv_tracks": True, - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, }, "BdsToKpKpKmPim": { "pv_tracks": True, - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, }, "BdsToKpKmPipPim": { "pv_tracks": True, - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, }, "BdsToPipPipPimPim": { "pv_tracks": True, - "reltables_kwargs": { - "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, - "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], - }, }, +} + +isolation_lines = { "BdsToKpPipPimPim": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToKsPipPimPi0_NoPID_DD_merged": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToKsPipPimPi0_NoPID_DD_resolved": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToKsPipPimPi0_NoPID_LL_merged": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToKsPipPimPi0_NoPID_LL_resolved": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToPi0Pi0_merged": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.5, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToPi0Pi0_resolved": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.5, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToPipPipPimPimPi0_NoPID_merged": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BdsToPipPipPimPimPi0_NoPID_resolved": { "flavour_tagging": True, "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BuToKsPipPi0_NoPID_DD_merged": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B+", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BuToKsPipPi0_NoPID_DD_resolved": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B+", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BuToKsPipPi0_NoPID_LL_merged": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B+", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BuToKsPipPi0_NoPID_LL_resolved": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B+", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BuToKsPipPipPimPi0_NoPID_DD_merged": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B+", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BuToKsPipPipPimPi0_NoPID_DD_resolved": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B+", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BuToKsPipPipPimPi0_NoPID_LL_merged": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B+", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BuToKsPipPipPimPi0_NoPID_LL_resolved": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B+", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BuToPipPipPimPi0_NoPID_merged": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B+", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "BuToPipPipPimPi0_NoPID_resolved": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "B+", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "Lb0ToLmdPipPimPi0_NoPID_DD_merged": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "Lambda_b0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "Lb0ToLmdPipPimPi0_NoPID_DD_resolved": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "Lambda_b0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "Lb0ToLmdPipPimPi0_NoPID_LL_merged": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "Lambda_b0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "Lb0ToLmdPipPimPi0_NoPID_LL_resolved": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "Lambda_b0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "Lb0ToSigma0Phi_LL": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "Lambda_b0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "Lb0ToSigma0Phi_DD": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "Lambda_b0", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "XibToLmdPimPi0_NoPID_DD_merged": { - "reltables_kwargs": { + "iso_kwargs": { "name": "Xi_b-", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "XibToLmdPimPi0_NoPID_DD_resolved": { - "reltables_kwargs": { + "iso_kwargs": { "name": "Xi_b-", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "XibToLmdPimPi0_NoPID_LL_merged": { - "reltables_kwargs": { + "iso_kwargs": { "name": "Xi_b-", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "XibToLmdPimPi0_NoPID_LL_resolved": { - "reltables_kwargs": { + "iso_kwargs": { "name": "Xi_b-", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "XibToLmdPipPimPimPi0_NoPID_DD_merged": { - "reltables_kwargs": { + "iso_kwargs": { "name": "Xi_b-", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "XibToLmdPipPimPimPi0_NoPID_DD_resolved": { - "reltables_kwargs": { + "iso_kwargs": { "name": "Xi_b-", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "XibToLmdPipPimPimPi0_NoPID_LL_merged": { - "reltables_kwargs": { + "iso_kwargs": { "name": "Xi_b-", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "XibToLmdPipPimPimPi0_NoPID_LL_resolved": { - "reltables_kwargs": { + "iso_kwargs": { "name": "Xi_b-", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "XibmToSigma0Km_LL": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "Xi_b-", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "XibmToSigma0Km_DD": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "Xi_b-", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "XibmToSigma0Pim_LL": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "Xi_b-", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, "XibmToSigma0Pim_DD": { "pv_tracks": True, - "reltables_kwargs": { + "iso_kwargs": { "name": "Xi_b-", - "coneangles": [1.0, 1.5], - "vertexIsoVariables": ["SMALLEST_REF_ENDVERTEX_IPCHI2"], - "LongTrackIso": True, + "coneangle": 1.0, "NeutralIso": True, - "coneVariables": [ - "CONE_MULT", - "CONE_PX", - "CONE_PY", - "CONE_PZ", - "CONE_ASYM_PT", - "CONE_DELTA_PHI", - ], + "PiZerosIso": True, }, }, } -- GitLab From 4687b2b4f150d03f8361e74ab2ca56fa7d4ec627 Mon Sep 17 00:00:00 2001 From: Francesca Date: Wed, 26 Mar 2025 15:38:59 +0000 Subject: [PATCH 25/28] Quick tidy of bnoc_isolation --- .../Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index f4c40b05cd5..92c76e186fb 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -148,7 +148,7 @@ def make_reltable_for_cone_isolation( """ Add to the extra_outputs different kind of isolations by properly setting the given flag Args: - names: List of names for reference particles and label for coneangle + names: List of names for reference particles candidates: List of containers of reference particles to relate extra particles cut: Predicate to select extra tracks used in computation of isolation information for a given table LongTrackIso: Boolean value to make isolation with long tracks @@ -157,8 +157,7 @@ def make_reltable_for_cone_isolation( UpstreamTrackIso: Boolean value to make isolation with upstream tracks NeutralIso: Boolean value to make isolation with neutral particles PiZerosIso: Boolean value to make isolation with merged pi0 -> gamma gamma - wantConeAsym: Boolean value to compute cone asymmetry variables additionally - wantConeDelta: Boolean value to compute cone delta variables additionally + Variables: List of variable names to be included, see definition at Rec/Phys/RelatedInfoTools/include/Phys/RelatedInfoFunctors.h """ extra_outputs = [] assert len(names) == len(candidates), ( @@ -227,9 +226,10 @@ def make_reltable_for_vertex_isolation( """ Add to the extra_outputs different kind of isolations by properly setting the given flag Args: - names: List of names for reference particles and label for coneangle + names: List of names for reference particles candidates: List of containers of reference particles to relate extra particles cut: Predicate to select extra tracks used in computation of isolation information for a given table + Variables: List of variable names to be included, see definition at Rec/Phys/RelatedInfoTools/include/Phys/RelatedInfoFunctors.h """ extra_outputs = [] assert len(names) == len(candidates), ( @@ -253,7 +253,6 @@ def make_iso_reltables( line_alg, name="B", coneangles=[1.0], - VertexIso=False, LongTrackIso=False, TTrackIso=False, DownstreamTrackIso=False, -- GitLab From 8feaa3565ab760a831d0e4c810e1a03bd64ade26 Mon Sep 17 00:00:00 2001 From: Francesca Date: Wed, 26 Mar 2025 15:55:30 +0000 Subject: [PATCH 26/28] Add new CONE_E variables to TurboSpruce unit test --- Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py | 2 ++ .../tests/options/sprucing/spruce_turbopass_overlap_check.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py index 0565c1bea7d..4278c371f39 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py @@ -369,10 +369,12 @@ def threebody_line(name="Hlt2Topo3Body", prescale=1): "CONE_PX", "CONE_PY", "CONE_PZ", + "CONE_E", "CONE_P", "CONE_ASYM_PX", "CONE_ASYM_PY", "CONE_ASYM_PZ", + "CONE_ASYM_E", "CONE_ASYM_P", "CONE_ASYM_PT", "CONE_DELTA_ETA", diff --git a/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py b/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py index c32d451f8e2..84e274832b8 100644 --- a/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py +++ b/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py @@ -219,10 +219,10 @@ for ii in range(nevents): raise RuntimeError( "Check ERROR - Isolation Reltables relations not propogated as expected" ) - elif not isorelations[0].to() or isorelations[0].to().size() != 13: + elif not isorelations[0].to() or isorelations[0].to().size() != 15: print("Isolation extra_outputs not as expected") raise RuntimeError( - f"Check ERROR - Isolation Reltables gives relation table with {isorelations[0].to().size()} variables, expected 13" + f"Check ERROR - Isolation Reltables gives relation table with {isorelations[0].to().size()} variables, expected 15" ) else: print( -- GitLab From b533c167d0f4b02c83769aa4dfa1ca027f06e1c5 Mon Sep 17 00:00:00 2001 From: Francesca Date: Wed, 26 Mar 2025 16:18:37 +0000 Subject: [PATCH 27/28] Add another missing variable for completeness --- Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py | 1 + .../options/sprucing/spruce_turbopass_overlap_check.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py index 4278c371f39..d673e044af0 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py @@ -371,6 +371,7 @@ def threebody_line(name="Hlt2Topo3Body", prescale=1): "CONE_PZ", "CONE_E", "CONE_P", + "CONE_PT", "CONE_ASYM_PX", "CONE_ASYM_PY", "CONE_ASYM_PZ", diff --git a/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py b/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py index 84e274832b8..0a6a24e4c0a 100644 --- a/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py +++ b/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py @@ -219,10 +219,10 @@ for ii in range(nevents): raise RuntimeError( "Check ERROR - Isolation Reltables relations not propogated as expected" ) - elif not isorelations[0].to() or isorelations[0].to().size() != 15: - print("Isolation extra_outputs not as expected") + elif not isorelations[0].to() or isorelations[0].to().size() != 16: + print("Isolation extra_outputs not as expected") raise RuntimeError( - f"Check ERROR - Isolation Reltables gives relation table with {isorelations[0].to().size()} variables, expected 15" + f"Check ERROR - Isolation Reltables gives relation table with {isorelations[0].to().size()} variables, expected 16" ) else: print( -- GitLab From 38e232756861ac4f629ee7e98097499b05dc3c3e Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Wed, 26 Mar 2025 16:19:55 +0000 Subject: [PATCH 28/28] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/53347054 --- .../python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py | 2 +- .../tests/options/sprucing/spruce_turbopass_overlap_check.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py index 92c76e186fb..5e0cc6384bf 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/bnoc_isolation.py @@ -226,7 +226,7 @@ def make_reltable_for_vertex_isolation( """ Add to the extra_outputs different kind of isolations by properly setting the given flag Args: - names: List of names for reference particles + names: List of names for reference particles candidates: List of containers of reference particles to relate extra particles cut: Predicate to select extra tracks used in computation of isolation information for a given table Variables: List of variable names to be included, see definition at Rec/Phys/RelatedInfoTools/include/Phys/RelatedInfoFunctors.h diff --git a/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py b/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py index 0a6a24e4c0a..b7f3958eaf0 100644 --- a/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py +++ b/Hlt/Hlt2Conf/tests/options/sprucing/spruce_turbopass_overlap_check.py @@ -220,7 +220,7 @@ for ii in range(nevents): "Check ERROR - Isolation Reltables relations not propogated as expected" ) elif not isorelations[0].to() or isorelations[0].to().size() != 16: - print("Isolation extra_outputs not as expected") + print("Isolation extra_outputs not as expected") raise RuntimeError( f"Check ERROR - Isolation Reltables gives relation table with {isorelations[0].to().size()} variables, expected 16" ) -- GitLab