From d67bb1af1a94b839134ba26d3a151a8a57f4e2eb Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 27 Jan 2025 12:31:51 +0100 Subject: [PATCH 01/22] Squashed commit of the following: commit 911d563fa5ff5cc29e45a0de12581cb0c0d7bbbe Author: Tommaso Fulghesu Date: Sun Jan 19 21:44:27 2025 +0100 Use only extra tracks not duplicated commit 994edab40900403a22fe7bef328f50f1a807b58d Author: Gitlab CI Date: Thu Jan 16 11:09:36 2025 +0000 Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/49414770 commit 45e8c3083f3d73a8acb036d3ec162fb09f55fcf6 Author: Tommaso Fulghesu Date: Thu Jan 16 12:08:52 2025 +0100 Fix linting commit 253950879e5ecf060da05a8f32609106848e2af6 Author: Tommaso Fulghesu Date: Thu Jan 16 09:58:47 2025 +0100 Fix linting commit 6cbb3e35f78d6400546f1c8ac4977521abb2a0ae Author: Gitlab CI Date: Thu Jan 16 08:55:20 2025 +0000 Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/49406999 commit 254abca33da46311565c3e6b5f833c88ebcbc7cf Author: Tommaso Fulghesu Date: Thu Jan 16 09:54:42 2025 +0100 Fix linting and returned value for legacy name case commit de9b7d10f94dedb092a3908435685aa8ebfee919 Author: Tommaso Fulghesu Date: Thu Jan 16 09:29:18 2025 +0100 Test fixing linting commit 7b4ea77fd924c664f856929f1f4788af9fad6193 Author: Tommaso Fulghesu Date: Wed Jan 15 22:33:47 2025 +0100 Fix linting commit c7cd83d32ff493534812f711e7a0ccde3aa098b3 Author: Tommaso Fulghesu Date: Wed Jan 15 22:28:19 2025 +0100 Rebase and add new isolation to other lines --- .../lines/semileptonic/isolationMVA.py | 69 +- .../lines/semileptonic/line_naming.py | 4 +- .../lines/semileptonic/spruce_semileptonic.py | 2534 +++++++++++------ .../Moore/persistence/particle_moving.py | 19 +- 4 files changed, 1731 insertions(+), 895 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py index b17f6c47829..40669c13488 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py @@ -11,9 +11,11 @@ import math import re from dataclasses import dataclass - -import Functors as F -import Functors.math as fmath +from PyConf.Algorithms import MVAWeightedRelTableAlg, SelectionFromWeightedRelationTable +from SelAlgorithms.monitoring import monitor, histogram_1d +from RecoConf.standard_particles import make_has_rich_long_pions +from RecoConf.standard_particles import make_has_rich_up_pions +from RecoConf.standard_particles import make_has_rich_down_pions from DaVinciTools import SubstitutePID from Moore.monitoring import run_default_monitoring from PyConf.Algorithms import ThOrParticleSelection @@ -296,17 +298,21 @@ def extract_parent_name(line_name: str) -> (str, str): def prepare_MVA( - line_name: str, - line_output: ParticleCombiner, - *, # All further options must be given as keyword arguments - mva_min: float = None, - parent: str = "", - anti_parent: str = "", - mva_used: str = "inclusive", - apply_fiducial_cut: bool = True, -) -> (ThOrParticleSelection, [monitor]): - new_parent_name = "B*+" - anti_new_parent_name = "B*-" + line_name: str, + line_output: ParticleCombiner, + *, #All further options must be given as keyword arguments + mva_min: float = None, + parent: str = "", + anti_parent: str = "", + mva_used: str = "inclusive", + apply_fiducial_cut: bool = True, + persist_b_iso_relations: bool = True, + persist_bst_iso_relations: bool = True +) -> (MVAWeightedRelTableAlg, MVAWeightedRelTableAlg, + SelectionFromWeightedRelationTable, [monitor]): + + new_parent_name = 'B*+' + anti_new_parent_name = 'B*-' if not parent and not anti_parent: parent_name, anti_parent_name = extract_parent_name(line_name) @@ -365,19 +371,22 @@ def prepare_MVA( Bst_z, F.FILTER(MVA_cut_functor), name=f"filter_isoPions_{line_name}" ) # B + extra track combos passing the MVA cuts - monitoring_histos = ( - [monitor(data=Bst_z, histograms=input_monitoring + [monitoring_histo])] - if run_default_monitoring() - else [] - ) - - extra_track_cut = F.IS_ABS_ID("pi+") - code_extra_track = F.FILTER(extra_track_cut) @ F.GET_CHILDREN() - return ( - ThOrParticleSelection( - name=f"extra_track_selection_{line_name}", - InputParticles=Bst_z_subset, - Functor=code_extra_track, - ).OutputSelection, - monitoring_histos, - ) + ## Algo that contains the relations between signal, extra track and isolation MVA score + iso_relations_alg = MVAWeightedRelTableAlg( + name=f"{line_name}", + CompositeSelection=Bst_z_subset, + SignalSelection=line_output, + MVAFunctor=MVA_functor) + b_iso_relations = iso_relations_alg.BOutputRelations + bst_iso_relations = iso_relations_alg.BstOutputRelations + + extra_tracks = SelectionFromWeightedRelationTable( + InputRelations=bst_iso_relations).OutputLocation + + monitoring_histos = ([ + monitor(data=Bst_z, histograms=input_monitoring + [monitoring_histo]) + ] if run_default_monitoring() else []) + + return (b_iso_relations if persist_b_iso_relations else None, + bst_iso_relations if persist_bst_iso_relations else None, + extra_tracks, monitoring_histos) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/line_naming.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/line_naming.py index 8f865da95bc..49f023bff3a 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/line_naming.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/line_naming.py @@ -108,6 +108,8 @@ def map_line_name(line_name, legacy_name=False): """ if legacy_name: - line_name = line_name_mapping.get(line_name, "UnknownLineName") + line_name = line_name_mapping.get( + line_name, line_name + ) # If the line was not changed before 2025 data taking, use the same name return line_name.replace("Spruce", "Hlt2") diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index abd1ce4b4b9..2f7f63b1906 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -146,31 +146,20 @@ from .HbToHuLNu import ( make_lbtopmunu_ss_fakep, ) from .HbToLLLNu import ( - make_b2eeenu, - make_b2eeenu_ss, - make_b2egammanu_cnvdd, - make_b2egammanu_cnvll, - make_b2emumunu, - make_b2emumunu_ss, - make_b2mueenu, - make_b2mueenu_ss, - make_b2mugammanu_cnvdd, - make_b2mugammanu_cnvll, - make_b2mumumunu, - make_b2mumumunu_ss, - make_b2taueenu_3pi, - make_b2taueenu_3pi_ss, - make_b2taumumunu_3pi, - make_b2taumumunu_3pi_ss, -) -from .HbToTauNu_BTracking import ( - get_btracking_extra_outputs_for_spruce, - get_btracking_hlt2_particles_for_sprucing, - get_btracking_raw_banks, - make_spruce_filtered_btracking_parts, -) -from .isolationMVA import prepare_MVA -from .pv_tracks import get_pv_tracks_for_bstar + make_b2mumumunu, make_b2emumunu, make_b2mueenu, make_b2eeenu, + make_b2mugammanu_cnvll, make_b2mugammanu_cnvdd, make_b2egammanu_cnvll, + make_b2egammanu_cnvdd, make_b2taumumunu_3pi, make_b2taueenu_3pi, + make_b2mumumunu_ss, make_b2emumunu_ss, make_b2mueenu_ss, make_b2eeenu_ss, + make_b2taumumunu_3pi_ss, make_b2taueenu_3pi_ss) +from .HbToHbprimeLNu import make_bctobsx +from .HbToTauNu_BTracking import (get_btracking_hlt2_particles_for_sprucing, + get_btracking_raw_banks, + make_spruce_filtered_btracking_parts, + get_btracking_extra_outputs_for_spruce) +from RecoConf.standard_particles import (make_photons, make_resolved_pi0s, + make_merged_pi0s) +from RecoConf.algorithms_thor import ParticleContainersMerger +from PyConf.dataflow import DataHandle PROCESS = "spruce" spruce_lines = {} @@ -183,6 +172,31 @@ def get_neutral_tracks(): return ParticleContainersMerger(saved_tracks, name="extra_track_combiner") +def set_extra_outputs(name, b_iso_relations, bst_iso_relations, extra_tracks, + extra_neutrals) -> DataHandle: + """Set the extra output for the line. + + Args: + name (str): Name of the line. + b_iso_relations: Relations for signal candidate. + bst_iso_relations: Relations for combination of signal candidate and extra track. + extra_tracks: Extra tracks. + extra_neutrals: Neutral particles. + + Returns: + List for extra output. + """ + extra_output = [(f"{name}_extra_tracks", extra_tracks), + (f"{name}_extra_neutrals", extra_neutrals)] + if b_iso_relations is not None: + extra_output += [(f"{name}_signal_iso_relations", b_iso_relations)] + if bst_iso_relations is not None: + extra_output += [(f"{name}_combination_iso_relations", + bst_iso_relations)] + + return extra_output + + @register_line_builder(spruce_lines) def spruce_bptod0taunu_d0tokpipipi_tautopipipinu_line( name="SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToPiPiPiNu", @@ -194,7 +208,11 @@ def spruce_bptod0taunu_d0tokpipipi_tautopipipinu_line( SL Spruce line for the decay B+ -> D~0 tau+, D~0 -> K- Pi- Pi+ Pi+, hadronic tau decay. """ line_alg = make_bptod0taunu_d0tok3pi_tautopipipinu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -203,6 +221,10 @@ def spruce_bptod0taunu_d0tokpipipi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -212,10 +234,7 @@ def spruce_bptod0taunu_d0tokpipipi_tautopipipinu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -231,15 +250,25 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( """ SL Spruce line for the decay Bc -> J/psi(1S)(-> mu mu) tau(-> mu nu nu) nu. """ - line_alg = make_bctojpsitaunu_jpsitomumu_tautolnunu(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctojpsitaunu_jpsitomumu_tautolnunu( + process=PROCESS, lepton="mu") + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() + hlt2_name = map_line_name(name, legacy_name=legacy_name) + line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True ) - hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -250,36 +279,39 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], - algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, - monitoring_variables=_MONITORING_VARIABLES, - ) + extra_outputs=extra_outputs_iso, + algs=sl_line_prefilter() + [line_alg] + line_mon, + monitoring_variables=_MONITORING_VARIABLES) @register_line_builder(spruce_lines) def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( - name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", - prescale=0.5, - persistreco=False, - legacy_name=False, -): + name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_FakeMuon", + prescale=0.5, + persistreco=False, + legacy_name=False): """ SL Spruce line for the decay Bc -> J/psi(1S)(-> mu mu) tau(-> mu nu nu) nu, with a fake muon. """ line_alg = make_bctojpsitaunu_jpsitomumu_tautolnunu_fakelepton( - process=PROCESS, lepton="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, lepton="mu") + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() + hlt2_name = map_line_name(name, legacy_name=legacy_name) + line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True ) - hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -288,13 +320,9 @@ def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], - algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, - monitoring_variables=_MONITORING_VARIABLES, - ) + extra_outputs=extra_outputs_iso, + algs=sl_line_prefilter() + [line_alg] + line_mon, + monitoring_variables=_MONITORING_VARIABLES) @register_line_builder(spruce_lines) @@ -345,15 +373,24 @@ def spruce_b0todptaunu_dptokpipi_tautomununu_line( """ SL Spruce line for the decay B0 -> D+(-> K pi pi) tau(-> mu nu nu) nu. """ - line_alg = make_b0todptaunu_dptokpipi_tautolnunu(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_b0todptaunu_dptokpipi_tautolnunu( + process=PROCESS, lepton="mu") + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() + hlt2_name = map_line_name(name, legacy_name=legacy_name) + line_mon = generate_default_monitoring_vars( - name, line_alg, charged=False, charmed=True - ) + name, line_alg, charged=True, charmed=True) - hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -368,9 +405,9 @@ def spruce_b0todptaunu_dptokpipi_tautomununu_line( ], prescale=prescale, persistreco=persistreco, - algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, - monitoring_variables=_MONITORING_VARIABLES, - ) + extra_outputs=extra_outputs_iso, + algs=sl_line_prefilter() + [line_alg] + line_mon, + monitoring_variables=_MONITORING_VARIABLES) @register_line_builder(spruce_lines) @@ -384,9 +421,13 @@ def spruce_b0todptaunu_dptokpipi_fakemuon_line( SL Spruce line for the decay B0 -> D+(-> K pi pi) tau(-> mu nu nu) nu, with a fake muon. """ line_alg = make_b0todptaunu_dptokpipi_tautolnunu_fakelepton( - process=PROCESS, lepton="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, lepton="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -395,6 +436,10 @@ def spruce_b0todptaunu_dptokpipi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -402,10 +447,7 @@ def spruce_b0todptaunu_dptokpipi_fakemuon_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -459,8 +501,13 @@ def spruce_butod0taunu_d0tokpi_tautomununu_line( """ SL Spruce line for the decay B+ -> D0(-> K pi) tau(-> mu nu nu) nu. """ - line_alg = make_butod0taunu_d0tokpi_tautolnunu(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_butod0taunu_d0tokpi_tautolnunu( + process=PROCESS, lepton="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -469,6 +516,10 @@ def spruce_butod0taunu_d0tokpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -477,10 +528,7 @@ def spruce_butod0taunu_d0tokpi_tautomununu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -498,9 +546,12 @@ def spruce_butod0taunu_d0tokpi_fakemuon_line( SL Spruce line for the decay B+ -> D0(-> K pi) tau(-> mu nu nu) nu, with a fake muon. """ line_alg = make_butod0taunu_d0tokpi_tautolnunu_fakelepton( - process=PROCESS, lepton="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, lepton="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -509,16 +560,17 @@ def spruce_butod0taunu_d0tokpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -573,8 +625,13 @@ def spruce_butod0taunu_d0tok3pi_tautomununu_line( """ SL Spruce line for the decay B+ -> D0(-> K pi pi pi) tau(-> mu nu nu) nu. """ - line_alg = make_butod0taunu_d0tok3pi_tautolnunu(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_butod0taunu_d0tok3pi_tautolnunu( + process=PROCESS, lepton="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -583,6 +640,10 @@ def spruce_butod0taunu_d0tok3pi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -592,10 +653,7 @@ def spruce_butod0taunu_d0tok3pi_tautomununu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -612,9 +670,12 @@ def spruce_butod0taunu_d0tok3pi_fakemuon_line( SL Spruce line for the decay B+ -> D0(-> K pi pi pi) tau(-> mu nu nu) nu, with a fake muon. """ line_alg = make_butod0taunu_d0tok3pi_tautolnunu_fakelepton( - process=PROCESS, lepton="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, lepton="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -623,16 +684,17 @@ def spruce_butod0taunu_d0tok3pi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -687,8 +749,14 @@ def spruce_bstodstaunu_dstokkpi_tautomununu_line( """ SL Spruce line for the decay Bs0 -> Ds-(-> K K pi) tau+(-> mu nu nu) nu, and combinatorial (same sign). """ - line_alg = make_bstodstaunu_dstokkpi_tautolnunu(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bstodstaunu_dstokkpi_tautolnunu( + process=PROCESS, lepton="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -697,6 +765,10 @@ def spruce_bstodstaunu_dstokkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -706,10 +778,7 @@ def spruce_bstodstaunu_dstokkpi_tautomununu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -726,9 +795,13 @@ def spruce_bstodstaunu_dstokkpi_fakemuon_line( SL Spruce line for the decay Bs0 -> Ds-(-> K K pi) tau+(-> mu nu nu) nu and combinatorial (same sign), with a fake muon. """ line_alg = make_bstodstaunu_dstokkpi_tautolnunu_fakelepton( - process=PROCESS, lepton="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, lepton="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -737,15 +810,16 @@ def spruce_bstodstaunu_dstokkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, @@ -802,7 +876,11 @@ def spruce_lbtolcmunu_lctopkpi_line( SL Spruce line for the decay Lb0 -> Lc+(-> p K pi) mu nu. """ line_alg = make_lbtolclnu_lctopkpi(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -811,6 +889,10 @@ def spruce_lbtolcmunu_lctopkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -820,10 +902,7 @@ def spruce_lbtolcmunu_lctopkpi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -840,7 +919,11 @@ def spruce_lbtolcmunu_lctopkpi_fakemuon_line( SL Spruce line for the decay Lb0 -> Lc+(-> p K pi) mu nu, with a fake muon. """ line_alg = make_lbtolclnu_lctopkpi_fakelepton(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -849,16 +932,17 @@ def spruce_lbtolcmunu_lctopkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -914,7 +998,11 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_line( SL Spruce line for the decay Lb0 -> Lc+(-> p K pi) tau-(-> mu nu nu) nu. """ line_alg = make_lbtolctaunu_lctopkpi_tautolnu(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -923,6 +1011,10 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -931,10 +1023,7 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -952,9 +1041,12 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_fakemuon_line( SL Spruce line for the decay Lb0 -> Lc+(-> p K pi) tau-(-> mu nu nu) nu, with a fake muon. """ line_alg = make_lbtolctaunu_lctopkpi_tautolnu_fakelepton( - process=PROCESS, lepton="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, lepton="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -963,16 +1055,17 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1028,7 +1121,11 @@ def spruce_bctojpsimunu_jpsitomumu_line( SL Spruce line for the decay Bc+ -> Jpsi(-> mu mu) mu nu. """ line_alg = make_bctojpsilnu_jpsitomumu(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1037,6 +1134,10 @@ def spruce_bctojpsimunu_jpsitomumu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -1046,10 +1147,7 @@ def spruce_bctojpsimunu_jpsitomumu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -1065,8 +1163,13 @@ def spruce_bctojpsimunu_jpsitomumu_fakemuon_line( """ SL Spruce line for the decay Bc+ -> Jpsi(-> mu mu) mu nu, with a fake muon. """ - line_alg = make_bctojpsilnu_jpsitomumu_fakelepton(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctojpsilnu_jpsitomumu_fakelepton( + process=PROCESS, lepton="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1075,6 +1178,10 @@ def spruce_bctojpsimunu_jpsitomumu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -1082,10 +1189,7 @@ def spruce_bctojpsimunu_jpsitomumu_fakemuon_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -1140,7 +1244,11 @@ def spruce_butod0munu_d0tokpi_line( SL Spruce line for the decay B(c)+ -> D0(-> K pi) mu nu. """ line_alg = make_butod0lnu_d0tokpi(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) @@ -1150,6 +1258,10 @@ def spruce_butod0munu_d0tokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1159,11 +1271,7 @@ def spruce_butod0munu_d0tokpi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ] - + extra_PV_tracks, + extra_outputs=extra_outputs_iso + extra_PV_tracks, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -1180,16 +1288,23 @@ def spruce_butod0munu_d0tokpi_fakemuon_line( SL Spruce line for the decay B(c)+ -> D0(-> K pi) mu nu, with a fake muon. """ line_alg = make_butod0lnu_d0tokpi_fakelepton(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) - line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True ) hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1197,11 +1312,7 @@ def spruce_butod0munu_d0tokpi_fakemuon_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ] - + extra_PV_tracks, + extra_outputs=extra_outputs_iso + extra_PV_tracks, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -1255,7 +1366,11 @@ def spruce_butod0enu_d0tokpi_line( SL Spruce line for the decay B(c)+ -> D0(-> K pi) e nu. """ line_alg = make_butod0lnu_d0tokpi(process=PROCESS, lepton="e") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1264,6 +1379,10 @@ def spruce_butod0enu_d0tokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1272,10 +1391,7 @@ def spruce_butod0enu_d0tokpi_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1293,7 +1409,11 @@ def spruce_butod0enu_d0tokpi_fakeelectron_line( SL Spruce line for the decay B(c)+ -> D0(-> K pi) e nu, with a fake electron. """ line_alg = make_butod0lnu_d0tokpi_fakelepton(process=PROCESS, lepton="e") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1302,16 +1422,17 @@ def spruce_butod0enu_d0tokpi_fakeelectron_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1329,7 +1450,11 @@ def spruce_butod0munu_d0tok3pi_line( SL Spruce line for the decay B+ -> D0(-> K pi pi pi) mu nu. """ line_alg = make_butod0lnu_d0tok3pi(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1338,6 +1463,10 @@ def spruce_butod0munu_d0tok3pi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1346,10 +1475,7 @@ def spruce_butod0munu_d0tok3pi_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1367,7 +1493,11 @@ def spruce_butod0munu_d0tok3pi_fakemuon_line( SL Spruce line for the decay B+ -> D0(-> K pi pi pi) mu nu, with a fake muon. """ line_alg = make_butod0lnu_d0tok3pi_fakelepton(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1376,16 +1506,17 @@ def spruce_butod0munu_d0tok3pi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1441,7 +1572,11 @@ def spruce_b0todpmunu_dptokpipi_line( SL Spruce line for the decay B0 -> D+(-> K pi pi) mu nu. """ line_alg = make_b0todplnu_dptokpipi(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1450,6 +1585,10 @@ def spruce_b0todpmunu_dptokpipi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1458,10 +1597,7 @@ def spruce_b0todpmunu_dptokpipi_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1478,8 +1614,13 @@ def spruce_b0todpmunu_dptokpipi_fakemuon_line( """ SL Spruce line for the decay B0 -> D+(-> K pi pi) mu nu, with a fake muon. """ - line_alg = make_b0todplnu_dptokpipi_fakelepton(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_b0todplnu_dptokpipi_fakelepton( + process=PROCESS, lepton="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1488,16 +1629,17 @@ def spruce_b0todpmunu_dptokpipi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1553,7 +1695,11 @@ def spruce_b0todpmunu_dptokkpi_line( SL Spruce line for the decay B0 -> D+(-> K K pi) mu nu. """ line_alg = make_b0todplnu_dptokkpi(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1562,6 +1708,10 @@ def spruce_b0todpmunu_dptokkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1571,10 +1721,7 @@ def spruce_b0todpmunu_dptokkpi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -1591,7 +1738,11 @@ def spruce_b0todpmunu_dptokkpi_fakemuon_line( SL Spruce line for the decay B0 -> D+(-> K K pi) mu nu, with a fake muon. """ line_alg = make_b0todplnu_dptokkpi_fakelepton(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1600,6 +1751,10 @@ def spruce_b0todpmunu_dptokkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1607,10 +1762,7 @@ def spruce_b0todpmunu_dptokkpi_fakemuon_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -1665,7 +1817,11 @@ def spruce_bstodsmunu_dstokkpi_line( SL Spruce line for the decay B_s0 -> Ds(-> K K pi) mu nu. """ line_alg = make_bstodslnu_dstokkpi(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1674,6 +1830,10 @@ def spruce_bstodsmunu_dstokkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1682,10 +1842,7 @@ def spruce_bstodsmunu_dstokkpi_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1703,9 +1860,12 @@ def spruce_bstodstlnu_dsttodsgamma_dstokkpi_gammatoee_line( SL Spruce line for the decay B_s0 -> D*s(-> Ds(-> K K pi) gamma (-> ee) ) mu nu. """ line_alg = make_bstodstlnu_dsttodsgamma_dstokkpi_gammatoee( - process=PROCESS, lepton="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, lepton="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1714,6 +1874,10 @@ def spruce_bstodstlnu_dsttodsgamma_dstokkpi_gammatoee_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1723,10 +1887,7 @@ def spruce_bstodstlnu_dsttodsgamma_dstokkpi_gammatoee_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -1743,7 +1904,11 @@ def spruce_bstodsmunu_dstokkpi_fakemuon_line( SL Spruce line for the decay B_s0 -> Ds(-> K K pi) mu nu, with a fake muon. """ line_alg = make_bstodslnu_dstokkpi_fakelepton(process=PROCESS, lepton="mu") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1752,16 +1917,17 @@ def spruce_bstodsmunu_dstokkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1819,7 +1985,11 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_line( Xi_b0 -> Xi_c+ (-> p K- pi+) mu+ nu (Wrong sign) """ line_alg = make_xib0toxicplusmunu_xicplustopkpi(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=False, charmed=True @@ -1827,6 +1997,10 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1835,10 +2009,7 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1857,8 +2028,13 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_line( Xi_b0 -> Xi_c+ (-> p K- pi+) tau- (-> mu- nu nu) nu (Right sign) Xi_b0 -> Xi_c+ (-> p K- pi+) tau+ (-> mu+ nu nu) nu (Wrong sign) """ - line_alg = make_xib0toxicplustaunu_xicplustopkpi_tautomununu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_xib0toxicplustaunu_xicplustopkpi_tautomununu( + process=PROCESS) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1867,6 +2043,10 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1876,10 +2056,7 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -1898,7 +2075,11 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_fakemuon_line( Xi_b0 -> Xi_c+ (-> p K- pi+) mu+ nu (Wrong sign) """ line_alg = make_xib0toxicplusmunu_xicplustopkpi_fakelepton(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=False, charmed=True @@ -1906,16 +2087,17 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1974,9 +2156,12 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_fakemuon_line( Xi_b0 -> Xi_c+ (-> p K- pi+) tau+ (-> mu+ nu nu) nu (Wrong sign) """ line_alg = make_xib0toxicplustaunu_xicplustopkpi_tautomununu_fakelepton( - process=PROCESS - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1985,6 +2170,10 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1992,10 +2181,7 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_fakemuon_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -2054,7 +2240,11 @@ def spruce_xibminustoxic0munu_xic0topkkpi_line( Xi_b- -> Xi_c0 (-> p K- K- pi+) mu+ nu (Wrong sign) """ line_alg = make_xibminustoxic0munu_xic0topkkpi(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True @@ -2062,6 +2252,10 @@ def spruce_xibminustoxic0munu_xic0topkkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -2070,10 +2264,7 @@ def spruce_xibminustoxic0munu_xic0topkkpi_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2092,8 +2283,13 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_line( Xi_b- -> Xi_c0 (-> p K- K- pi+) tau- (-> mu- nu nu) nu (Right sign) Xi_b- -> Xi_c0 (-> p K- K- pi+) tau+ (-> mu+ nu nu) nu (Wrong sign) """ - line_alg = make_xibminustoxic0taunu_xic0topkkpi_tautomununu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_xibminustoxic0taunu_xic0topkkpi_tautomununu( + process=PROCESS) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2102,6 +2298,10 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -2111,10 +2311,7 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -2133,7 +2330,11 @@ def spruce_xibminustoxic0munu_xic0topkkpi_fakemuon_line( Xi_b- -> Xi_c0 (-> p K- K- pi+) mu+ nu (Wrong sign) """ line_alg = make_xibminustoxic0munu_xic0topkkpi_fakelepton(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True @@ -2141,16 +2342,17 @@ def spruce_xibminustoxic0munu_xic0topkkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2209,9 +2411,12 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_fakemuon_line( Xi_b- -> Xi_c0 (-> p K- K- pi+) tau+ (-> mu+ nu nu) nu (Wrong sign) """ line_alg = make_xibminustoxic0taunu_xic0topkkpi_tautomununu_fakelepton( - process=PROCESS - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2220,6 +2425,10 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -2227,10 +2436,7 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_fakemuon_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -2287,7 +2493,11 @@ def spruce_b0todptaunu_dptokpipi_tautopipipinu_line( SL Spruce line for the decay B0 -> D- tau+, hadronic tau decay. """ line_alg = make_b0todptaunu_dptokpipi_tautopipipinu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2296,6 +2506,10 @@ def spruce_b0todptaunu_dptokpipi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -2305,10 +2519,7 @@ def spruce_b0todptaunu_dptokpipi_tautopipipinu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -2325,7 +2536,11 @@ def spruce_bctojpsitaunu_jpsitomumu_tautopipipinu_line( SL Spruce line for the decay B_c+ -> J/psi(1S) tau+, hadronic tau decay. """ line_alg = make_bctojpsitaunu_jpsitomumu_tautopipipinu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2334,6 +2549,10 @@ def spruce_bctojpsitaunu_jpsitomumu_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -2343,10 +2562,7 @@ def spruce_bctojpsitaunu_jpsitomumu_tautopipipinu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -2363,7 +2579,11 @@ def spruce_bptod0taunu_d0tokpi_tautopipipinu_line( SL Spruce line for the decay B+ -> D~0 tau+, hadronic tau decay. """ line_alg = make_bptod0taunu_d0tokpi_tautopipipinu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2372,6 +2592,10 @@ def spruce_bptod0taunu_d0tokpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -2381,10 +2605,7 @@ def spruce_bptod0taunu_d0tokpi_tautopipipinu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -2401,7 +2622,11 @@ def spruce_bstodstaunu_dstokkpi_tautopipipinu_line( SL Spruce line for the decay B_s0 -> D_s- tau+, hadronic tau decay. """ line_alg = make_bstodstaunu_dstokkpi_tautopipipinu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2410,6 +2635,9 @@ def spruce_bstodstaunu_dstokkpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, hlt2_filter_code=[ @@ -2419,10 +2647,7 @@ def spruce_bstodstaunu_dstokkpi_tautopipipinu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -2439,7 +2664,11 @@ def spruce_lbtolctaunu_lctopkpi_tautopipipinu_line( SL Spruce line for the decay Lambda_b0 -> Lambda_c+ tau-, hadronic tau decay. """ line_alg = make_lbtolctaunu_lctopkpi_tautopipipinu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2448,6 +2677,10 @@ def spruce_lbtolctaunu_lctopkpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -2456,10 +2689,7 @@ def spruce_lbtolctaunu_lctopkpi_tautopipipinu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2474,9 +2704,13 @@ def spruce_b0topimunu_line( SL Spruce line for the decay B0 -> pi mu nu. """ line_alg = make_b0topimunu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B0", anti_parent="B~0" - ) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B0", + anti_parent="B~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2485,6 +2719,10 @@ def spruce_b0topimunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -2493,10 +2731,7 @@ def spruce_b0topimunu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2514,9 +2749,14 @@ def spruce_b0topimunu_fakemuon_line( SL Spruce line for the decay B0 -> pi mu nu, with a fake muon. """ line_alg = make_b0topimunu_fakemu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B0", anti_parent="B~0" - ) + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B0", + anti_parent="B~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2525,16 +2765,17 @@ def spruce_b0topimunu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2590,9 +2831,14 @@ def spruce_b0topimunu_fakek_line( SL Spruce line for the decay B0 -> pi mu, with a fake pions. """ line_alg = make_b0topimunu_fakek(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B0", anti_parent="B~0" - ) + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B0", + anti_parent="B~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2601,16 +2847,17 @@ def spruce_b0topimunu_fakek_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2625,7 +2872,11 @@ def spruce_lbtopmunu_line( SL Spruce line for the decay Lb0 -> p mu nu. """ line_alg = make_lbtopmunu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2634,6 +2885,10 @@ def spruce_lbtopmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -2642,10 +2897,7 @@ def spruce_lbtopmunu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2659,7 +2911,11 @@ def spruce_lbtopmunu_fakep_line( SL Spruce line for the decay Lb0 -> p mu nu, with a fake proton. """ line_alg = make_lbtopmunu_fakep(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2668,16 +2924,17 @@ def spruce_lbtopmunu_fakep_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2695,7 +2952,11 @@ def spruce_lbtopmunu_fakemuon_line( SL Spruce line for the decay Lb0 -> p mu nu, with a fake muon. """ line_alg = make_lbtopmunu_fakemu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2704,16 +2965,17 @@ def spruce_lbtopmunu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2764,7 +3026,11 @@ def spruce_lbtopmunu_ss_line( SL Spruce line for the decay Lb0 -> p mu nu (same-sign). """ line_alg = make_lbtopmunu_ss(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2773,6 +3039,10 @@ def spruce_lbtopmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -2781,10 +3051,7 @@ def spruce_lbtopmunu_ss_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2802,7 +3069,11 @@ def spruce_lbtopmunu_ss_fakep_line( SL Spruce line for the decay Lb0 -> p mu nu (same-sign), with a fake proton. """ line_alg = make_lbtopmunu_ss_fakep(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2811,16 +3082,17 @@ def spruce_lbtopmunu_ss_fakep_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2838,7 +3110,11 @@ def spruce_lbtopmunu_ss_fakemuon_line( SL Spruce line for the decay Lb0 -> p mu nu (same-sign), with a fake muon. """ line_alg = make_lbtopmunu_ss_fakemu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2847,16 +3123,17 @@ def spruce_lbtopmunu_ss_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2907,9 +3184,15 @@ def spruce_bstokmunu_line( SL Spruce line for the decay Bs0 -> K mu nu. """ line_alg = make_bstokmunu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" - ) + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2918,6 +3201,10 @@ def spruce_bstokmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -2927,10 +3214,7 @@ def spruce_bstokmunu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -2984,9 +3268,13 @@ def spruce_bstokmunu_fakemuon_line( SL Spruce line for the decay Bs0 -> K mu nu, with a fake muon. """ line_alg = make_bstokmunu_fakemu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" - ) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2995,16 +3283,17 @@ def spruce_bstokmunu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3136,11 +3425,19 @@ def spruce_bstokmunu_fakek_line( SL Spruce line for the decay Bs0 -> K mu, with a fake kaon. """ line_alg = make_bstokmunu_fakek(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" - ) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + line_mon = generate_default_monitoring_vars( name, line_alg, charged=False, charmed=False ) @@ -3153,10 +3450,7 @@ def spruce_bstokmunu_fakek_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3283,9 +3577,13 @@ def spruce_bstokenu_line(name="SpruceSLB_BsToKENu", prescale=1, persistreco=Fals SL Spruce line for the decay Bs0 -> K e nu. """ line_alg = make_bstokenu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" - ) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3294,6 +3592,10 @@ def spruce_bstokenu_line(name="SpruceSLB_BsToKENu", prescale=1, persistreco=Fals hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -3303,10 +3605,7 @@ def spruce_bstokenu_line(name="SpruceSLB_BsToKENu", prescale=1, persistreco=Fals ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -3357,9 +3656,13 @@ def spruce_bstokenu_fakeelectron_line( SL Spruce line for the decay Bs0 -> K e nu, with a fake electron. """ line_alg = make_bstokenu_fakeelectron(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" - ) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3368,16 +3671,17 @@ def spruce_bstokenu_fakeelectron_line( hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3427,9 +3731,13 @@ def spruce_bstokenu_fakek_line( SL Spruce line for the decay Bs0 -> K e, with a fake kaon. """ line_alg = make_bstokenu_fakek(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" - ) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3438,16 +3746,17 @@ def spruce_bstokenu_fakek_line( hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3532,9 +3841,15 @@ def spruce_b2ppbarmunu_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays """ line_alg = make_b2ppbarmunu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3543,6 +3858,10 @@ def spruce_b2ppbarmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -3551,10 +3870,7 @@ def spruce_b2ppbarmunu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3569,9 +3885,16 @@ def spruce_b2ppbarmunu_ss_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays with same-sign protons """ line_alg = make_b2ppbarmunu_ss(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3580,6 +3903,10 @@ def spruce_b2ppbarmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -3588,10 +3915,7 @@ def spruce_b2ppbarmunu_ss_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3609,9 +3933,16 @@ def spruce_b2ppbarmunu_fakep_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays with a fake proton of opposite sign to muon """ line_alg = make_b2ppbarmunu_fakep(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3620,16 +3951,17 @@ def spruce_b2ppbarmunu_fakep_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3647,9 +3979,16 @@ def spruce_b2ppbarmunu_fakemuon_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays with a fake muon """ line_alg = make_b2ppbarmunu_fakemu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3658,16 +3997,17 @@ def spruce_b2ppbarmunu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3726,13 +4066,21 @@ def spruce_b2pipimunu_line( extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent='B+', + anti_parent='B-', + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -3742,11 +4090,7 @@ def spruce_b2pipimunu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ] - + extra_PV_tracks, + extra_outputs=extra_outputs_iso + extra_PV_tracks, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -3766,13 +4110,22 @@ def spruce_b2pipimunu_ss_line( extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent='B+', + anti_parent='B-', + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -3782,11 +4135,7 @@ def spruce_b2pipimunu_ss_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ] - + extra_PV_tracks, + extra_outputs=extra_outputs_iso + extra_PV_tracks, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -3807,14 +4156,22 @@ def spruce_b2pipimunu_fakemuon_line( name, line_alg, charged=True, charmed=False ) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent='B+', + anti_parent='B-', + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -3822,11 +4179,7 @@ def spruce_b2pipimunu_fakemuon_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ] - + extra_PV_tracks, + extra_outputs=extra_outputs_iso + extra_PV_tracks, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -3887,14 +4240,22 @@ def spruce_b2pipimunu_fakepi_line( name, line_alg, charged=True, charmed=False ) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent='B+', + anti_parent='B-', + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -3902,11 +4263,7 @@ def spruce_b2pipimunu_fakepi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ] - + extra_PV_tracks, + extra_outputs=extra_outputs_iso + extra_PV_tracks, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -3920,9 +4277,16 @@ def spruce_b2kkmunu_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays """ line_alg = make_b2kkmunu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3931,6 +4295,10 @@ def spruce_b2kkmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -3939,10 +4307,7 @@ def spruce_b2kkmunu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3957,9 +4322,16 @@ def spruce_b2kkmunu_ss_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays with same-sign kaons """ line_alg = make_b2kkmunu_ss(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3968,6 +4340,10 @@ def spruce_b2kkmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -3976,10 +4352,7 @@ def spruce_b2kkmunu_ss_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3997,9 +4370,16 @@ def spruce_b2kkmunu_fakemuon_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays with a fake muon """ line_alg = make_b2kkmunu_fakemu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4008,16 +4388,17 @@ def spruce_b2kkmunu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4070,9 +4451,15 @@ def spruce_b2mumumunu_line( SL Spruce line for the B(c)+ -> mu+mu-mu+nu decays """ line_alg = make_b2mumumunu(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4081,6 +4468,10 @@ def spruce_b2mumumunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4089,10 +4480,7 @@ def spruce_b2mumumunu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4107,9 +4495,15 @@ def spruce_b2emumunu_line( SL Spruce line for the B(c)+ -> e+mu-mu+nu decays """ line_alg = make_b2emumunu(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4118,6 +4512,10 @@ def spruce_b2emumunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4126,10 +4524,7 @@ def spruce_b2emumunu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4144,9 +4539,15 @@ def spruce_b2mueenu_line( SL Spruce line for the B(c)+ -> mu+e-e+nu decays """ line_alg = make_b2mueenu(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4155,6 +4556,10 @@ def spruce_b2mueenu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4163,10 +4568,7 @@ def spruce_b2mueenu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4184,9 +4586,15 @@ def spruce_b2mugammanu_cnvll_line( SL Spruce line for the B(c)+ -> mu+gamma(->e+e-)nu decays with long electrons """ line_alg = make_b2mugammanu_cnvll(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=False @@ -4194,6 +4602,10 @@ def spruce_b2mugammanu_cnvll_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4202,10 +4614,7 @@ def spruce_b2mugammanu_cnvll_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4223,9 +4632,15 @@ def spruce_b2mugammanu_cnvdd_line( SL Spruce line for the B(c)+ -> mu+gamma(->e+e-)nu decays with downstream electrons """ line_alg = make_b2mugammanu_cnvdd(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=False @@ -4233,6 +4648,10 @@ def spruce_b2mugammanu_cnvdd_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4241,10 +4660,7 @@ def spruce_b2mugammanu_cnvdd_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4262,9 +4678,15 @@ def spruce_b2egammanu_cnvll_line( SL Spruce line for the B(c)+ -> e+gamma(->e+e-)nu decays with long conversion electrons """ line_alg = make_b2egammanu_cnvll(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=False @@ -4272,6 +4694,10 @@ def spruce_b2egammanu_cnvll_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4280,10 +4706,7 @@ def spruce_b2egammanu_cnvll_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4301,9 +4724,15 @@ def spruce_b2egammanu_cnvdd_line( SL Spruce line for the B(c)+ -> e+gamma(->e+e-)nu decays with downstream conversion electrons """ line_alg = make_b2egammanu_cnvdd(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=False @@ -4311,6 +4740,10 @@ def spruce_b2egammanu_cnvdd_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4319,10 +4752,7 @@ def spruce_b2egammanu_cnvdd_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4337,9 +4767,15 @@ def spruce_b2eeenu_line( SL Spruce line for the B(c)+ -> e+e-e+nu decays """ line_alg = make_b2eeenu(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4348,6 +4784,10 @@ def spruce_b2eeenu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4356,10 +4796,7 @@ def spruce_b2eeenu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4375,23 +4812,28 @@ def spruce_b2taumumunu_3pi_line( """ line_alg = make_b2taumumunu_3pi(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=False ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=["Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision"], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4407,23 +4849,28 @@ def spruce_b2taueenu_3pi_line( """ line_alg = make_b2taueenu_3pi(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=False ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=["Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision"], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4438,9 +4885,15 @@ def spruce_b2mumumunu_ss_line( SL Spruce line for the B(c)+ -> mu+mu+mu+nu decays: same-sign combinations """ line_alg = make_b2mumumunu_ss(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4449,6 +4902,10 @@ def spruce_b2mumumunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4457,10 +4914,7 @@ def spruce_b2mumumunu_ss_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4475,9 +4929,15 @@ def spruce_b2emumunu_ss_line( SL Spruce line for the B(c)+ -> e+mu+mu+nu decays: same-sign combinations """ line_alg = make_b2emumunu_ss(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4486,6 +4946,10 @@ def spruce_b2emumunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4494,10 +4958,7 @@ def spruce_b2emumunu_ss_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4512,9 +4973,15 @@ def spruce_b2mueenu_ss_line( SL Spruce line for the B(c)+ -> mu+e+e+nu decays: same-sign combinations """ line_alg = make_b2mueenu_ss(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4523,6 +4990,10 @@ def spruce_b2mueenu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4531,10 +5002,7 @@ def spruce_b2mueenu_ss_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4549,9 +5017,15 @@ def spruce_b2eeenu_ss_line( SL Spruce line for the B(c)+ -> e+e+e+nu decays: same-sign combinations """ line_alg = make_b2eeenu_ss(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4560,6 +5034,10 @@ def spruce_b2eeenu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4568,10 +5046,7 @@ def spruce_b2eeenu_ss_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4586,23 +5061,30 @@ def spruce_b2taumumunu_3pi_ss_line( SL Spruce line for the B(c)+ -> tau+mu+mu+nu decays with hadronic tau->3pi: same-sign combinations """ line_alg = make_b2taumumunu_3pi_ss(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=False ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=["Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision"], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4617,23 +5099,30 @@ def spruce_b2taueenu_3pi_ss( SL Spruce line for the B(c)+ -> tau+e+e+nu decays with hadronic tau->3pi: same-sign combinations """ line_alg = make_b2taueenu_3pi_ss(name=name, process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" - ) + + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=False ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=["Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision"], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4651,7 +5140,11 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_line( SL Spruce line for the decay [Omegab- -> Omegac0(-> p K- K- pi+) mu nu]cc. """ line_alg = make_omegabtoomegacmunu_omegactopkkpi(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4660,6 +5153,10 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4668,10 +5165,7 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4688,8 +5182,13 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_fakemuon_line( """ SL Spruce line for the decay [Omegab- -> Omegac0(-> p K- K- pi+) mu nu]cc with a fake muon. """ - line_alg = make_omegabtoomegacmunu_omegactopkkpi_fakelepton(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_omegabtoomegacmunu_omegactopkkpi_fakelepton( + process=PROCESS) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4698,16 +5197,17 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4762,8 +5262,14 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_line( """ SL Spruce line for the decay Omegab- -> Omegac0(-> p K- K- pi+) tau-(-> mu nu nu) nu. """ - line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautomununu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautomununu( + process=PROCESS) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4772,6 +5278,10 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4781,10 +5291,7 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -4801,9 +5308,13 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_fakemuon_line( SL Spruce line for the decay Omegab- -> Omegac0(-> p K- K- pi+) tau-(-> mu nu nu) nu, with a fake muon. """ line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautomununu_fakelepton( - process=PROCESS - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4812,6 +5323,10 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4819,10 +5334,7 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_fakemuon_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -4878,9 +5390,12 @@ def spruce_lbtolcmunu_lctopksLL_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4889,6 +5404,10 @@ def spruce_lbtolcmunu_lctopksLL_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -4898,10 +5417,7 @@ def spruce_lbtolcmunu_lctopksLL_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -4919,9 +5435,12 @@ def spruce_lbtolcmunu_lctopksDD_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'downstream' tracks ('DD' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4930,6 +5449,10 @@ def spruce_lbtolcmunu_lctopksDD_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -4939,10 +5462,7 @@ def spruce_lbtolcmunu_lctopksDD_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -4960,9 +5480,12 @@ def spruce_lbtolcmunu_lctopksLL_fakemuon_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolclnu_lctoV0h_fakelepton( - process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4971,6 +5494,10 @@ def spruce_lbtolcmunu_lctopksLL_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -4978,10 +5505,7 @@ def spruce_lbtolcmunu_lctopksLL_fakemuon_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5042,9 +5566,12 @@ def spruce_lbtolcmunu_lctopksDD_fakemuon_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'downstream' tracks ('DD' category). """ line_alg = make_lbtolclnu_lctoV0h_fakelepton( - process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5053,6 +5580,10 @@ def spruce_lbtolcmunu_lctopksDD_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5060,10 +5591,7 @@ def spruce_lbtolcmunu_lctopksDD_fakemuon_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5124,9 +5652,13 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu( - process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5135,6 +5667,10 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5144,10 +5680,7 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5165,9 +5698,13 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('DD' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu( - process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5176,6 +5713,10 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5185,10 +5726,7 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5206,9 +5744,13 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_fakemuon_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu_fakelepton( - process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5217,6 +5759,10 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5224,10 +5770,7 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_fakemuon_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5288,9 +5831,13 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_fakemuon_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('DD' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu_fakelepton( - process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5299,6 +5846,10 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5306,10 +5857,7 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_fakemuon_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5370,9 +5918,12 @@ def spruce_lbtolcmunu_lctolambdapiLL_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5381,6 +5932,10 @@ def spruce_lbtolcmunu_lctolambdapiLL_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5390,10 +5945,7 @@ def spruce_lbtolcmunu_lctolambdapiLL_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5411,9 +5963,12 @@ def spruce_lbtolcmunu_lctolambdapiDD_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'downstream' tracks ('DD' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5422,6 +5977,10 @@ def spruce_lbtolcmunu_lctolambdapiDD_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5431,10 +5990,7 @@ def spruce_lbtolcmunu_lctolambdapiDD_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5452,9 +6008,12 @@ def spruce_lbtolcmunu_lctolambdapiLL_fakemuon_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolclnu_lctoV0h_fakelepton( - process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5463,6 +6022,10 @@ def spruce_lbtolcmunu_lctolambdapiLL_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5470,10 +6033,7 @@ def spruce_lbtolcmunu_lctolambdapiLL_fakemuon_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5534,9 +6094,12 @@ def spruce_lbtolcmunu_lctolambdapiDD_fakemuon_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'downstream' tracks ('DD' category). """ line_alg = make_lbtolclnu_lctoV0h_fakelepton( - process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5545,6 +6108,10 @@ def spruce_lbtolcmunu_lctolambdapiDD_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5552,10 +6119,7 @@ def spruce_lbtolcmunu_lctolambdapiDD_fakemuon_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5616,9 +6180,13 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu( - process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5627,6 +6195,10 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5639,6 +6211,7 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_line( (f"{name}_extra_tracks", extra_track_TES), (f"{name}_extra_neutrals", extra_neutrals), ], + extra_outputs=extra_outputs_iso, prescale=prescale, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -5657,9 +6230,13 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('DD' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu( - process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5668,6 +6245,10 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5680,6 +6261,7 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_line( (f"{name}_extra_tracks", extra_track_TES), (f"{name}_extra_neutrals", extra_neutrals), ], + extra_outputs=extra_outputs_iso, prescale=prescale, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -5698,9 +6280,12 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_fakemuon_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu_fakelepton( - process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5709,16 +6294,17 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5778,9 +6364,13 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_fakemuon_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('DD' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu_fakelepton( - process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5789,6 +6379,10 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5796,10 +6390,7 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_fakemuon_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5859,8 +6450,14 @@ def spruce_bctobsmunu_bstodspi_line( SL Spruce line for the decay Bc -> Bs mu nu with Bs -> Ds pi """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToDsPi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToDsPi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5869,6 +6466,10 @@ def spruce_bctobsmunu_bstodspi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -5878,10 +6479,7 @@ def spruce_bctobsmunu_bstodspi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5898,8 +6496,14 @@ def spruce_bctobsmunu_bstodsk_line( SL Spruce line for the decay Bc -> Bs mu nu with Bs -> Ds K """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToDsK") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToDsK") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5908,6 +6512,10 @@ def spruce_bctobsmunu_bstodsk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -5917,10 +6525,7 @@ def spruce_bctobsmunu_bstodsk_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5938,9 +6543,13 @@ def spruce_bctobsmunu_bstojpsiphi_line( """ line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToJpsiPhi" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToJpsiPhi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5949,6 +6558,10 @@ def spruce_bctobsmunu_bstojpsiphi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -5958,10 +6571,7 @@ def spruce_bctobsmunu_bstojpsiphi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5978,8 +6588,14 @@ def spruce_bctobsmunu_bstokk_line( SL Spruce line for the decay Bc -> Bs mu nu with Bs -> K- K+ """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToKK") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToKK") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5988,6 +6604,10 @@ def spruce_bctobsmunu_bstokk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -5997,10 +6617,7 @@ def spruce_bctobsmunu_bstokk_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6017,8 +6634,14 @@ def spruce_bctobsmunu_bstokpi_line( SL Spruce line for the decay Bc -> Bs mu nu with Bs -> K+ pi- and CC """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToKPi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToKPi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6027,6 +6650,10 @@ def spruce_bctobsmunu_bstokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6036,10 +6663,7 @@ def spruce_bctobsmunu_bstokpi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6056,8 +6680,14 @@ def spruce_bctobsmunu_bstopipi_line( SL Spruce line for the decay Bc -> Bs mu nu with Bs -> pi+ pi- """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToPiPi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToPiPi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6066,6 +6696,10 @@ def spruce_bctobsmunu_bstopipi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6075,10 +6709,7 @@ def spruce_bctobsmunu_bstopipi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6095,8 +6726,14 @@ def spruce_bctobsenu_bstodspi_line( SL Spruce line for the decay Bc -> Bs e nu with Bs -> Ds pi """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToDsPi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToDsPi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6105,6 +6742,10 @@ def spruce_bctobsenu_bstodspi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6114,10 +6755,7 @@ def spruce_bctobsenu_bstodspi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6134,8 +6772,14 @@ def spruce_bctobsenu_bstodsk_line( SL Spruce line for the decay Bc -> Bs e nu with Bs -> Ds K """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToDsK") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToDsK") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6144,6 +6788,10 @@ def spruce_bctobsenu_bstodsk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6153,10 +6801,7 @@ def spruce_bctobsenu_bstodsk_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6173,8 +6818,14 @@ def spruce_bctobsenu_bstojpsiphi_line( SL Spruce line for the decay Bc -> Bs e nu with Bs -> J/psi phi """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToJpsiPhi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToJpsiPhi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6183,6 +6834,10 @@ def spruce_bctobsenu_bstojpsiphi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6192,10 +6847,7 @@ def spruce_bctobsenu_bstojpsiphi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6212,8 +6864,14 @@ def spruce_bctobsenu_bstokk_line( SL Spruce line for the decay Bc -> Bs e nu with Bs -> K- K+ """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToKK") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToKK") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6222,6 +6880,10 @@ def spruce_bctobsenu_bstokk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6231,10 +6893,7 @@ def spruce_bctobsenu_bstokk_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6251,8 +6910,14 @@ def spruce_bctobsenu_bstokpi_line( SL Spruce line for the decay Bc -> Bs e nu with Bs -> K+ pi- and CC """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToKPi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToKPi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6261,6 +6926,10 @@ def spruce_bctobsenu_bstokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6270,10 +6939,7 @@ def spruce_bctobsenu_bstokpi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6290,8 +6956,14 @@ def spruce_bctobsenu_bstopipi_line( SL Spruce line for the decay Bc -> Bs e nu with Bs -> pi+ pi- """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToPiPi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToPiPi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6300,6 +6972,10 @@ def spruce_bctobsenu_bstopipi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6309,10 +6985,7 @@ def spruce_bctobsenu_bstopipi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6329,8 +7002,14 @@ def spruce_bctobspi_bstodspi_line( SL Spruce line for the decay Bc -> Bs pi with Bs -> Ds pi """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToDsPi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToDsPi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6339,6 +7018,10 @@ def spruce_bctobspi_bstodspi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6348,10 +7031,7 @@ def spruce_bctobspi_bstodspi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6368,8 +7048,14 @@ def spruce_bctobspi_bstodsk_line( SL Spruce line for the decay Bc -> Bs pi with Bs -> Ds K """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToDsK") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToDsK") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6378,6 +7064,10 @@ def spruce_bctobspi_bstodsk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6387,10 +7077,7 @@ def spruce_bctobspi_bstodsk_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6407,8 +7094,14 @@ def spruce_bctobspi_bstojpsiphi_line( SL Spruce line for the decay Bc -> Bs pi with Bs -> J/psi phi """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToJpsiPhi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToJpsiPhi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6417,6 +7110,10 @@ def spruce_bctobspi_bstojpsiphi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6426,10 +7123,7 @@ def spruce_bctobspi_bstojpsiphi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6443,8 +7137,14 @@ def spruce_bctobspi_bstokk_line( SL Spruce line for the decay Bc -> Bs pi with Bs -> K+ K- """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToKK") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToKK") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6453,6 +7153,10 @@ def spruce_bctobspi_bstokk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6462,10 +7166,7 @@ def spruce_bctobspi_bstokk_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6482,8 +7183,14 @@ def spruce_bctobspi_bstokpi_line( SL Spruce line for the decay Bc -> Bs pi with Bs -> K+ pi- """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToKPi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToKPi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6492,6 +7199,10 @@ def spruce_bctobspi_bstokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6501,10 +7212,7 @@ def spruce_bctobspi_bstokpi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6521,8 +7229,14 @@ def spruce_bctobspi_bstopipi_line( SL Spruce line for the decay Bc -> Bs pi with Bs -> pi+ pi- """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToPiPi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToPiPi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6531,6 +7245,10 @@ def spruce_bctobspi_bstopipi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6542,6 +7260,7 @@ def spruce_bctobspi_bstopipi_line( (f"{name}_extra_tracks", extra_track_TES), (f"{name}_extra_neutrals", extra_neutrals), ], + extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, @@ -6560,8 +7279,14 @@ def spruce_bctobsk_bstodspi_line( SL Spruce line for the decay Bc -> Bs K with Bs -> Ds pi """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToDsPi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToDsPi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6570,6 +7295,10 @@ def spruce_bctobsk_bstodspi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6581,6 +7310,7 @@ def spruce_bctobsk_bstodspi_line( (f"{name}_extra_tracks", extra_track_TES), (f"{name}_extra_neutrals", extra_neutrals), ], + extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, @@ -6596,8 +7326,14 @@ def spruce_bctobsk_bstodsk_line( SL Spruce line for the decay Bc -> Bs K with Bs -> Ds K """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToDsK") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToDsK") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6606,6 +7342,10 @@ def spruce_bctobsk_bstodsk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6615,10 +7355,7 @@ def spruce_bctobsk_bstodsk_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6635,8 +7372,14 @@ def spruce_bctobsk_bstojpsiphi_line( SL Spruce line for the decay Bc -> Bs K with Bs -> J/psi phi """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToJpsiPhi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToJpsiPhi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6645,6 +7388,10 @@ def spruce_bctobsk_bstojpsiphi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6656,6 +7403,7 @@ def spruce_bctobsk_bstojpsiphi_line( (f"{name}_extra_tracks", extra_track_TES), (f"{name}_extra_neutrals", extra_neutrals), ], + extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, @@ -6671,8 +7419,14 @@ def spruce_bctobsk_bstokk_line( SL Spruce line for the decay Bc -> Bs K with Bs -> K+ K- """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToKK") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToKK") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6681,6 +7435,10 @@ def spruce_bctobsk_bstokk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6692,6 +7450,7 @@ def spruce_bctobsk_bstokk_line( (f"{name}_extra_tracks", extra_track_TES), (f"{name}_extra_neutrals", extra_neutrals), ], + extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, @@ -6707,8 +7466,14 @@ def spruce_bctobsk_bstokpi_line( SL Spruce line for the decay Bc -> Bs K with Bs -> K+ pi- and CC """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToKPi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToKPi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6717,6 +7482,10 @@ def spruce_bctobsk_bstokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6728,6 +7497,7 @@ def spruce_bctobsk_bstokpi_line( (f"{name}_extra_tracks", extra_track_TES), (f"{name}_extra_neutrals", extra_neutrals), ], + extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, @@ -6746,8 +7516,14 @@ def spruce_bctobsk_bstopipi_line( SL Spruce line for the decay Bc -> Bs K with Bs -> pi+ pi- """ - line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToPiPi") - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_bctobsx( + process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToPiPi") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6756,6 +7532,10 @@ def spruce_bctobsk_bstopipi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -6765,10 +7545,7 @@ def spruce_bctobsk_bstopipi_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6857,9 +7634,13 @@ def spruce_lbtolctaunu_lctopksLL_tautopipipinu_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautopipipinu( - process=PROCESS, V0_name="KS0", V0_type="LL" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="KS0", V0_type="LL") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6868,6 +7649,10 @@ def spruce_lbtolctaunu_lctopksLL_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -6880,6 +7665,7 @@ def spruce_lbtolctaunu_lctopksLL_tautopipipinu_line( (f"{name}_extra_tracks", extra_track_TES), (f"{name}_extra_neutrals", extra_neutrals), ], + extra_outputs=extra_outputs_iso, prescale=prescale, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -6898,9 +7684,13 @@ def spruce_lbtolctaunu_lctopksDD_tautopipipinu_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('DD' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautopipipinu( - process=PROCESS, V0_name="KS0", V0_type="DD" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="KS0", V0_type="DD") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6909,6 +7699,10 @@ def spruce_lbtolctaunu_lctopksDD_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -6921,6 +7715,7 @@ def spruce_lbtolctaunu_lctopksDD_tautopipipinu_line( (f"{name}_extra_tracks", extra_track_TES), (f"{name}_extra_neutrals", extra_neutrals), ], + extra_outputs=extra_outputs_iso, prescale=prescale, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -6939,9 +7734,13 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautopipipinu_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautopipipinu( - process=PROCESS, V0_name="Lambda0", V0_type="LL" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="Lambda0", V0_type="LL") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6950,6 +7749,10 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -6962,6 +7765,7 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautopipipinu_line( (f"{name}_extra_tracks", extra_track_TES), (f"{name}_extra_neutrals", extra_neutrals), ], + extra_outputs=extra_outputs_iso, prescale=prescale, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -6980,9 +7784,13 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautopipipinu_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('DD' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautopipipinu( - process=PROCESS, V0_name="Lambda0", V0_type="DD" - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + process=PROCESS, V0_name="Lambda0", V0_type="DD") + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6991,6 +7799,10 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -7003,6 +7815,7 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautopipipinu_line( (f"{name}_extra_tracks", extra_track_TES), (f"{name}_extra_neutrals", extra_neutrals), ], + extra_outputs=extra_outputs_iso, prescale=prescale, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -7020,7 +7833,11 @@ def spruce_lbtolctaunu_lctopphi_tautopipipinu_line( SL Spruce line for the decay Lambda_b0 -> Lambda_c+ tau-, hadronic tau decay. """ line_alg = make_lbtolctaunu_lctopphi_tautopipipinu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -7029,6 +7846,10 @@ def spruce_lbtolctaunu_lctopphi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -7037,10 +7858,7 @@ def spruce_lbtolctaunu_lctopphi_tautopipipinu_line( "Hlt2Topo3BodyDecision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -7101,13 +7919,21 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautopipipinu_line( """ line_alg = make_xibminustoxic0taunu_xic0topkkpi_tautopipipinu(process=PROCESS) line_mon = generate_default_monitoring_vars( - name, line_alg, charged=True, charmed=True - ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + name, line_alg, charged=True, charmed=True) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -7117,10 +7943,7 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautopipipinu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -7136,8 +7959,14 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautopipipinu_line( """ SL Spruce line for the decay Omegab- -> Omegac0(-> p K- K- pi+) tau- nu, hadronic tau decay """ - line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautopipipinu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautopipipinu( + process=PROCESS) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -7146,6 +7975,10 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -7157,6 +7990,7 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautopipipinu_line( (f"{name}_extra_tracks", extra_track_TES), (f"{name}_extra_neutrals", extra_neutrals), ], + extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, diff --git a/Hlt/Moore/python/Moore/persistence/particle_moving.py b/Hlt/Moore/python/Moore/persistence/particle_moving.py index 791bc57de6b..35b042e4f20 100644 --- a/Hlt/Moore/python/Moore/persistence/particle_moving.py +++ b/Hlt/Moore/python/Moore/persistence/particle_moving.py @@ -39,20 +39,10 @@ def __get_type(dh): def cloning_map(): from PyConf.Algorithms import ( - CopyCaloClusters, - CopyCaloHypos, - CopyFlavourTags, - CopyP2InfoRelations, - CopyP2IntRelations, - CopyP2MCPRelations, - CopyP2VRelations, - CopyParticles, - CopyPP2MCPRelations, - CopyProtoParticles, - CopyRecVertices, - CopyTracks, - CopyVertices, - ) + CopyParticles, CopyFlavourTags, CopyTracks, CopyCaloClusters, + CopyCaloHypos, CopyProtoParticles, CopyRecVertices, CopyVertices, + CopyP2InfoRelations, CopyP2IntRelations, CopyP2MCPRelations, + CopyP2VRelations, CopyPP2MCPRelations, CopyP2PRelations) return { "Particles": CopyParticles, @@ -68,6 +58,7 @@ def cloning_map(): "P2IntRelations": CopyP2IntRelations, "P2InfoRelations": CopyP2InfoRelations, "PP2MCPRelations": CopyPP2MCPRelations, + "P2PRelations": CopyP2PRelations, } -- GitLab From 08a522d9c44c703a0ef5f0337601cea528a5f530 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Mon, 27 Jan 2025 11:34:07 +0000 Subject: [PATCH 02/22] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/49941474 --- .../lines/semileptonic/isolationMVA.py | 68 +++++++++++-------- .../lines/semileptonic/spruce_semileptonic.py | 2 +- .../Moore/persistence/particle_moving.py | 19 ++++-- 3 files changed, 55 insertions(+), 34 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py index 40669c13488..2162af4d5a9 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py @@ -11,14 +11,14 @@ import math import re from dataclasses import dataclass -from PyConf.Algorithms import MVAWeightedRelTableAlg, SelectionFromWeightedRelationTable -from SelAlgorithms.monitoring import monitor, histogram_1d -from RecoConf.standard_particles import make_has_rich_long_pions -from RecoConf.standard_particles import make_has_rich_up_pions -from RecoConf.standard_particles import make_has_rich_down_pions + from DaVinciTools import SubstitutePID from Moore.monitoring import run_default_monitoring -from PyConf.Algorithms import ThOrParticleSelection +from PyConf.Algorithms import ( + MVAWeightedRelTableAlg, + SelectionFromWeightedRelationTable, + ThOrParticleSelection, +) from RecoConf.algorithms_thor import ( ParticleCombiner, ParticleContainersMerger, @@ -298,21 +298,24 @@ def extract_parent_name(line_name: str) -> (str, str): def prepare_MVA( - line_name: str, - line_output: ParticleCombiner, - *, #All further options must be given as keyword arguments - mva_min: float = None, - parent: str = "", - anti_parent: str = "", - mva_used: str = "inclusive", - apply_fiducial_cut: bool = True, - persist_b_iso_relations: bool = True, - persist_bst_iso_relations: bool = True -) -> (MVAWeightedRelTableAlg, MVAWeightedRelTableAlg, - SelectionFromWeightedRelationTable, [monitor]): - - new_parent_name = 'B*+' - anti_new_parent_name = 'B*-' + line_name: str, + line_output: ParticleCombiner, + *, # All further options must be given as keyword arguments + mva_min: float = None, + parent: str = "", + anti_parent: str = "", + mva_used: str = "inclusive", + apply_fiducial_cut: bool = True, + persist_b_iso_relations: bool = True, + persist_bst_iso_relations: bool = True, +) -> ( + MVAWeightedRelTableAlg, + MVAWeightedRelTableAlg, + SelectionFromWeightedRelationTable, + [monitor], +): + new_parent_name = "B*+" + anti_new_parent_name = "B*-" if not parent and not anti_parent: parent_name, anti_parent_name = extract_parent_name(line_name) @@ -376,17 +379,24 @@ def prepare_MVA( name=f"{line_name}", CompositeSelection=Bst_z_subset, SignalSelection=line_output, - MVAFunctor=MVA_functor) + MVAFunctor=MVA_functor, + ) b_iso_relations = iso_relations_alg.BOutputRelations bst_iso_relations = iso_relations_alg.BstOutputRelations extra_tracks = SelectionFromWeightedRelationTable( - InputRelations=bst_iso_relations).OutputLocation + InputRelations=bst_iso_relations + ).OutputLocation - monitoring_histos = ([ - monitor(data=Bst_z, histograms=input_monitoring + [monitoring_histo]) - ] if run_default_monitoring() else []) + monitoring_histos = ( + [monitor(data=Bst_z, histograms=input_monitoring + [monitoring_histo])] + if run_default_monitoring() + else [] + ) - return (b_iso_relations if persist_b_iso_relations else None, - bst_iso_relations if persist_bst_iso_relations else None, - extra_tracks, monitoring_histos) + return ( + b_iso_relations if persist_b_iso_relations else None, + bst_iso_relations if persist_bst_iso_relations else None, + extra_tracks, + monitoring_histos, + ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index 2f7f63b1906..227f370cbeb 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -184,7 +184,7 @@ def set_extra_outputs(name, b_iso_relations, bst_iso_relations, extra_tracks, extra_neutrals: Neutral particles. Returns: - List for extra output. + List for extra output. """ extra_output = [(f"{name}_extra_tracks", extra_tracks), (f"{name}_extra_neutrals", extra_neutrals)] diff --git a/Hlt/Moore/python/Moore/persistence/particle_moving.py b/Hlt/Moore/python/Moore/persistence/particle_moving.py index 35b042e4f20..304b59a813d 100644 --- a/Hlt/Moore/python/Moore/persistence/particle_moving.py +++ b/Hlt/Moore/python/Moore/persistence/particle_moving.py @@ -39,10 +39,21 @@ def __get_type(dh): def cloning_map(): from PyConf.Algorithms import ( - CopyParticles, CopyFlavourTags, CopyTracks, CopyCaloClusters, - CopyCaloHypos, CopyProtoParticles, CopyRecVertices, CopyVertices, - CopyP2InfoRelations, CopyP2IntRelations, CopyP2MCPRelations, - CopyP2VRelations, CopyPP2MCPRelations, CopyP2PRelations) + CopyCaloClusters, + CopyCaloHypos, + CopyFlavourTags, + CopyP2InfoRelations, + CopyP2IntRelations, + CopyP2MCPRelations, + CopyP2PRelations, + CopyP2VRelations, + CopyParticles, + CopyPP2MCPRelations, + CopyProtoParticles, + CopyRecVertices, + CopyTracks, + CopyVertices, + ) return { "Particles": CopyParticles, -- GitLab From 736ba99e417cc4159f5c87578bcfd730c143ed6a Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 27 Jan 2025 15:15:38 +0100 Subject: [PATCH 03/22] Fix rebase --- .../lines/semileptonic/isolationMVA.py | 10 ++-- .../lines/semileptonic/spruce_semileptonic.py | 59 +------------------ 2 files changed, 9 insertions(+), 60 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py index 2162af4d5a9..f3ca01684b2 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py @@ -12,10 +12,12 @@ import math import re from dataclasses import dataclass +import Functors as F +import Functors.math as fmath from DaVinciTools import SubstitutePID from Moore.monitoring import run_default_monitoring from PyConf.Algorithms import ( - MVAWeightedRelTableAlg, + ParticleToParticleWeightedRelTableAlg, SelectionFromWeightedRelationTable, ThOrParticleSelection, ) @@ -309,8 +311,8 @@ def prepare_MVA( persist_b_iso_relations: bool = True, persist_bst_iso_relations: bool = True, ) -> ( - MVAWeightedRelTableAlg, - MVAWeightedRelTableAlg, + ParticleToParticleWeightedRelTableAlg, + ParticleToParticleWeightedRelTableAlg, SelectionFromWeightedRelationTable, [monitor], ): @@ -375,7 +377,7 @@ def prepare_MVA( ) # B + extra track combos passing the MVA cuts ## Algo that contains the relations between signal, extra track and isolation MVA score - iso_relations_alg = MVAWeightedRelTableAlg( + iso_relations_alg = ParticleToParticleWeightedRelTableAlg( name=f"{line_name}", CompositeSelection=Bst_z_subset, SignalSelection=line_output, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index 227f370cbeb..925a82f1e6a 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -22,6 +22,7 @@ No lines have persistreco enabled from Moore.config import SpruceLine, register_line_builder from RecoConf.algorithms_thor import ParticleContainersMerger +from PyConf.dataflow import DataHandle from RecoConf.standard_particles import ( make_merged_pi0s, make_photons, @@ -156,10 +157,8 @@ from .HbToTauNu_BTracking import (get_btracking_hlt2_particles_for_sprucing, get_btracking_raw_banks, make_spruce_filtered_btracking_parts, get_btracking_extra_outputs_for_spruce) -from RecoConf.standard_particles import (make_photons, make_resolved_pi0s, - make_merged_pi0s) -from RecoConf.algorithms_thor import ParticleContainersMerger -from PyConf.dataflow import DataHandle +from .isolationMVA import prepare_MVA +from .pv_tracks import get_pv_tracks_for_bstar PROCESS = "spruce" spruce_lines = {} @@ -399,10 +398,6 @@ def spruce_b0todptaunu_dptokpipi_tautomununu_line( "Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], prescale=prescale, persistreco=persistreco, extra_outputs=extra_outputs_iso, @@ -6207,10 +6202,6 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_line( "Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], extra_outputs=extra_outputs_iso, prescale=prescale, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, @@ -6257,10 +6248,6 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_line( "Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], extra_outputs=extra_outputs_iso, prescale=prescale, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, @@ -7256,10 +7243,6 @@ def spruce_bctobspi_bstopipi_line( "Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, @@ -7306,10 +7289,6 @@ def spruce_bctobsk_bstodspi_line( "Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, @@ -7399,10 +7378,6 @@ def spruce_bctobsk_bstojpsiphi_line( "Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, @@ -7446,10 +7421,6 @@ def spruce_bctobsk_bstokk_line( "Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, @@ -7493,10 +7464,6 @@ def spruce_bctobsk_bstokpi_line( "Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, @@ -7661,10 +7628,6 @@ def spruce_lbtolctaunu_lctopksLL_tautopipipinu_line( "Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], extra_outputs=extra_outputs_iso, prescale=prescale, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, @@ -7711,10 +7674,6 @@ def spruce_lbtolctaunu_lctopksDD_tautopipipinu_line( "Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], extra_outputs=extra_outputs_iso, prescale=prescale, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, @@ -7761,10 +7720,6 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautopipipinu_line( "Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], extra_outputs=extra_outputs_iso, prescale=prescale, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, @@ -7811,10 +7766,6 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautopipipinu_line( "Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], extra_outputs=extra_outputs_iso, prescale=prescale, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, @@ -7986,10 +7937,6 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautopipipinu_line( "Hlt2Topo2BodyDecision", "Hlt2Topo3BodyDecision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, -- GitLab From e4b439bb052d4a31740d3ac53806633f19b0d502 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Mon, 27 Jan 2025 14:16:38 +0000 Subject: [PATCH 04/22] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/49951513 --- .../lines/semileptonic/spruce_semileptonic.py | 1833 ++++++++--------- 1 file changed, 843 insertions(+), 990 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index 925a82f1e6a..fdc25b5fe3e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -21,8 +21,8 @@ No lines have persistreco enabled """ from Moore.config import SpruceLine, register_line_builder -from RecoConf.algorithms_thor import ParticleContainersMerger from PyConf.dataflow import DataHandle +from RecoConf.algorithms_thor import ParticleContainersMerger from RecoConf.standard_particles import ( make_merged_pi0s, make_photons, @@ -147,16 +147,29 @@ from .HbToHuLNu import ( make_lbtopmunu_ss_fakep, ) from .HbToLLLNu import ( - make_b2mumumunu, make_b2emumunu, make_b2mueenu, make_b2eeenu, - make_b2mugammanu_cnvll, make_b2mugammanu_cnvdd, make_b2egammanu_cnvll, - make_b2egammanu_cnvdd, make_b2taumumunu_3pi, make_b2taueenu_3pi, - make_b2mumumunu_ss, make_b2emumunu_ss, make_b2mueenu_ss, make_b2eeenu_ss, - make_b2taumumunu_3pi_ss, make_b2taueenu_3pi_ss) -from .HbToHbprimeLNu import make_bctobsx -from .HbToTauNu_BTracking import (get_btracking_hlt2_particles_for_sprucing, - get_btracking_raw_banks, - make_spruce_filtered_btracking_parts, - get_btracking_extra_outputs_for_spruce) + make_b2eeenu, + make_b2eeenu_ss, + make_b2egammanu_cnvdd, + make_b2egammanu_cnvll, + make_b2emumunu, + make_b2emumunu_ss, + make_b2mueenu, + make_b2mueenu_ss, + make_b2mugammanu_cnvdd, + make_b2mugammanu_cnvll, + make_b2mumumunu, + make_b2mumumunu_ss, + make_b2taueenu_3pi, + make_b2taueenu_3pi_ss, + make_b2taumumunu_3pi, + make_b2taumumunu_3pi_ss, +) +from .HbToTauNu_BTracking import ( + get_btracking_extra_outputs_for_spruce, + get_btracking_hlt2_particles_for_sprucing, + get_btracking_raw_banks, + make_spruce_filtered_btracking_parts, +) from .isolationMVA import prepare_MVA from .pv_tracks import get_pv_tracks_for_bstar @@ -171,8 +184,9 @@ def get_neutral_tracks(): return ParticleContainersMerger(saved_tracks, name="extra_track_combiner") -def set_extra_outputs(name, b_iso_relations, bst_iso_relations, extra_tracks, - extra_neutrals) -> DataHandle: +def set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_tracks, extra_neutrals +) -> DataHandle: """Set the extra output for the line. Args: @@ -184,14 +198,15 @@ def set_extra_outputs(name, b_iso_relations, bst_iso_relations, extra_tracks, Returns: List for extra output. - """ - extra_output = [(f"{name}_extra_tracks", extra_tracks), - (f"{name}_extra_neutrals", extra_neutrals)] + """ + extra_output = [ + (f"{name}_extra_tracks", extra_tracks), + (f"{name}_extra_neutrals", extra_neutrals), + ] if b_iso_relations is not None: extra_output += [(f"{name}_signal_iso_relations", b_iso_relations)] if bst_iso_relations is not None: - extra_output += [(f"{name}_combination_iso_relations", - bst_iso_relations)] + extra_output += [(f"{name}_combination_iso_relations", bst_iso_relations)] return extra_output @@ -208,10 +223,8 @@ def spruce_bptod0taunu_d0tokpipipi_tautopipipinu_line( """ line_alg = make_bptod0taunu_d0tok3pi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -220,9 +233,9 @@ def spruce_bptod0taunu_d0tokpipipi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -249,14 +262,11 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( """ SL Spruce line for the decay Bc -> J/psi(1S)(-> mu mu) tau(-> mu nu nu) nu. """ - line_alg = make_bctojpsitaunu_jpsitomumu_tautolnunu( - process=PROCESS, lepton="mu") + line_alg = make_bctojpsitaunu_jpsitomumu_tautolnunu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) @@ -265,9 +275,9 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( name, line_alg, charged=True, charmed=True ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -280,26 +290,27 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( persistreco=persistreco, extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon, - monitoring_variables=_MONITORING_VARIABLES) + monitoring_variables=_MONITORING_VARIABLES, + ) @register_line_builder(spruce_lines) def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( - name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_FakeMuon", - prescale=0.5, - persistreco=False, - legacy_name=False): + name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_FakeMuon", + prescale=0.5, + persistreco=False, + legacy_name=False, +): """ SL Spruce line for the decay Bc -> J/psi(1S)(-> mu mu) tau(-> mu nu nu) nu, with a fake muon. """ line_alg = make_bctojpsitaunu_jpsitomumu_tautolnunu_fakelepton( - process=PROCESS, lepton="mu") + process=PROCESS, lepton="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) @@ -308,9 +319,9 @@ def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( name, line_alg, charged=True, charmed=True ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -321,7 +332,8 @@ def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( persistreco=persistreco, extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon, - monitoring_variables=_MONITORING_VARIABLES) + monitoring_variables=_MONITORING_VARIABLES, + ) @register_line_builder(spruce_lines) @@ -372,24 +384,22 @@ def spruce_b0todptaunu_dptokpipi_tautomununu_line( """ SL Spruce line for the decay B0 -> D+(-> K pi pi) tau(-> mu nu nu) nu. """ - line_alg = make_b0todptaunu_dptokpipi_tautolnunu( - process=PROCESS, lepton="mu") + line_alg = make_b0todptaunu_dptokpipi_tautolnunu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) line_mon = generate_default_monitoring_vars( - name, line_alg, charged=True, charmed=True) + name, line_alg, charged=True, charmed=True + ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -402,7 +412,8 @@ def spruce_b0todptaunu_dptokpipi_tautomununu_line( persistreco=persistreco, extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon, - monitoring_variables=_MONITORING_VARIABLES) + monitoring_variables=_MONITORING_VARIABLES, + ) @register_line_builder(spruce_lines) @@ -416,12 +427,11 @@ def spruce_b0todptaunu_dptokpipi_fakemuon_line( SL Spruce line for the decay B0 -> D+(-> K pi pi) tau(-> mu nu nu) nu, with a fake muon. """ line_alg = make_b0todptaunu_dptokpipi_tautolnunu_fakelepton( - process=PROCESS, lepton="mu") + process=PROCESS, lepton="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -431,9 +441,9 @@ def spruce_b0todptaunu_dptokpipi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -496,13 +506,10 @@ def spruce_butod0taunu_d0tokpi_tautomununu_line( """ SL Spruce line for the decay B+ -> D0(-> K pi) tau(-> mu nu nu) nu. """ - line_alg = make_butod0taunu_d0tokpi_tautolnunu( - process=PROCESS, lepton="mu") + line_alg = make_butod0taunu_d0tokpi_tautolnunu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -511,9 +518,9 @@ def spruce_butod0taunu_d0tokpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -541,12 +548,11 @@ def spruce_butod0taunu_d0tokpi_fakemuon_line( SL Spruce line for the decay B+ -> D0(-> K pi) tau(-> mu nu nu) nu, with a fake muon. """ line_alg = make_butod0taunu_d0tokpi_tautolnunu_fakelepton( - process=PROCESS, lepton="mu") + process=PROCESS, lepton="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -555,9 +561,9 @@ def spruce_butod0taunu_d0tokpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -620,13 +626,10 @@ def spruce_butod0taunu_d0tok3pi_tautomununu_line( """ SL Spruce line for the decay B+ -> D0(-> K pi pi pi) tau(-> mu nu nu) nu. """ - line_alg = make_butod0taunu_d0tok3pi_tautolnunu( - process=PROCESS, lepton="mu") + line_alg = make_butod0taunu_d0tok3pi_tautolnunu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -635,9 +638,9 @@ def spruce_butod0taunu_d0tok3pi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -665,12 +668,11 @@ def spruce_butod0taunu_d0tok3pi_fakemuon_line( SL Spruce line for the decay B+ -> D0(-> K pi pi pi) tau(-> mu nu nu) nu, with a fake muon. """ line_alg = make_butod0taunu_d0tok3pi_tautolnunu_fakelepton( - process=PROCESS, lepton="mu") + process=PROCESS, lepton="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -679,9 +681,9 @@ def spruce_butod0taunu_d0tok3pi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -744,13 +746,10 @@ def spruce_bstodstaunu_dstokkpi_tautomununu_line( """ SL Spruce line for the decay Bs0 -> Ds-(-> K K pi) tau+(-> mu nu nu) nu, and combinatorial (same sign). """ - line_alg = make_bstodstaunu_dstokkpi_tautolnunu( - process=PROCESS, lepton="mu") + line_alg = make_bstodstaunu_dstokkpi_tautolnunu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -760,9 +759,9 @@ def spruce_bstodstaunu_dstokkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -790,12 +789,11 @@ def spruce_bstodstaunu_dstokkpi_fakemuon_line( SL Spruce line for the decay Bs0 -> Ds-(-> K K pi) tau+(-> mu nu nu) nu and combinatorial (same sign), with a fake muon. """ line_alg = make_bstodstaunu_dstokkpi_tautolnunu_fakelepton( - process=PROCESS, lepton="mu") + process=PROCESS, lepton="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -805,9 +803,9 @@ def spruce_bstodstaunu_dstokkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -872,10 +870,8 @@ def spruce_lbtolcmunu_lctopkpi_line( """ line_alg = make_lbtolclnu_lctopkpi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -884,9 +880,9 @@ def spruce_lbtolcmunu_lctopkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -915,10 +911,8 @@ def spruce_lbtolcmunu_lctopkpi_fakemuon_line( """ line_alg = make_lbtolclnu_lctopkpi_fakelepton(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -927,9 +921,9 @@ def spruce_lbtolcmunu_lctopkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -994,10 +988,8 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_line( """ line_alg = make_lbtolctaunu_lctopkpi_tautolnu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1006,9 +998,9 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1036,12 +1028,11 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_fakemuon_line( SL Spruce line for the decay Lb0 -> Lc+(-> p K pi) tau-(-> mu nu nu) nu, with a fake muon. """ line_alg = make_lbtolctaunu_lctopkpi_tautolnu_fakelepton( - process=PROCESS, lepton="mu") + process=PROCESS, lepton="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1050,9 +1041,9 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1117,10 +1108,8 @@ def spruce_bctojpsimunu_jpsitomumu_line( """ line_alg = make_bctojpsilnu_jpsitomumu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1129,9 +1118,9 @@ def spruce_bctojpsimunu_jpsitomumu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -1158,13 +1147,10 @@ def spruce_bctojpsimunu_jpsitomumu_fakemuon_line( """ SL Spruce line for the decay Bc+ -> Jpsi(-> mu mu) mu nu, with a fake muon. """ - line_alg = make_bctojpsilnu_jpsitomumu_fakelepton( - process=PROCESS, lepton="mu") + line_alg = make_bctojpsilnu_jpsitomumu_fakelepton(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1173,9 +1159,9 @@ def spruce_bctojpsimunu_jpsitomumu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -1240,10 +1226,8 @@ def spruce_butod0munu_d0tokpi_line( """ line_alg = make_butod0lnu_d0tokpi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) @@ -1253,9 +1237,9 @@ def spruce_butod0munu_d0tokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1284,10 +1268,8 @@ def spruce_butod0munu_d0tokpi_fakemuon_line( """ line_alg = make_butod0lnu_d0tokpi_fakelepton(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) line_mon = generate_default_monitoring_vars( @@ -1296,9 +1278,9 @@ def spruce_butod0munu_d0tokpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1362,10 +1344,8 @@ def spruce_butod0enu_d0tokpi_line( """ line_alg = make_butod0lnu_d0tokpi(process=PROCESS, lepton="e") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1374,9 +1354,9 @@ def spruce_butod0enu_d0tokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1405,10 +1385,8 @@ def spruce_butod0enu_d0tokpi_fakeelectron_line( """ line_alg = make_butod0lnu_d0tokpi_fakelepton(process=PROCESS, lepton="e") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1417,9 +1395,9 @@ def spruce_butod0enu_d0tokpi_fakeelectron_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1446,10 +1424,8 @@ def spruce_butod0munu_d0tok3pi_line( """ line_alg = make_butod0lnu_d0tok3pi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1458,9 +1434,9 @@ def spruce_butod0munu_d0tok3pi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1489,10 +1465,8 @@ def spruce_butod0munu_d0tok3pi_fakemuon_line( """ line_alg = make_butod0lnu_d0tok3pi_fakelepton(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1501,9 +1475,9 @@ def spruce_butod0munu_d0tok3pi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1568,10 +1542,8 @@ def spruce_b0todpmunu_dptokpipi_line( """ line_alg = make_b0todplnu_dptokpipi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1580,9 +1552,9 @@ def spruce_b0todpmunu_dptokpipi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1609,13 +1581,10 @@ def spruce_b0todpmunu_dptokpipi_fakemuon_line( """ SL Spruce line for the decay B0 -> D+(-> K pi pi) mu nu, with a fake muon. """ - line_alg = make_b0todplnu_dptokpipi_fakelepton( - process=PROCESS, lepton="mu") + line_alg = make_b0todplnu_dptokpipi_fakelepton(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1624,9 +1593,9 @@ def spruce_b0todpmunu_dptokpipi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1691,10 +1660,8 @@ def spruce_b0todpmunu_dptokkpi_line( """ line_alg = make_b0todplnu_dptokkpi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1703,9 +1670,9 @@ def spruce_b0todpmunu_dptokkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1734,10 +1701,8 @@ def spruce_b0todpmunu_dptokkpi_fakemuon_line( """ line_alg = make_b0todplnu_dptokkpi_fakelepton(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1746,9 +1711,9 @@ def spruce_b0todpmunu_dptokkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1813,10 +1778,8 @@ def spruce_bstodsmunu_dstokkpi_line( """ line_alg = make_bstodslnu_dstokkpi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1825,9 +1788,9 @@ def spruce_bstodsmunu_dstokkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1855,12 +1818,11 @@ def spruce_bstodstlnu_dsttodsgamma_dstokkpi_gammatoee_line( SL Spruce line for the decay B_s0 -> D*s(-> Ds(-> K K pi) gamma (-> ee) ) mu nu. """ line_alg = make_bstodstlnu_dsttodsgamma_dstokkpi_gammatoee( - process=PROCESS, lepton="mu") + process=PROCESS, lepton="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1869,9 +1831,9 @@ def spruce_bstodstlnu_dsttodsgamma_dstokkpi_gammatoee_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1900,10 +1862,8 @@ def spruce_bstodsmunu_dstokkpi_fakemuon_line( """ line_alg = make_bstodslnu_dstokkpi_fakelepton(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1912,9 +1872,9 @@ def spruce_bstodsmunu_dstokkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1981,10 +1941,8 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_line( """ line_alg = make_xib0toxicplusmunu_xicplustopkpi(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=False, charmed=True @@ -1992,9 +1950,9 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2023,13 +1981,10 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_line( Xi_b0 -> Xi_c+ (-> p K- pi+) tau- (-> mu- nu nu) nu (Right sign) Xi_b0 -> Xi_c+ (-> p K- pi+) tau+ (-> mu+ nu nu) nu (Wrong sign) """ - line_alg = make_xib0toxicplustaunu_xicplustopkpi_tautomununu( - process=PROCESS) + line_alg = make_xib0toxicplustaunu_xicplustopkpi_tautomununu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2038,9 +1993,9 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2071,10 +2026,8 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_fakemuon_line( """ line_alg = make_xib0toxicplusmunu_xicplustopkpi_fakelepton(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=False, charmed=True @@ -2082,9 +2035,9 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2151,12 +2104,11 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_fakemuon_line( Xi_b0 -> Xi_c+ (-> p K- pi+) tau+ (-> mu+ nu nu) nu (Wrong sign) """ line_alg = make_xib0toxicplustaunu_xicplustopkpi_tautomununu_fakelepton( - process=PROCESS) + process=PROCESS + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2165,9 +2117,9 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2236,10 +2188,8 @@ def spruce_xibminustoxic0munu_xic0topkkpi_line( """ line_alg = make_xibminustoxic0munu_xic0topkkpi(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True @@ -2247,9 +2197,9 @@ def spruce_xibminustoxic0munu_xic0topkkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2278,13 +2228,10 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_line( Xi_b- -> Xi_c0 (-> p K- K- pi+) tau- (-> mu- nu nu) nu (Right sign) Xi_b- -> Xi_c0 (-> p K- K- pi+) tau+ (-> mu+ nu nu) nu (Wrong sign) """ - line_alg = make_xibminustoxic0taunu_xic0topkkpi_tautomununu( - process=PROCESS) + line_alg = make_xibminustoxic0taunu_xic0topkkpi_tautomununu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2293,9 +2240,9 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2326,10 +2273,8 @@ def spruce_xibminustoxic0munu_xic0topkkpi_fakemuon_line( """ line_alg = make_xibminustoxic0munu_xic0topkkpi_fakelepton(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True @@ -2337,9 +2282,9 @@ def spruce_xibminustoxic0munu_xic0topkkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2406,12 +2351,11 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_fakemuon_line( Xi_b- -> Xi_c0 (-> p K- K- pi+) tau+ (-> mu+ nu nu) nu (Wrong sign) """ line_alg = make_xibminustoxic0taunu_xic0topkkpi_tautomununu_fakelepton( - process=PROCESS) + process=PROCESS + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2420,9 +2364,9 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2489,10 +2433,8 @@ def spruce_b0todptaunu_dptokpipi_tautopipipinu_line( """ line_alg = make_b0todptaunu_dptokpipi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2501,9 +2443,9 @@ def spruce_b0todptaunu_dptokpipi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2532,10 +2474,8 @@ def spruce_bctojpsitaunu_jpsitomumu_tautopipipinu_line( """ line_alg = make_bctojpsitaunu_jpsitomumu_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2544,9 +2484,9 @@ def spruce_bctojpsitaunu_jpsitomumu_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2575,10 +2515,8 @@ def spruce_bptod0taunu_d0tokpi_tautopipipinu_line( """ line_alg = make_bptod0taunu_d0tokpi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2587,9 +2525,9 @@ def spruce_bptod0taunu_d0tokpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2618,10 +2556,8 @@ def spruce_bstodstaunu_dstokkpi_tautopipipinu_line( """ line_alg = make_bstodstaunu_dstokkpi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2630,9 +2566,9 @@ def spruce_bstodstaunu_dstokkpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, hlt2_filter_code=[ @@ -2660,10 +2596,8 @@ def spruce_lbtolctaunu_lctopkpi_tautopipipinu_line( """ line_alg = make_lbtolctaunu_lctopkpi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2672,9 +2606,9 @@ def spruce_lbtolctaunu_lctopkpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2705,7 +2639,8 @@ def spruce_b0topimunu_line( parent="B0", anti_parent="B~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2714,9 +2649,9 @@ def spruce_b0topimunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2744,14 +2679,15 @@ def spruce_b0topimunu_fakemuon_line( SL Spruce line for the decay B0 -> pi mu nu, with a fake muon. """ line_alg = make_b0topimunu_fakemu(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B0", anti_parent="B~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2760,9 +2696,9 @@ def spruce_b0topimunu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2826,14 +2762,15 @@ def spruce_b0topimunu_fakek_line( SL Spruce line for the decay B0 -> pi mu, with a fake pions. """ line_alg = make_b0topimunu_fakek(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B0", anti_parent="B~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2842,9 +2779,9 @@ def spruce_b0topimunu_fakek_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2868,10 +2805,8 @@ def spruce_lbtopmunu_line( """ line_alg = make_lbtopmunu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2880,9 +2815,9 @@ def spruce_lbtopmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2907,10 +2842,8 @@ def spruce_lbtopmunu_fakep_line( """ line_alg = make_lbtopmunu_fakep(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2919,9 +2852,9 @@ def spruce_lbtopmunu_fakep_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2948,10 +2881,8 @@ def spruce_lbtopmunu_fakemuon_line( """ line_alg = make_lbtopmunu_fakemu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2960,9 +2891,9 @@ def spruce_lbtopmunu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3022,10 +2953,8 @@ def spruce_lbtopmunu_ss_line( """ line_alg = make_lbtopmunu_ss(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3034,9 +2963,9 @@ def spruce_lbtopmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3065,10 +2994,8 @@ def spruce_lbtopmunu_ss_fakep_line( """ line_alg = make_lbtopmunu_ss_fakep(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3077,9 +3004,9 @@ def spruce_lbtopmunu_ss_fakep_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3106,10 +3033,8 @@ def spruce_lbtopmunu_ss_fakemuon_line( """ line_alg = make_lbtopmunu_ss_fakemu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3118,9 +3043,9 @@ def spruce_lbtopmunu_ss_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3179,14 +3104,15 @@ def spruce_bstokmunu_line( SL Spruce line for the decay Bs0 -> K mu nu. """ line_alg = make_bstokmunu(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B_s0", anti_parent="B_s~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -3196,9 +3122,9 @@ def spruce_bstokmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3269,7 +3195,8 @@ def spruce_bstokmunu_fakemuon_line( parent="B_s0", anti_parent="B_s~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3278,9 +3205,9 @@ def spruce_bstokmunu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3426,12 +3353,13 @@ def spruce_bstokmunu_fakek_line( parent="B_s0", anti_parent="B_s~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) line_mon = generate_default_monitoring_vars( name, line_alg, charged=False, charmed=False @@ -3578,7 +3506,8 @@ def spruce_bstokenu_line(name="SpruceSLB_BsToKENu", prescale=1, persistreco=Fals parent="B_s0", anti_parent="B_s~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3587,9 +3516,9 @@ def spruce_bstokenu_line(name="SpruceSLB_BsToKENu", prescale=1, persistreco=Fals hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3657,7 +3586,8 @@ def spruce_bstokenu_fakeelectron_line( parent="B_s0", anti_parent="B_s~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3666,9 +3596,9 @@ def spruce_bstokenu_fakeelectron_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3732,7 +3662,8 @@ def spruce_bstokenu_fakek_line( parent="B_s0", anti_parent="B_s~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3741,9 +3672,9 @@ def spruce_bstokenu_fakek_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3836,14 +3767,15 @@ def spruce_b2ppbarmunu_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays """ line_alg = make_b2ppbarmunu(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -3853,9 +3785,9 @@ def spruce_b2ppbarmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3881,14 +3813,15 @@ def spruce_b2ppbarmunu_ss_line( """ line_alg = make_b2ppbarmunu_ss(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -3898,9 +3831,9 @@ def spruce_b2ppbarmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3929,14 +3862,15 @@ def spruce_b2ppbarmunu_fakep_line( """ line_alg = make_b2ppbarmunu_fakep(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -3946,9 +3880,9 @@ def spruce_b2ppbarmunu_fakep_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3975,14 +3909,15 @@ def spruce_b2ppbarmunu_fakemuon_line( """ line_alg = make_b2ppbarmunu_fakemu(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -3992,9 +3927,9 @@ def spruce_b2ppbarmunu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4064,17 +3999,18 @@ def spruce_b2pipimunu_line( b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, - parent='B+', - anti_parent='B-', + parent="B+", + anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4108,18 +4044,19 @@ def spruce_b2pipimunu_ss_line( b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, - parent='B+', - anti_parent='B-', + parent="B+", + anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4154,18 +4091,19 @@ def spruce_b2pipimunu_fakemuon_line( b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, - parent='B+', - anti_parent='B-', + parent="B+", + anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4238,18 +4176,19 @@ def spruce_b2pipimunu_fakepi_line( b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, - parent='B+', - anti_parent='B-', + parent="B+", + anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4273,14 +4212,15 @@ def spruce_b2kkmunu_line( """ line_alg = make_b2kkmunu(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4290,9 +4230,9 @@ def spruce_b2kkmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4318,14 +4258,15 @@ def spruce_b2kkmunu_ss_line( """ line_alg = make_b2kkmunu_ss(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4335,9 +4276,9 @@ def spruce_b2kkmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4366,14 +4307,15 @@ def spruce_b2kkmunu_fakemuon_line( """ line_alg = make_b2kkmunu_fakemu(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4383,9 +4325,9 @@ def spruce_b2kkmunu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4453,7 +4395,8 @@ def spruce_b2mumumunu_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4463,9 +4406,9 @@ def spruce_b2mumumunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4497,7 +4440,8 @@ def spruce_b2emumunu_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4507,9 +4451,9 @@ def spruce_b2emumunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4541,7 +4485,8 @@ def spruce_b2mueenu_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4551,9 +4496,9 @@ def spruce_b2mueenu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4588,7 +4533,8 @@ def spruce_b2mugammanu_cnvll_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4597,9 +4543,9 @@ def spruce_b2mugammanu_cnvll_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4634,7 +4580,8 @@ def spruce_b2mugammanu_cnvdd_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4643,9 +4590,9 @@ def spruce_b2mugammanu_cnvdd_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4680,7 +4627,8 @@ def spruce_b2egammanu_cnvll_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4689,9 +4637,9 @@ def spruce_b2egammanu_cnvll_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4726,7 +4674,8 @@ def spruce_b2egammanu_cnvdd_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4735,9 +4684,9 @@ def spruce_b2egammanu_cnvdd_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4769,7 +4718,8 @@ def spruce_b2eeenu_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4779,9 +4729,9 @@ def spruce_b2eeenu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4813,16 +4763,17 @@ def spruce_b2taumumunu_3pi_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=False ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4850,16 +4801,17 @@ def spruce_b2taueenu_3pi_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=False ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4887,7 +4839,8 @@ def spruce_b2mumumunu_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4897,9 +4850,9 @@ def spruce_b2mumumunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4931,7 +4884,8 @@ def spruce_b2emumunu_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4941,9 +4895,9 @@ def spruce_b2emumunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4975,7 +4929,8 @@ def spruce_b2mueenu_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4985,9 +4940,9 @@ def spruce_b2mueenu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5019,7 +4974,8 @@ def spruce_b2eeenu_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -5029,9 +4985,9 @@ def spruce_b2eeenu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5063,7 +5019,8 @@ def spruce_b2taumumunu_3pi_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -5071,9 +5028,9 @@ def spruce_b2taumumunu_3pi_ss_line( name, line_alg, charged=True, charmed=False ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5101,7 +5058,8 @@ def spruce_b2taueenu_3pi_ss( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -5109,9 +5067,9 @@ def spruce_b2taueenu_3pi_ss( name, line_alg, charged=True, charmed=False ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5136,10 +5094,8 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_line( """ line_alg = make_omegabtoomegacmunu_omegactopkkpi(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5148,9 +5104,9 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5177,13 +5133,10 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_fakemuon_line( """ SL Spruce line for the decay [Omegab- -> Omegac0(-> p K- K- pi+) mu nu]cc with a fake muon. """ - line_alg = make_omegabtoomegacmunu_omegactopkkpi_fakelepton( - process=PROCESS) + line_alg = make_omegabtoomegacmunu_omegactopkkpi_fakelepton(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5192,9 +5145,9 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5257,13 +5210,10 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_line( """ SL Spruce line for the decay Omegab- -> Omegac0(-> p K- K- pi+) tau-(-> mu nu nu) nu. """ - line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautomununu( - process=PROCESS) + line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautomununu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -5273,9 +5223,9 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5303,12 +5253,11 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_fakemuon_line( SL Spruce line for the decay Omegab- -> Omegac0(-> p K- K- pi+) tau-(-> mu nu nu) nu, with a fake muon. """ line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautomununu_fakelepton( - process=PROCESS) + process=PROCESS + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -5318,9 +5267,9 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5385,12 +5334,11 @@ def spruce_lbtolcmunu_lctopksLL_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu") + process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5399,9 +5347,9 @@ def spruce_lbtolcmunu_lctopksLL_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5430,12 +5378,11 @@ def spruce_lbtolcmunu_lctopksDD_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'downstream' tracks ('DD' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu") + process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5444,9 +5391,9 @@ def spruce_lbtolcmunu_lctopksDD_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5475,12 +5422,11 @@ def spruce_lbtolcmunu_lctopksLL_fakemuon_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolclnu_lctoV0h_fakelepton( - process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu") + process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5489,9 +5435,9 @@ def spruce_lbtolcmunu_lctopksLL_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5561,12 +5507,11 @@ def spruce_lbtolcmunu_lctopksDD_fakemuon_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'downstream' tracks ('DD' category). """ line_alg = make_lbtolclnu_lctoV0h_fakelepton( - process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu") + process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5575,9 +5520,9 @@ def spruce_lbtolcmunu_lctopksDD_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5647,12 +5592,11 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu( - process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu") + process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -5662,9 +5606,9 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5693,12 +5637,11 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('DD' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu( - process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu") + process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -5708,9 +5651,9 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5739,12 +5682,11 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_fakemuon_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu_fakelepton( - process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu") + process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -5754,9 +5696,9 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5826,12 +5768,11 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_fakemuon_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('DD' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu_fakelepton( - process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu") + process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -5841,9 +5782,9 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5913,12 +5854,11 @@ def spruce_lbtolcmunu_lctolambdapiLL_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu") + process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5927,9 +5867,9 @@ def spruce_lbtolcmunu_lctolambdapiLL_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5958,12 +5898,11 @@ def spruce_lbtolcmunu_lctolambdapiDD_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'downstream' tracks ('DD' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu") + process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5972,9 +5911,9 @@ def spruce_lbtolcmunu_lctolambdapiDD_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6003,12 +5942,11 @@ def spruce_lbtolcmunu_lctolambdapiLL_fakemuon_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolclnu_lctoV0h_fakelepton( - process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu") + process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6017,9 +5955,9 @@ def spruce_lbtolcmunu_lctolambdapiLL_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6089,12 +6027,11 @@ def spruce_lbtolcmunu_lctolambdapiDD_fakemuon_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'downstream' tracks ('DD' category). """ line_alg = make_lbtolclnu_lctoV0h_fakelepton( - process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu") + process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6103,9 +6040,9 @@ def spruce_lbtolcmunu_lctolambdapiDD_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6175,12 +6112,11 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu( - process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu") + process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6190,9 +6126,9 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6221,12 +6157,11 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('DD' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu( - process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu") + process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6236,9 +6171,9 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6267,12 +6202,11 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_fakemuon_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu_fakelepton( - process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu") + process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6281,9 +6215,9 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -6351,12 +6285,11 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_fakemuon_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('DD' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautolnu_fakelepton( - process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu") + process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6366,9 +6299,9 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6437,13 +6370,10 @@ def spruce_bctobsmunu_bstodspi_line( SL Spruce line for the decay Bc -> Bs mu nu with Bs -> Ds pi """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToDsPi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToDsPi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6453,9 +6383,9 @@ def spruce_bctobsmunu_bstodspi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -6483,13 +6413,10 @@ def spruce_bctobsmunu_bstodsk_line( SL Spruce line for the decay Bc -> Bs mu nu with Bs -> Ds K """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToDsK") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToDsK") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6499,9 +6426,9 @@ def spruce_bctobsmunu_bstodsk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -6530,12 +6457,11 @@ def spruce_bctobsmunu_bstojpsiphi_line( """ line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToJpsiPhi") + process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToJpsiPhi" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6545,9 +6471,9 @@ def spruce_bctobsmunu_bstojpsiphi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -6575,13 +6501,10 @@ def spruce_bctobsmunu_bstokk_line( SL Spruce line for the decay Bc -> Bs mu nu with Bs -> K- K+ """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToKK") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToKK") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6591,9 +6514,9 @@ def spruce_bctobsmunu_bstokk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -6621,13 +6544,10 @@ def spruce_bctobsmunu_bstokpi_line( SL Spruce line for the decay Bc -> Bs mu nu with Bs -> K+ pi- and CC """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToKPi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToKPi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6637,9 +6557,9 @@ def spruce_bctobsmunu_bstokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -6667,13 +6587,10 @@ def spruce_bctobsmunu_bstopipi_line( SL Spruce line for the decay Bc -> Bs mu nu with Bs -> pi+ pi- """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToPiPi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsMuNu", BsDecay="BsToPiPi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6683,9 +6600,9 @@ def spruce_bctobsmunu_bstopipi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -6713,13 +6630,10 @@ def spruce_bctobsenu_bstodspi_line( SL Spruce line for the decay Bc -> Bs e nu with Bs -> Ds pi """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToDsPi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToDsPi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6729,9 +6643,9 @@ def spruce_bctobsenu_bstodspi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -6759,13 +6673,10 @@ def spruce_bctobsenu_bstodsk_line( SL Spruce line for the decay Bc -> Bs e nu with Bs -> Ds K """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToDsK") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToDsK") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6775,9 +6686,9 @@ def spruce_bctobsenu_bstodsk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -6805,13 +6716,10 @@ def spruce_bctobsenu_bstojpsiphi_line( SL Spruce line for the decay Bc -> Bs e nu with Bs -> J/psi phi """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToJpsiPhi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToJpsiPhi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6821,9 +6729,9 @@ def spruce_bctobsenu_bstojpsiphi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -6851,13 +6759,10 @@ def spruce_bctobsenu_bstokk_line( SL Spruce line for the decay Bc -> Bs e nu with Bs -> K- K+ """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToKK") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToKK") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6867,9 +6772,9 @@ def spruce_bctobsenu_bstokk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -6897,13 +6802,10 @@ def spruce_bctobsenu_bstokpi_line( SL Spruce line for the decay Bc -> Bs e nu with Bs -> K+ pi- and CC """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToKPi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToKPi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6913,9 +6815,9 @@ def spruce_bctobsenu_bstokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -6943,13 +6845,10 @@ def spruce_bctobsenu_bstopipi_line( SL Spruce line for the decay Bc -> Bs e nu with Bs -> pi+ pi- """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToPiPi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsENu", BsDecay="BsToPiPi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -6959,9 +6858,9 @@ def spruce_bctobsenu_bstopipi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -6989,13 +6888,10 @@ def spruce_bctobspi_bstodspi_line( SL Spruce line for the decay Bc -> Bs pi with Bs -> Ds pi """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToDsPi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToDsPi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7005,9 +6901,9 @@ def spruce_bctobspi_bstodspi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7035,13 +6931,10 @@ def spruce_bctobspi_bstodsk_line( SL Spruce line for the decay Bc -> Bs pi with Bs -> Ds K """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToDsK") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToDsK") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7051,9 +6944,9 @@ def spruce_bctobspi_bstodsk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7081,13 +6974,10 @@ def spruce_bctobspi_bstojpsiphi_line( SL Spruce line for the decay Bc -> Bs pi with Bs -> J/psi phi """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToJpsiPhi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToJpsiPhi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7097,9 +6987,9 @@ def spruce_bctobspi_bstojpsiphi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7124,13 +7014,10 @@ def spruce_bctobspi_bstokk_line( SL Spruce line for the decay Bc -> Bs pi with Bs -> K+ K- """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToKK") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToKK") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7140,9 +7027,9 @@ def spruce_bctobspi_bstokk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7170,13 +7057,10 @@ def spruce_bctobspi_bstokpi_line( SL Spruce line for the decay Bc -> Bs pi with Bs -> K+ pi- """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToKPi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToKPi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7186,9 +7070,9 @@ def spruce_bctobspi_bstokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7216,13 +7100,10 @@ def spruce_bctobspi_bstopipi_line( SL Spruce line for the decay Bc -> Bs pi with Bs -> pi+ pi- """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToPiPi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsPi", BsDecay="BsToPiPi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7232,9 +7113,9 @@ def spruce_bctobspi_bstopipi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7262,13 +7143,10 @@ def spruce_bctobsk_bstodspi_line( SL Spruce line for the decay Bc -> Bs K with Bs -> Ds pi """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToDsPi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToDsPi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7278,9 +7156,9 @@ def spruce_bctobsk_bstodspi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7305,13 +7183,10 @@ def spruce_bctobsk_bstodsk_line( SL Spruce line for the decay Bc -> Bs K with Bs -> Ds K """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToDsK") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToDsK") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7321,9 +7196,9 @@ def spruce_bctobsk_bstodsk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7351,13 +7226,10 @@ def spruce_bctobsk_bstojpsiphi_line( SL Spruce line for the decay Bc -> Bs K with Bs -> J/psi phi """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToJpsiPhi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToJpsiPhi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7367,9 +7239,9 @@ def spruce_bctobsk_bstojpsiphi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7394,13 +7266,10 @@ def spruce_bctobsk_bstokk_line( SL Spruce line for the decay Bc -> Bs K with Bs -> K+ K- """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToKK") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToKK") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7410,9 +7279,9 @@ def spruce_bctobsk_bstokk_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7437,13 +7306,10 @@ def spruce_bctobsk_bstokpi_line( SL Spruce line for the decay Bc -> Bs K with Bs -> K+ pi- and CC """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToKPi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToKPi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7453,9 +7319,9 @@ def spruce_bctobsk_bstokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7483,13 +7349,10 @@ def spruce_bctobsk_bstopipi_line( SL Spruce line for the decay Bc -> Bs K with Bs -> pi+ pi- """ - line_alg = make_bctobsx( - process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToPiPi") + line_alg = make_bctobsx(process=PROCESS, BcDecay="BcToBsK", BsDecay="BsToPiPi") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7499,9 +7362,9 @@ def spruce_bctobsk_bstopipi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7601,12 +7464,11 @@ def spruce_lbtolctaunu_lctopksLL_tautopipipinu_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautopipipinu( - process=PROCESS, V0_name="KS0", V0_type="LL") + process=PROCESS, V0_name="KS0", V0_type="LL" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7616,9 +7478,9 @@ def spruce_lbtolctaunu_lctopksLL_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -7647,12 +7509,11 @@ def spruce_lbtolctaunu_lctopksDD_tautopipipinu_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('DD' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautopipipinu( - process=PROCESS, V0_name="KS0", V0_type="DD") + process=PROCESS, V0_name="KS0", V0_type="DD" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7662,9 +7523,9 @@ def spruce_lbtolctaunu_lctopksDD_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -7693,12 +7554,11 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautopipipinu_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautopipipinu( - process=PROCESS, V0_name="Lambda0", V0_type="LL") + process=PROCESS, V0_name="Lambda0", V0_type="LL" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7708,9 +7568,9 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -7739,12 +7599,11 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautopipipinu_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('DD' category). """ line_alg = make_lbtolctaunu_lctoV0h_tautopipipinu( - process=PROCESS, V0_name="Lambda0", V0_type="DD") + process=PROCESS, V0_name="Lambda0", V0_type="DD" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7754,9 +7613,9 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -7785,10 +7644,8 @@ def spruce_lbtolctaunu_lctopphi_tautopipipinu_line( """ line_alg = make_lbtolctaunu_lctopphi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -7797,9 +7654,9 @@ def spruce_lbtolctaunu_lctopphi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7870,20 +7727,19 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautopipipinu_line( """ line_alg = make_xibminustoxic0taunu_xic0topkkpi_tautopipipinu(process=PROCESS) line_mon = generate_default_monitoring_vars( - name, line_alg, charged=True, charmed=True) + name, line_alg, charged=True, charmed=True + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7910,13 +7766,10 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautopipipinu_line( """ SL Spruce line for the decay Omegab- -> Omegac0(-> p K- K- pi+) tau- nu, hadronic tau decay """ - line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautopipipinu( - process=PROCESS) + line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -7926,9 +7779,9 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, -- GitLab From 27e1928fa050a48dacc52059b2a6de43f8e97750 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 27 Jan 2025 22:41:53 +0100 Subject: [PATCH 05/22] Fix changes during rebase --- .../lines/semileptonic/spruce_semileptonic.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index fdc25b5fe3e..8672dec827f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -269,12 +269,12 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( ) extra_neutrals = get_neutral_tracks() - hlt2_name = map_line_name(name, legacy_name=legacy_name) - line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True ) + hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs( name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals ) @@ -312,13 +312,12 @@ def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() - - hlt2_name = map_line_name(name, legacy_name=legacy_name) - line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True ) + hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs( name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals ) @@ -391,12 +390,12 @@ def spruce_b0todptaunu_dptokpipi_tautomununu_line( ) extra_neutrals = get_neutral_tracks() - hlt2_name = map_line_name(name, legacy_name=legacy_name) - line_mon = generate_default_monitoring_vars( - name, line_alg, charged=True, charmed=True + name, line_alg, charged=False, charmed=True ) + hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs( name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals ) -- GitLab From 9058cfd3a2d01162bd07e2fe5c8c3993f2121b9b Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 27 Jan 2025 22:54:07 +0100 Subject: [PATCH 06/22] Fix name of spruce line and remove commented lines --- .../lines/semileptonic/spruce_semileptonic.py | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index 8672dec827f..4b91bac957e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -296,7 +296,7 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( @register_line_builder(spruce_lines) def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( - name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_FakeMuon", + name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", prescale=0.5, persistreco=False, legacy_name=False, @@ -2678,7 +2678,6 @@ def spruce_b0topimunu_fakemuon_line( SL Spruce line for the decay B0 -> pi mu nu, with a fake muon. """ line_alg = make_b0topimunu_fakemu(process=PROCESS) - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -2761,7 +2760,6 @@ def spruce_b0topimunu_fakek_line( SL Spruce line for the decay B0 -> pi mu, with a fake pions. """ line_alg = make_b0topimunu_fakek(process=PROCESS) - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -3103,7 +3101,6 @@ def spruce_bstokmunu_line( SL Spruce line for the decay Bs0 -> K mu nu. """ line_alg = make_bstokmunu(process=PROCESS) - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -3766,7 +3763,6 @@ def spruce_b2ppbarmunu_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays """ line_alg = make_b2ppbarmunu(process=PROCESS) - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -3811,8 +3807,6 @@ def spruce_b2ppbarmunu_ss_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays with same-sign protons """ line_alg = make_b2ppbarmunu_ss(process=PROCESS) - - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -3860,8 +3854,6 @@ def spruce_b2ppbarmunu_fakep_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays with a fake proton of opposite sign to muon """ line_alg = make_b2ppbarmunu_fakep(process=PROCESS) - - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -3907,8 +3899,6 @@ def spruce_b2ppbarmunu_fakemuon_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays with a fake muon """ line_alg = make_b2ppbarmunu_fakemu(process=PROCESS) - - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4210,8 +4200,6 @@ def spruce_b2kkmunu_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays """ line_alg = make_b2kkmunu(process=PROCESS) - - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4256,8 +4244,6 @@ def spruce_b2kkmunu_ss_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays with same-sign kaons """ line_alg = make_b2kkmunu_ss(process=PROCESS) - - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4305,8 +4291,6 @@ def spruce_b2kkmunu_fakemuon_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays with a fake muon """ line_alg = make_b2kkmunu_fakemu(process=PROCESS) - - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, -- GitLab From 02bd65883734d29891903242dd01dd0624fa3e04 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 27 Jan 2025 12:31:51 +0100 Subject: [PATCH 07/22] Squashed commit of the following: commit 911d563fa5ff5cc29e45a0de12581cb0c0d7bbbe Author: Tommaso Fulghesu Date: Sun Jan 19 21:44:27 2025 +0100 Use only extra tracks not duplicated commit 994edab40900403a22fe7bef328f50f1a807b58d Author: Gitlab CI Date: Thu Jan 16 11:09:36 2025 +0000 Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/49414770 commit 45e8c3083f3d73a8acb036d3ec162fb09f55fcf6 Author: Tommaso Fulghesu Date: Thu Jan 16 12:08:52 2025 +0100 Fix linting commit 253950879e5ecf060da05a8f32609106848e2af6 Author: Tommaso Fulghesu Date: Thu Jan 16 09:58:47 2025 +0100 Fix linting commit 6cbb3e35f78d6400546f1c8ac4977521abb2a0ae Author: Gitlab CI Date: Thu Jan 16 08:55:20 2025 +0000 Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/49406999 commit 254abca33da46311565c3e6b5f833c88ebcbc7cf Author: Tommaso Fulghesu Date: Thu Jan 16 09:54:42 2025 +0100 Fix linting and returned value for legacy name case commit de9b7d10f94dedb092a3908435685aa8ebfee919 Author: Tommaso Fulghesu Date: Thu Jan 16 09:29:18 2025 +0100 Test fixing linting commit 7b4ea77fd924c664f856929f1f4788af9fad6193 Author: Tommaso Fulghesu Date: Wed Jan 15 22:33:47 2025 +0100 Fix linting commit c7cd83d32ff493534812f711e7a0ccde3aa098b3 Author: Tommaso Fulghesu Date: Wed Jan 15 22:28:19 2025 +0100 Rebase and add new isolation to other lines --- .../lines/semileptonic/hlt2_semileptonic.py | 34 +- .../lines/semileptonic/isolationMVA.py | 64 +- .../lines/semileptonic/line_naming.py | 79 +- .../lines/semileptonic/spruce_semileptonic.py | 1697 ++++++++++------- .../Moore/persistence/particle_moving.py | 7 + 5 files changed, 1133 insertions(+), 748 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/hlt2_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/hlt2_semileptonic.py index 23b37124cdb..a66c0c8e300 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/hlt2_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/hlt2_semileptonic.py @@ -2296,7 +2296,7 @@ def hlt2_lbtopmunu_line(name="Hlt2SLB_LbToPMuNu", prescale=1, persistreco=True): @register_line_builder(hlt2_lines) def hlt2_lbtopmunu_fakep_line( - name="Hlt2SLB_LbToPMuNu_FakeP", prescale=0.020, persistreco=True + name="Hlt2SLB_LbToPMuNu_FakeProton", prescale=0.020, persistreco=True ): """ SL Hlt2 line for the decay Lb0 -> p mu nu, with a fake proton. @@ -2386,7 +2386,7 @@ def hlt2_lbtopmunu_ss_line(name="Hlt2SLB_LbToPMuNu_WS", prescale=1, persistreco= @register_line_builder(hlt2_lines) def hlt2_lbtopmunu_ss_fakep_line( - name="Hlt2SLB_LbToPMuNu_WS_FakeP", prescale=0.02, persistreco=True + name="Hlt2SLB_LbToPMuNu_WS_FakeProton", prescale=0.02, persistreco=True ): """ SL Hlt2 line for the decay Lb0 -> p mu nu (same-sign), with a fake proton. @@ -2589,7 +2589,7 @@ def hlt2_bstokmunu_ss_muondecayinflight_line( @register_line_builder(hlt2_lines) def hlt2_bstokmunu_fakek_line( - name="Hlt2SLB_BsToKMuNu_FakeK", prescale=0.02, persistreco=True + name="Hlt2SLB_BsToKMuNu_FakeKaon", prescale=0.02, persistreco=True ): """ SL Hlt2 line for the decay Bs0 -> K mu nu and Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon. @@ -2612,7 +2612,7 @@ def hlt2_bstokmunu_fakek_line( @register_line_builder(hlt2_lines) def hlt2_bstokmunu_ss_fakek_line( - name="Hlt2SLB_BsToKMuNu_SS_FakeK", prescale=0.02, persistreco=True + name="Hlt2SLB_BsToKMuNu_SS_FakeKaon", prescale=0.02, persistreco=True ): """ SL Hlt2 line for the decay Bs0 -> K mu nu and Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon (same-sign). @@ -2635,7 +2635,7 @@ def hlt2_bstokmunu_ss_fakek_line( @register_line_builder(hlt2_lines) def hlt2_bstokmunu_fakek_fakemuon_line( - name="Hlt2SLB_BsToKMuNu_FakeK_FakeMuon", prescale=0.01, persistreco=True + name="Hlt2SLB_BsToKMuNu_FakeKaon_FakeMuon", prescale=0.01, persistreco=True ): """ SL Hlt2 line for the decay Bs0 -> K mu nu and Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon and a misID muon. @@ -2658,7 +2658,7 @@ def hlt2_bstokmunu_fakek_fakemuon_line( @register_line_builder(hlt2_lines) def hlt2_bstokmunu_fakek_muondecayinflight_line( - name="Hlt2SLB_BsToKMuNu_FakeK_MuonDecayInFlight", prescale=0.004, persistreco=True + name="Hlt2SLB_BsToKMuNu_FakeKaon_MuonDecayInFlight", prescale=0.004, persistreco=True ): """ SL Hlt2 line for the decay Bs0 -> K mu nu and Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon and a decay in flight muon. @@ -2769,7 +2769,7 @@ def hlt2_bstokenu_ss_fakeelectron_line( @register_line_builder(hlt2_lines) def hlt2_bstokenu_fakek_line( - name="Hlt2SLB_BsToKENu_FakeK", prescale=0.01, persistreco=True + name="Hlt2SLB_BsToKENu_FakeKaon", prescale=0.01, persistreco=True ): """ SL Hlt2 line for the decay Bs0 -> K e nu and Bs0 -> K tau nu (tau -> e nu nu), with a fake kaon. @@ -2792,7 +2792,7 @@ def hlt2_bstokenu_fakek_line( @register_line_builder(hlt2_lines) def hlt2_bstokenu_ss_fakek_line( - name="Hlt2SLB_BsToKENu_SS_FakeK", prescale=0.01, persistreco=True + name="Hlt2SLB_BsToKENu_SS_FakeKaon", prescale=0.01, persistreco=True ): """ SL Hlt2 line for the decay Bs0 -> K e nu and Bs0 -> K tau nu (tau -> e nu nu), with a fake kaon (same-sign). @@ -2815,7 +2815,7 @@ def hlt2_bstokenu_ss_fakek_line( @register_line_builder(hlt2_lines) def hlt2_bstokenu_fakek_fakeelectron_line( - name="Hlt2SLB_BsToKENu_FakeK_FakeElectron", prescale=0.005, persistreco=True + name="Hlt2SLB_BsToKENu_FakeKaon_FakeElectron", prescale=0.005, persistreco=True ): """ SL Hlt2 line for the decay Bs0 -> K e nu and Bs0 -> K tau nu (tau -> e nu nu), with a fake kaon and a fake electron. @@ -2905,7 +2905,7 @@ def hlt2_b2ppbarmunu_ss_line( @register_line_builder(hlt2_lines) def hlt2_b2ppbarmunu_fakep_line( - name="Hlt2SLB_BuToPPbarMuNu_FakeP", prescale=0.1, persistreco=True + name="Hlt2SLB_BuToPPbarMuNu_FakeProton", prescale=0.1, persistreco=True ): """ SL Hlt2 line for the B->ppmunu and muonic B->pptaunu decays with a fake proton of opposite sign to muon @@ -5348,7 +5348,7 @@ def hlt2_bstoktaunu_muonic_ss_muondecayinflight_line( @register_line_builder(hlt2_lines) def hlt2_bstoktaunu_muonic_fakek_line( - name="Hlt2SLB_BsToKTauNu_TauToMuNuNu_FakeK", prescale=0.02, persistreco=True + name="Hlt2SLB_BsToKTauNu_TauToMuNuNu_FakeKaon", prescale=0.02, persistreco=True ): """ SL Hlt2 line for the decay Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon. @@ -5371,7 +5371,7 @@ def hlt2_bstoktaunu_muonic_fakek_line( @register_line_builder(hlt2_lines) def hlt2_bstoktaunu_muonic_ss_fakek_line( - name="Hlt2SLB_BsToKTauNu_TauToMuNuNu_SS_FakeK", prescale=0.02, persistreco=True + name="Hlt2SLB_BsToKTauNu_TauToMuNuNu_SS_FakeKaon", prescale=0.02, persistreco=True ): """ SL Hlt2 line for the decay Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon (same-sign). @@ -5394,7 +5394,7 @@ def hlt2_bstoktaunu_muonic_ss_fakek_line( @register_line_builder(hlt2_lines) def hlt2_bstoktaunu_muonic_fakek_fakemuon_line( - name="Hlt2SLB_BsToKTauNu_TauToMuNuNu_FakeK_FakeMuon", + name="Hlt2SLB_BsToKTauNu_TauToMuNuNu_FakeKaon_FakeMuon", prescale=0.01, persistreco=True, ): @@ -5419,7 +5419,7 @@ def hlt2_bstoktaunu_muonic_fakek_fakemuon_line( @register_line_builder(hlt2_lines) def hlt2_bstoktaunu_muonic_fakek_muondecayinflight_line( - name="Hlt2SLB_BsToKTauNu_TauToMuNuNu_FakeK_MuonDecayInFlight", + name="Hlt2SLB_BsToKTauNu_TauToMuNuNu_FakeKaon_MuonDecayInFlight", prescale=0.004, persistreco=True, ): @@ -5538,7 +5538,7 @@ def hlt2_bstoktaunu_electronic_ss_fakeelectron_line( @register_line_builder(hlt2_lines) def hlt2_bstoktaunu_electronic_fakek_line( - name="Hlt2SLB_BsToKTauNu_TauToENuNu_FakeK", prescale=0.01, persistreco=True + name="Hlt2SLB_BsToKTauNu_TauToENuNu_FakeKaon", prescale=0.01, persistreco=True ): """ SL Hlt2 line for the decay Bs0 -> K tau nu (tau -> e nu nu), with a fake kaon. @@ -5561,7 +5561,7 @@ def hlt2_bstoktaunu_electronic_fakek_line( @register_line_builder(hlt2_lines) def hlt2_bstoktaunu_electronic_ss_fakek_line( - name="Hlt2SLB_BsToKTauNu_TauToENuNu_SS_FakeK", prescale=0.01, persistreco=True + name="Hlt2SLB_BsToKTauNu_TauToENuNu_SS_FakeKaon", prescale=0.01, persistreco=True ): """ SL Hlt2 line for the decay Bs0 -> K tau nu (tau -> e nu nu), with a fake kaon (same-sign). @@ -5584,7 +5584,7 @@ def hlt2_bstoktaunu_electronic_ss_fakek_line( @register_line_builder(hlt2_lines) def hlt2_bstoktaunu_electronic_fakek_fakeelectron_line( - name="Hlt2SLB_BsToKTauNu_TauToENuNu_FakeK_FakeElectron", + name="Hlt2SLB_BsToKTauNu_TauToENuNu_FakeKaon_FakeElectron", prescale=0.005, persistreco=True, ): diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py index f3ca01684b2..967f4218652 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py @@ -11,9 +11,11 @@ import math import re from dataclasses import dataclass - -import Functors as F -import Functors.math as fmath +from PyConf.Algorithms import MVAWeightedRelTableAlg, SelectionFromWeightedRelationTable +from SelAlgorithms.monitoring import monitor, histogram_1d +from RecoConf.standard_particles import make_has_rich_long_pions +from RecoConf.standard_particles import make_has_rich_up_pions +from RecoConf.standard_particles import make_has_rich_down_pions from DaVinciTools import SubstitutePID from Moore.monitoring import run_default_monitoring from PyConf.Algorithms import ( @@ -300,24 +302,21 @@ def extract_parent_name(line_name: str) -> (str, str): def prepare_MVA( - line_name: str, - line_output: ParticleCombiner, - *, # All further options must be given as keyword arguments - mva_min: float = None, - parent: str = "", - anti_parent: str = "", - mva_used: str = "inclusive", - apply_fiducial_cut: bool = True, - persist_b_iso_relations: bool = True, - persist_bst_iso_relations: bool = True, -) -> ( - ParticleToParticleWeightedRelTableAlg, - ParticleToParticleWeightedRelTableAlg, - SelectionFromWeightedRelationTable, - [monitor], -): - new_parent_name = "B*+" - anti_new_parent_name = "B*-" + line_name: str, + line_output: ParticleCombiner, + *, #All further options must be given as keyword arguments + mva_min: float = None, + parent: str = "", + anti_parent: str = "", + mva_used: str = "inclusive", + apply_fiducial_cut: bool = True, + persist_b_iso_relations: bool = True, + persist_bst_iso_relations: bool = True +) -> (ParticleToParticleWeightedRelTableAlg, ParticleToParticleWeightedRelTableAlg, + SectionFromWeightedRelationTable, [monitor]): + + new_parent_name = 'B*+' + anti_new_parent_name = 'B*-' if not parent and not anti_parent: parent_name, anti_parent_name = extract_parent_name(line_name) @@ -381,24 +380,17 @@ def prepare_MVA( name=f"{line_name}", CompositeSelection=Bst_z_subset, SignalSelection=line_output, - MVAFunctor=MVA_functor, - ) + MVAFunctor=MVA_functor) b_iso_relations = iso_relations_alg.BOutputRelations bst_iso_relations = iso_relations_alg.BstOutputRelations extra_tracks = SelectionFromWeightedRelationTable( - InputRelations=bst_iso_relations - ).OutputLocation + InputRelations=bst_iso_relations).OutputLocation - monitoring_histos = ( - [monitor(data=Bst_z, histograms=input_monitoring + [monitoring_histo])] - if run_default_monitoring() - else [] - ) + monitoring_histos = ([ + monitor(data=Bst_z, histograms=input_monitoring + [monitoring_histo]) + ] if run_default_monitoring() else []) - return ( - b_iso_relations if persist_b_iso_relations else None, - bst_iso_relations if persist_bst_iso_relations else None, - extra_tracks, - monitoring_histos, - ) + return (b_iso_relations if persist_b_iso_relations else None, + bst_iso_relations if persist_bst_iso_relations else None, + extra_tracks, monitoring_histos) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/line_naming.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/line_naming.py index 49f023bff3a..52329a65eb3 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/line_naming.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/line_naming.py @@ -9,64 +9,85 @@ # or submit itself to any jurisdiction. # ############################################################################### """ -This module provides the mapping of the line names between the old and new -naming conventions. +This module provides the mapping of the line names between the old (2024 data taking) +and new (2025 data taking) naming conventions. +Comments are related to lines that were added in the 2025 trigger configuration. +The mapping is used to ensure that the spruce lines are filtered based on the correct +exclusive HLT2 lines in the given period of data taking. """ line_name_mapping = { "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToPiPiPiNu": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_TauToPiPiPiNu", "SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon": "SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_FakeMuon", - "SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToENuNu_FakeElectron": "SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_FakeElectron", + "SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_B0ToDpTauNu_DpToKPiPi_TauToMuNuNu_FakeMuon": "SpruceSLB_B0ToDpTauNu_DpToKPiPi_FakeMuon", - "SpruceSLB_B0ToDpTauNu_DpToKPiPi_TauToENuNu_FakeElectron": "SpruceSLB_B0ToDpTauNu_DpToKPiPi_FakeElectron", + "SpruceSLB_B0ToDpTauNu_DpToKPiPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_B0ToDpTauNu_DpToKPiPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_BuToD0TauNu_D0ToKPi_TauToMuNuNu_FakeMuon": "SpruceSLB_BuToD0TauNu_D0ToKPi_FakeMuon", - "SpruceSLB_BuToD0TauNu_D0ToKPi_TauToENuNu_FakeElectron": "SpruceSLB_BuToD0TauNu_D0ToKPi_FakeElectron", + "SpruceSLB_BuToD0TauNu_D0ToKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_BuToD0TauNu_D0ToKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToMuNuNu": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_TauToMuNuNu", "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToMuNuNu_FakeMuon": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_FakeMuon", - "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToENuNu": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_TauToENuNu", - "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToENuNu_FakeElectron": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_FakeElectron", + "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToENuNu_FakeElectron": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_FakeElectron", # REMOVED FROM SPRUCE "SpruceSLB_BsToDsTauNu_DsToKKPi_TauToMuNuNu_FakeMuon": "SpruceSLB_BsToDsTauNu_DsToKKPi_FakeMuon", - "SpruceSLB_BsToDsTauNu_DsToKKPi_TauToENuNu_FakeElectron": "SpruceSLB_BsToDsTauNu_DsToKKPi_FakeElectron", + "SpruceSLB_BsToDsTauNu_DsToKKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_BsToDsTauNu_DsToKKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcMuNu_LcToPKPi_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToPKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_LbToLcTauNu_LcToPKPi_TauToMuNuNu_FakeMuon": "SpruceSLB_LbToLcTauNu_LcToPKPi_FakeMuon", - "SpruceSLB_LbToLcTauNu_LcToPKPi_TauToENuNu_FakeElectron": "SpruceSLB_LbToLcTauNu_LcToPKPi_FakeElectron", + "SpruceSLB_LbToLcTauNu_LcToPKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToPKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_BcToJpsiMuNu_JpsiToMuMu_MuonDecayInFlight": "SpruceSLB_BcToJpsiMuNu_JpsiToMuMu_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_BuToD0MuNu_D0ToKPi_MuonDecayInFlight": "SpruceSLB_BuToD0MuNu_D0ToKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_BuToD0MuNu_D0ToKPiPiPi": "SpruceSLB_BuToD0MuNu_D0ToK3Pi", "SpruceSLB_BuToD0MuNu_D0ToKPiPiPi_FakeMuon": "SpruceSLB_BuToD0MuNu_D0ToK3Pi_FakeMuon", - "SpruceSLB_BuToD0ENu_D0ToKPiPiPi": "SpruceSLB_BuToD0ENu_D0ToK3Pi", - "SpruceSLB_BuToD0ENu_D0ToKPiPiPi_FakeElectron": "SpruceSLB_BuToD0ENu_D0ToK3Pi_FakeElectron", + "SpruceSLB_BuToD0MuNu_D0ToKPiPiPi_MuonDecayInFlight": "SpruceSLB_BuToD0MuNu_D0ToK3Pi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_B0ToDpMuNu_DpToKPiPi_MuonDecayInFlight": "SpruceSLB_B0ToDpMuNu_DpToKPiPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_B0ToDpMuNu_DpToKKPi_MuonDecayInFlight": "SpruceSLB_B0ToDpMuNu_DpToKKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_BsToDsstMuNu_DsstToDsGamma_DsToKKPi_GammaToEE": "SpruceSLB_BsToDsstMuNu_DsstToDsGamma_DsToKKPi_Gamma2EE", + "SpruceSLB_BsToDsMuNu_DsToKKPi_MuonDecayInFlight": "SpruceSLB_BsToDsMuNu_DsToKKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_Xib0ToXicplusMuNu_XicplusToPKPi": "SpruceSLB_Xib0ToXicplusMuNu_XicplusTopKPi", "SpruceSLB_Xib0ToXicplusTauNu_XicplusToPKPi_TauToMuNuNu": "SpruceSLB_Xib0ToXicplusTauNu_XicplusTopKPi_TauToMuNuNu", "SpruceSLB_Xib0ToXicplusMuNu_XicplusToPKPi_FakeMuon": "SpruceSLB_Xib0ToXicplusMuNu_XicplusTopKPi_FakeMuon", - "SpruceSLB_Xib0ToXicplusTauNu_XicplusToPKPi_FakeMuon": "SpruceSLB_Xib0ToXicplusTauNu_XicplusTopKPi_FakeMuon", + "SpruceSLB_Xib0ToXicplusMuNu_XicplusToPKPi_MuonDecayInFlight": "SpruceSLB_Xib0ToXicplusMuNu_XicplusTopKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_Xib0ToXicplusTauNu_XicplusToPKPi_TauToMuNuNu_FakeMuon": "SpruceSLB_Xib0ToXicplusTauNu_XicplusTopKPi_FakeMuon", + "SpruceSLB_Xib0ToXicplusTauNu_XicplusToPKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_Xib0ToXicplusTauNu_XicplusTopKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_XibminusToXic0MuNu_Xic0ToPKKPi": "SpruceSLB_XibminusToXic0MuNu_Xic0TopKKPi", "SpruceSLB_XibminusToXic0TauNu_Xic0ToPKKPi_TauToMuNuNu": "SpruceSLB_XibminusToXic0TauNu_Xic0TopKKPi_TauToMuNuNu", - "SpruceSLB_XibminusToXic0MuNu_Xic0ToPKKPi_FakeMuon": "SpruceSLB_XibminusToXic0MuNu_Xic0TopKKPi_FakeMuon", - "SpruceSLB_XibminusToXic0TauNu_Xic0ToPKKPi_FakeMuon": "SpruceSLB_XibminusToXic0TauNu_Xic0TopKKPi_FakeMuon", + "SpruceSLB_XibminusToXic0MuNu_Xic0ToPKKPi_FakeMuon": "SpruceSLB_XibminusToXic0MuNu:_Xic0TopKKPi_FakeMuon", + "SpruceSLB_XibminusToXic0MuNu_Xic0ToPKKPi_MuonDecayInFlight": "SpruceSLB_XibminusToXic0MuNu_Xic0TopKKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_XibminusToXic0TauNu_Xic0ToPKKPi_TauToMuNuNu_FakeMuon": "SpruceSLB_XibminusToXic0TauNu_Xic0TopKKPi_FakeMuon", + "SpruceSLB_XibminusToXic0TauNu_Xic0ToPKKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_XibminusToXic0TauNu_Xic0TopKKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_LbToLcTauNu_LcToPKPi_TauToPiPiPiNu": "SpruceSLB_LbToLcTauNu_LcTopKPi_TauToPiPiPiNu", "SpruceSLB_B0ToPiMuNu": "SpruceSLB_B2XuMuNuB02Pi", "SpruceSLB_B0ToPiMuNu_FakeMuon": "SpruceSLB_B2XuMuNuB02pi_NoPIDMu", + "SpruceSLB_B0ToPiMuNu_MuonDecayInFlight": "SpruceSLB_B2XuMuNuB02pi_NoPIDMu", # ADDED TO SPRUCE "SpruceSLB_B0ToPiMuNu_NoPIDPi": "SpruceSLB_B2XuMuNuB02pi_NoPIDPi", - "SpruceSLB_B0ToPiTauNu_TauToPiPiPiNu": "SpruceSLB_B2XuTauNu_HadronicB02Pi", + "SpruceSLB_LbToPMuNu_FakeProton": "SpruceSLB_LbToPMuNu_FakeP", + "SpruceSLB_LbToPMuNu_MuonDecayInFlight": "SpruceSLB_LbToPMuNu_FakeP", # ADDED TO SPRUCE + "SpruceSLB_LbToPMuNu_WS_FakeProton": "SpruceSLB_LbToPMuNu_WS_FakeP", + "SpruceSLB_LbToPMuNu_WS_MuonDecayInFlight": "SpruceSLB_LbToPMuNu_WS_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_BsToKMuNu": "SpruceSLB_B2XuMuNuBs2K", "SpruceSLB_BsToKMuNu_FakeMuon": "SpruceSLB_B2XuMuNuBs2K_NoPIDMu", - "SpruceSLB_BsToKMuNu_FakeK": "SpruceSLB_B2XuMuNuBs2K_NoPIDK", - "SpruceSLB_BsToKTauNu_TauToPiPiPiNu": "SpruceSLB_B2XuTauNu_HadronicBs2K", + "SpruceSLB_BsToKMuNu_MuonDecayInFlight": "SpruceSLB_B2XuMuNuBs2K_NoPIDMu", # ADDED TO SPRUCE + "SpruceSLB_BsToKMuNu_FakeKaon": "SpruceSLB_B2XuMuNuBs2K_NoPIDK", "SpruceSLB_BsToKTauNu_TauToMuNuNu": "SpruceSLB_B2XuTauNu_MuonicBs2K", "SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeMuon": "SpruceSLB_B2XuTauNu_MuonicBs2K_NoPIDMu", - "SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeK": "SpruceSLB_B2XuTauNu_MuonicBs2K_NoPIDK", + "SpruceSLB_BsToKTauNu_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_B2XuTauNu_MuonicBs2K_NoPIDMu", # ADDED TO SPRUCE + "SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeKaon": "SpruceSLB_B2XuTauNu_MuonicBs2K_NoPIDK", "SpruceSLB_BuToPPbarMuNu": "SpruceSLB_B2PPbarMuNu", "SpruceSLB_BuToPPbarMuNu_SS": "SpruceSLB_B2PPbarMuNu_SS", - "SpruceSLB_BuToPPbarMuNu_FakeP": "SpruceSLB_B2PPbarMuNu_FakeP", + "SpruceSLB_BuToPPbarMuNu_FakeProton": "SpruceSLB_B2PPbarMuNu_FakeP", "SpruceSLB_BuToPPbarMuNu_FakeMuon": "SpruceSLB_B2PPbarMuNu_FakeMu", + "SpruceSLB_BuToPPbarMuNu_MuonDecayInFlight": "SpruceSLB_B2PPbarMuNu_FakeP", # ADDED TO SPRUCE "SpruceSLB_BuToPiPiMuNu": "SpruceSLB_B2PiPiMuNu", "SpruceSLB_BuToPiPiMuNu_SS": "SpruceSLB_B2PiPiMuNu_SS", "SpruceSLB_BuToPiPiMuNu_FakeMuon": "SpruceSLB_B2PiPiMuNu_FakeMu", + "SpruceSLB_BuToPiPiMuNu_MuonDecayInFlight": "SpruceSLB_B2PiPiMuNu_FakeMu", # ADDED TO SPRUCE + "SpruceSLB_BuToPiPiMuNu_FakePion": "SpruceSLB_B2PiPiMuNu_FakePi", "SpruceSLB_BuToKKMuNu": "SpruceSLB_B2KKMuNu", "SpruceSLB_BuToKKMuNu_SS": "SpruceSLB_B2KKMuNu_SS", "SpruceSLB_BuToKKMuNu_FakeMuon": "SpruceSLB_B2KKMuNu_FakeMu", + "SpruceSLB_BuToKKMuNu_MuonDecayInFlight": "SpruceSLB_B2KKMuNu_FakeMu", # ADDED TO SPRUCE "SpruceSLB_BuToMuMuMuNu": "SpruceSLB_B2MuMuMuNu", "SpruceSLB_BuToEMuMuNu": "SpruceSLB_B2EMuMuNu", "SpruceSLB_BuToMuEENu": "SpruceSLB_B2MuEENu", - "SpruceSLB_BsToDsstMuNu_DsstToDsGamma_DsToKKPi_GammaToEE": "SpruceSLB_BsToDsstMuNu_DsstToDsGamma_DsToKKPi_Gamma2EE", "SpruceSLB_BuToMuGammaNu_GammaToConvertedEELL": "SpruceSLB_B2MuGammaNu_CNVLL", "SpruceSLB_BuToMuGammaNu_GammaToConvertedEEDD": "SpruceSLB_B2MuGammaNu_CNVDD", "SpruceSLB_BuToEGammaNu_GammaToConvertedEELL": "SpruceSLB_B2EGammaNu_CNVLL", @@ -80,14 +101,32 @@ line_name_mapping = { "SpruceSLB_BuToEEENu_SS": "SpruceSLB_B2EEENu_SS", "SpruceSLB_BuToTauMuMuNu_TauToPiPiPiNu_SS": "SpruceSLB_B2TauMuMuNu_3Pi_SS", "SpruceSLB_BuToTauEENu_TauToPiPiPiNu_SS": "SpruceSLB_B2TauEENu_3Pi_SS", + "SpruceSLB_OmegabToOmegacMuNu_OmegacToPKKPi_MuonDecayInFlight": "SpruceSLB_OmegabToOmegacMuNu_OmegacTopKKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_OmegabToOmegacTauNu_OmegacToPKKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_OmegabToOmegacTauNu_OmegacTopKKPi_TauToMuNuNu_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcMuNu_LcToPKSLL_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToPKSLL_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcMuNu_LcToPKSDD_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToPKSDD_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_LbToLcTauNu_LcToPKSLL_TauToMuNuNu": "SpruceSLB_LbToLcTauNu_LcToPKSLL_TautoMuNuNu", "SpruceSLB_LbToLcTauNu_LcToPKSDD_TauToMuNuNu": "SpruceSLB_LbToLcTauNu_LcToPKSDD_TautoMuNuNu", + "SpruceSLB_LbToLcTauNu_LcToPKSLL_TauToMuNuNu_FakeMuon": "SpruceSLB_LbToLcTauNu_LcToPKSLL_FakeMuon", + "SpruceSLB_LbToLcTauNu_LcToPKSLL_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToPKSLL_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcTauNu_LcToPKSDD_TauToMuNuNu_FakeMuon": "SpruceSLB_LbToLcTauNu_LcToPKSDD_FakeMuon", + "SpruceSLB_LbToLcTauNu_LcToPKSDD_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToPKSDD_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_LbToLcTauNu_LcToPKSLL_TauToENuNu": "SpruceSLB_LbToLcTauNu_LcToPKSLL_TautoENuNu", "SpruceSLB_LbToLcTauNu_LcToPKSDD_TauToENuNu": "SpruceSLB_LbToLcTauNu_LcToPKSDD_TautoENuNu", + "SpruceSLB_LbToLcTauNu_LcToPKSLL_TauToENuNu_FakeElectron": "SpruceSLB_LbToLcTauNu_LcToPKSLL_FakeElectron", + "SpruceSLB_LbToLcTauNu_LcToPKSDD_TauToENuNu_FakeElectron": "SpruceSLB_LbToLcTauNu_LcToPKSDD_FakeElectron", + "SpruceSLB_LbToLcMuNu_LcToLambdaPiLL_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToLambdaPiLL_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcMuNu_LcToLambdaPiDD_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToLambdaPiDD_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TauToMuNuNu": "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TautoMuNuNu", "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TauToMuNuNu": "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TautoMuNuNu", + "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TauToMuNuNu_FakeMuon": "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_FakeMuon", + "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TauToMuNuNu_FakeMuon": "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_FakeMuon", + "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TautoMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TautoMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TauToENuNu": "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TautoENuNu", "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TauToENuNu": "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TautoENuNu", + "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TauToENuNu_FakeElectron": "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_FakeElectron", + "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TauToENuNu_FakeElectron": "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_FakeElectron", "SpruceSLB_BuToTauNu_TauToPiPiPiNu_BTracking": "SpruceSLB_BToTauNu_TauToPiPiPiNu_BTracking", "SpruceSLB_BuToDPiPi_DToKPiPi_BTracking": "SpruceSLB_BToDPiPi_DToKPiPi_BTracking", "SpruceSLB_LbToLcTauNu_LcToPPhi_TauToPiPiPiNu": "SpruceSLB_LbToLcTauNu_LcTopPhi_TauToPiPiPiNu", diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index 4b91bac957e..f830ab0bb47 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -147,31 +147,20 @@ from .HbToHuLNu import ( make_lbtopmunu_ss_fakep, ) from .HbToLLLNu import ( - make_b2eeenu, - make_b2eeenu_ss, - make_b2egammanu_cnvdd, - make_b2egammanu_cnvll, - make_b2emumunu, - make_b2emumunu_ss, - make_b2mueenu, - make_b2mueenu_ss, - make_b2mugammanu_cnvdd, - make_b2mugammanu_cnvll, - make_b2mumumunu, - make_b2mumumunu_ss, - make_b2taueenu_3pi, - make_b2taueenu_3pi_ss, - make_b2taumumunu_3pi, - make_b2taumumunu_3pi_ss, -) -from .HbToTauNu_BTracking import ( - get_btracking_extra_outputs_for_spruce, - get_btracking_hlt2_particles_for_sprucing, - get_btracking_raw_banks, - make_spruce_filtered_btracking_parts, -) -from .isolationMVA import prepare_MVA -from .pv_tracks import get_pv_tracks_for_bstar + make_b2mumumunu, make_b2emumunu, make_b2mueenu, make_b2eeenu, + make_b2mugammanu_cnvll, make_b2mugammanu_cnvdd, make_b2egammanu_cnvll, + make_b2egammanu_cnvdd, make_b2taumumunu_3pi, make_b2taueenu_3pi, + make_b2mumumunu_ss, make_b2emumunu_ss, make_b2mueenu_ss, make_b2eeenu_ss, + make_b2taumumunu_3pi_ss, make_b2taueenu_3pi_ss) +from .HbToHbprimeLNu import make_bctobsx +from .HbToTauNu_BTracking import (get_btracking_hlt2_particles_for_sprucing, + get_btracking_raw_banks, + make_spruce_filtered_btracking_parts, + get_btracking_extra_outputs_for_spruce) +from RecoConf.standard_particles import (make_photons, make_resolved_pi0s, + make_merged_pi0s) +from RecoConf.algorithms_thor import ParticleContainersMerger +from PyConf.dataflow import DataHandle PROCESS = "spruce" spruce_lines = {} @@ -184,9 +173,8 @@ def get_neutral_tracks(): return ParticleContainersMerger(saved_tracks, name="extra_track_combiner") -def set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_tracks, extra_neutrals -) -> DataHandle: +def set_extra_outputs(name, b_iso_relations, bst_iso_relations, extra_tracks, + extra_neutrals) -> DataHandle: """Set the extra output for the line. Args: @@ -197,16 +185,15 @@ def set_extra_outputs( extra_neutrals: Neutral particles. Returns: - List for extra output. - """ - extra_output = [ - (f"{name}_extra_tracks", extra_tracks), - (f"{name}_extra_neutrals", extra_neutrals), - ] + List for extra output. + """ + extra_output = [(f"{name}_extra_tracks", extra_tracks), + (f"{name}_extra_neutrals", extra_neutrals)] if b_iso_relations is not None: extra_output += [(f"{name}_signal_iso_relations", b_iso_relations)] if bst_iso_relations is not None: - extra_output += [(f"{name}_combination_iso_relations", bst_iso_relations)] + extra_output += [(f"{name}_combination_iso_relations", + bst_iso_relations)] return extra_output @@ -223,8 +210,10 @@ def spruce_bptod0taunu_d0tokpipipi_tautopipipinu_line( """ line_alg = make_bptod0taunu_d0tok3pi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -233,9 +222,9 @@ def spruce_bptod0taunu_d0tokpipipi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -262,18 +251,25 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( """ SL Spruce line for the decay Bc -> J/psi(1S)(-> mu mu) tau(-> mu nu nu) nu. """ - line_alg = make_bctojpsitaunu_jpsitomumu_tautolnunu(process=PROCESS, lepton="mu") + line_alg = make_bctojpsitaunu_jpsitomumu_tautolnunu( + process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() + hlt2_name = map_line_name(name, legacy_name=legacy_name) + line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True ) - hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) extra_outputs_iso = set_extra_outputs( name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals @@ -290,17 +286,15 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( persistreco=persistreco, extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon, - monitoring_variables=_MONITORING_VARIABLES, - ) + monitoring_variables=_MONITORING_VARIABLES) @register_line_builder(spruce_lines) def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( - name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", - prescale=0.5, - persistreco=False, - legacy_name=False, -): + name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", + prescale=0.5, + persistreco=False, + legacy_name=False): """ SL Spruce line for the decay Bc -> J/psi(1S)(-> mu mu) tau(-> mu nu nu) nu, with a fake muon. """ @@ -348,14 +342,20 @@ def spruce_bctojpsitaunu_jpsitomumu_muondecayinflight_line( line_alg = make_bctojpsitaunu_jpsitomumu_tautolnunu_fakelepton( process=PROCESS, lepton="mu", is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() + hlt2_name = map_line_name(name, legacy_name=legacy_name) + line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True ) - hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -364,13 +364,9 @@ def spruce_bctojpsitaunu_jpsitomumu_muondecayinflight_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], - algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, - monitoring_variables=_MONITORING_VARIABLES, - ) + extra_outputs=extra_outputs_iso, + algs=sl_line_prefilter() + [line_alg] + line_mon, + monitoring_variables=_MONITORING_VARIABLES) @register_line_builder(spruce_lines) @@ -383,22 +379,24 @@ def spruce_b0todptaunu_dptokpipi_tautomununu_line( """ SL Spruce line for the decay B0 -> D+(-> K pi pi) tau(-> mu nu nu) nu. """ - line_alg = make_b0todptaunu_dptokpipi_tautolnunu(process=PROCESS, lepton="mu") + line_alg = make_b0todptaunu_dptokpipi_tautolnunu( + process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() - line_mon = generate_default_monitoring_vars( - name, line_alg, charged=False, charmed=True - ) - hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + line_mon = generate_default_monitoring_vars( + name, line_alg, charged=True, charmed=True) + + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -411,8 +409,7 @@ def spruce_b0todptaunu_dptokpipi_tautomununu_line( persistreco=persistreco, extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon, - monitoring_variables=_MONITORING_VARIABLES, - ) + monitoring_variables=_MONITORING_VARIABLES) @register_line_builder(spruce_lines) @@ -470,7 +467,9 @@ def spruce_b0todptaunu_dptokpipi_muondecayinflight_line( line_alg = make_b0todptaunu_dptokpipi_tautolnunu_fakelepton( process=PROCESS, lepton="mu", is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -479,6 +478,10 @@ def spruce_b0todptaunu_dptokpipi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -486,10 +489,7 @@ def spruce_b0todptaunu_dptokpipi_muondecayinflight_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -505,10 +505,13 @@ def spruce_butod0taunu_d0tokpi_tautomununu_line( """ SL Spruce line for the decay B+ -> D0(-> K pi) tau(-> mu nu nu) nu. """ - line_alg = make_butod0taunu_d0tokpi_tautolnunu(process=PROCESS, lepton="mu") + line_alg = make_butod0taunu_d0tokpi_tautolnunu( + process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -517,9 +520,9 @@ def spruce_butod0taunu_d0tokpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -590,7 +593,9 @@ def spruce_butod0taunu_d0tokpi_muondecayinflight_line( line_alg = make_butod0taunu_d0tokpi_tautolnunu_fakelepton( process=PROCESS, lepton="mu", is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -599,16 +604,17 @@ def spruce_butod0taunu_d0tokpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -625,10 +631,13 @@ def spruce_butod0taunu_d0tok3pi_tautomununu_line( """ SL Spruce line for the decay B+ -> D0(-> K pi pi pi) tau(-> mu nu nu) nu. """ - line_alg = make_butod0taunu_d0tok3pi_tautolnunu(process=PROCESS, lepton="mu") + line_alg = make_butod0taunu_d0tok3pi_tautolnunu( + process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -637,9 +646,9 @@ def spruce_butod0taunu_d0tok3pi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -710,7 +719,9 @@ def spruce_butod0taunu_d0tok3pi_muondecayinflight_line( line_alg = make_butod0taunu_d0tok3pi_tautolnunu_fakelepton( process=PROCESS, lepton="mu", is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -719,16 +730,17 @@ def spruce_butod0taunu_d0tok3pi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -745,10 +757,13 @@ def spruce_bstodstaunu_dstokkpi_tautomununu_line( """ SL Spruce line for the decay Bs0 -> Ds-(-> K K pi) tau+(-> mu nu nu) nu, and combinatorial (same sign). """ - line_alg = make_bstodstaunu_dstokkpi_tautolnunu(process=PROCESS, lepton="mu") + line_alg = make_bstodstaunu_dstokkpi_tautolnunu( + process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -758,9 +773,9 @@ def spruce_bstodstaunu_dstokkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -832,7 +847,9 @@ def spruce_bstodstaunu_dstokkpi_muondecayinflight_line( line_alg = make_bstodstaunu_dstokkpi_tautolnunu_fakelepton( process=PROCESS, lepton="mu", is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -841,15 +858,16 @@ def spruce_bstodstaunu_dstokkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, prescale=prescale, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, @@ -869,8 +887,10 @@ def spruce_lbtolcmunu_lctopkpi_line( """ line_alg = make_lbtolclnu_lctopkpi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -879,9 +899,9 @@ def spruce_lbtolcmunu_lctopkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -950,7 +970,9 @@ def spruce_lbtolcmunu_lctopkpi_muondecayinflight_line( line_alg = make_lbtolclnu_lctopkpi_fakelepton( process=PROCESS, lepton="mu", is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -959,16 +981,17 @@ def spruce_lbtolcmunu_lctopkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -987,8 +1010,10 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_line( """ line_alg = make_lbtolctaunu_lctopkpi_tautolnu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -997,9 +1022,9 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -1070,7 +1095,9 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_muondecayinflight_line( line_alg = make_lbtolctaunu_lctopkpi_tautolnu_fakelepton( process=PROCESS, lepton="mu", is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1079,16 +1106,17 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1107,8 +1135,10 @@ def spruce_bctojpsimunu_jpsitomumu_line( """ line_alg = make_bctojpsilnu_jpsitomumu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1117,9 +1147,9 @@ def spruce_bctojpsimunu_jpsitomumu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( persistreco=persistreco, @@ -1188,7 +1218,9 @@ def spruce_bctojpsimunu_jpsitomumu_muondecayinflight_line( line_alg = make_bctojpsilnu_jpsitomumu_fakelepton( process=PROCESS, lepton="mu", is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1197,6 +1229,10 @@ def spruce_bctojpsimunu_jpsitomumu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -1204,10 +1240,7 @@ def spruce_bctojpsimunu_jpsitomumu_muondecayinflight_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -1225,8 +1258,10 @@ def spruce_butod0munu_d0tokpi_line( """ line_alg = make_butod0lnu_d0tokpi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) @@ -1236,9 +1271,9 @@ def spruce_butod0munu_d0tokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -1307,16 +1342,21 @@ def spruce_butod0munu_d0tokpi_muondecayinflight_line( line_alg = make_butod0lnu_d0tokpi_fakelepton( process=PROCESS, lepton="mu", is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) - line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True ) hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1324,11 +1364,7 @@ def spruce_butod0munu_d0tokpi_muondecayinflight_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ] - + extra_PV_tracks, + extra_outputs=extra_outputs_iso + extra_PV_tracks, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -1343,8 +1379,10 @@ def spruce_butod0enu_d0tokpi_line( """ line_alg = make_butod0lnu_d0tokpi(process=PROCESS, lepton="e") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1353,9 +1391,9 @@ def spruce_butod0enu_d0tokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -1384,8 +1422,10 @@ def spruce_butod0enu_d0tokpi_fakeelectron_line( """ line_alg = make_butod0lnu_d0tokpi_fakelepton(process=PROCESS, lepton="e") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1394,9 +1434,9 @@ def spruce_butod0enu_d0tokpi_fakeelectron_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -1423,8 +1463,10 @@ def spruce_butod0munu_d0tok3pi_line( """ line_alg = make_butod0lnu_d0tok3pi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1433,9 +1475,9 @@ def spruce_butod0munu_d0tok3pi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -1504,7 +1546,9 @@ def spruce_butod0munu_d0tok3pi_muondecayinflight_line( line_alg = make_butod0lnu_d0tok3pi_fakelepton( process=PROCESS, lepton="mu", is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1513,16 +1557,17 @@ def spruce_butod0munu_d0tok3pi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1541,8 +1586,10 @@ def spruce_b0todpmunu_dptokpipi_line( """ line_alg = make_b0todplnu_dptokpipi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1551,9 +1598,9 @@ def spruce_b0todpmunu_dptokpipi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -1622,7 +1669,9 @@ def spruce_b0todpmunu_dptokpipi_muondecayinflight_line( line_alg = make_b0todplnu_dptokpipi_fakelepton( process=PROCESS, lepton="mu", is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1631,16 +1680,17 @@ def spruce_b0todpmunu_dptokpipi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1659,8 +1709,10 @@ def spruce_b0todpmunu_dptokkpi_line( """ line_alg = make_b0todplnu_dptokkpi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1669,9 +1721,9 @@ def spruce_b0todpmunu_dptokkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -1740,7 +1792,9 @@ def spruce_b0todpmunu_dptokkpi_muondecayinflight_line( line_alg = make_b0todplnu_dptokkpi_fakelepton( process=PROCESS, lepton="mu", is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1749,6 +1803,10 @@ def spruce_b0todpmunu_dptokkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -1756,10 +1814,7 @@ def spruce_b0todpmunu_dptokkpi_muondecayinflight_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -1777,8 +1832,10 @@ def spruce_bstodsmunu_dstokkpi_line( """ line_alg = make_bstodslnu_dstokkpi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1787,9 +1844,9 @@ def spruce_bstodsmunu_dstokkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -1817,11 +1874,12 @@ def spruce_bstodstlnu_dsttodsgamma_dstokkpi_gammatoee_line( SL Spruce line for the decay B_s0 -> D*s(-> Ds(-> K K pi) gamma (-> ee) ) mu nu. """ line_alg = make_bstodstlnu_dsttodsgamma_dstokkpi_gammatoee( - process=PROCESS, lepton="mu" - ) + process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1830,9 +1888,9 @@ def spruce_bstodstlnu_dsttodsgamma_dstokkpi_gammatoee_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -1901,7 +1959,9 @@ def spruce_bstodsmunu_dstokkpi_muondecayinflight_line( line_alg = make_bstodslnu_dstokkpi_fakelepton( process=PROCESS, lepton="mu", is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1910,16 +1970,17 @@ def spruce_bstodsmunu_dstokkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -1940,8 +2001,10 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_line( """ line_alg = make_xib0toxicplusmunu_xicplustopkpi(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=False, charmed=True @@ -1949,9 +2012,9 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -1980,10 +2043,13 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_line( Xi_b0 -> Xi_c+ (-> p K- pi+) tau- (-> mu- nu nu) nu (Right sign) Xi_b0 -> Xi_c+ (-> p K- pi+) tau+ (-> mu+ nu nu) nu (Wrong sign) """ - line_alg = make_xib0toxicplustaunu_xicplustopkpi_tautomununu(process=PROCESS) + line_alg = make_xib0toxicplustaunu_xicplustopkpi_tautomununu( + process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1992,9 +2058,9 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -2066,7 +2132,9 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_muondecayinflight_line( line_alg = make_xib0toxicplusmunu_xicplustopkpi_fakelepton( process=PROCESS, is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=False, charmed=True @@ -2074,16 +2142,17 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2092,7 +2161,7 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_muondecayinflight_line( @register_line_builder(spruce_lines) def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_fakemuon_line( - name="SpruceSLB_Xib0ToXicplusTauNu_XicplusToPKPi_FakeMuon", + name="SpruceSLB_Xib0ToXicplusTauNu_XicplusToPKPi_TauToMuNuNu_FakeMuon", prescale=0.5, persistreco=False, legacy_name=False, @@ -2135,7 +2204,7 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_fakemuon_line( @register_line_builder(spruce_lines) def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_muondecayinflight_line( - name="SpruceSLB_Xib0ToXicplusTauNu_XicplusToPKPi_MuonDecayInFlight", + name="SpruceSLB_Xib0ToXicplusTauNu_XicplusToPKPi_TauToMuNuNu_MuonDecayInFlight", prescale=0.5, persistreco=False, legacy_name=False, @@ -2157,6 +2226,10 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -2164,10 +2237,7 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_muondecayinflight_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -2187,8 +2257,10 @@ def spruce_xibminustoxic0munu_xic0topkkpi_line( """ line_alg = make_xibminustoxic0munu_xic0topkkpi(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True @@ -2196,9 +2268,9 @@ def spruce_xibminustoxic0munu_xic0topkkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -2227,10 +2299,13 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_line( Xi_b- -> Xi_c0 (-> p K- K- pi+) tau- (-> mu- nu nu) nu (Right sign) Xi_b- -> Xi_c0 (-> p K- K- pi+) tau+ (-> mu+ nu nu) nu (Wrong sign) """ - line_alg = make_xibminustoxic0taunu_xic0topkkpi_tautomununu(process=PROCESS) + line_alg = make_xibminustoxic0taunu_xic0topkkpi_tautomununu( + process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2239,9 +2314,9 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -2313,7 +2388,9 @@ def spruce_xibminustoxic0munu_xic0topkkpi_muondecayinflight_line( line_alg = make_xibminustoxic0munu_xic0topkkpi_fakelepton( process=PROCESS, is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True @@ -2321,16 +2398,17 @@ def spruce_xibminustoxic0munu_xic0topkkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2339,7 +2417,7 @@ def spruce_xibminustoxic0munu_xic0topkkpi_muondecayinflight_line( @register_line_builder(spruce_lines) def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_fakemuon_line( - name="SpruceSLB_XibminusToXic0TauNu_Xic0ToPKKPi_FakeMuon", + name="SpruceSLB_XibminusToXic0TauNu_Xic0ToPKKPi_TauToMuNuNu_FakeMuon", prescale=0.5, persistreco=False, legacy_name=False, @@ -2382,7 +2460,7 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_fakemuon_line( @register_line_builder(spruce_lines) def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_muondecayinflight_line( - name="SpruceSLB_XibminusToXic0TauNu_Xic0ToPKKPi_MuonDecayInFlight", + name="SpruceSLB_XibminusToXic0TauNu_Xic0ToPKKPi_TauToMuNuNu_MuonDecayInFlight", prescale=0.5, persistreco=False, legacy_name=False, @@ -2404,6 +2482,10 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -2411,10 +2493,7 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_muondecayinflight_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -2432,8 +2511,10 @@ def spruce_b0todptaunu_dptokpipi_tautopipipinu_line( """ line_alg = make_b0todptaunu_dptokpipi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2442,9 +2523,9 @@ def spruce_b0todptaunu_dptokpipi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -2473,8 +2554,10 @@ def spruce_bctojpsitaunu_jpsitomumu_tautopipipinu_line( """ line_alg = make_bctojpsitaunu_jpsitomumu_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2483,9 +2566,9 @@ def spruce_bctojpsitaunu_jpsitomumu_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -2514,8 +2597,10 @@ def spruce_bptod0taunu_d0tokpi_tautopipipinu_line( """ line_alg = make_bptod0taunu_d0tokpi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2524,9 +2609,9 @@ def spruce_bptod0taunu_d0tokpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -2555,8 +2640,10 @@ def spruce_bstodstaunu_dstokkpi_tautopipipinu_line( """ line_alg = make_bstodstaunu_dstokkpi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2565,9 +2652,9 @@ def spruce_bstodstaunu_dstokkpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, hlt2_filter_code=[ @@ -2595,8 +2682,10 @@ def spruce_lbtolctaunu_lctopkpi_tautopipipinu_line( """ line_alg = make_lbtolctaunu_lctopkpi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2605,9 +2694,9 @@ def spruce_lbtolctaunu_lctopkpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -2638,8 +2727,7 @@ def spruce_b0topimunu_line( parent="B0", anti_parent="B~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2648,9 +2736,9 @@ def spruce_b0topimunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -2669,7 +2757,7 @@ def spruce_b0topimunu_line( @register_line_builder(spruce_lines) def spruce_b0topimunu_fakemuon_line( - name="SpruceSLB_B0ToPiMuNu_NoPIDMu", + name="SpruceSLB_B0ToPiMuNu_FakeMuon", prescale=0.5, persistreco=False, legacy_name=False, @@ -2678,6 +2766,7 @@ def spruce_b0topimunu_fakemuon_line( SL Spruce line for the decay B0 -> pi mu nu, with a fake muon. """ line_alg = make_b0topimunu_fakemu(process=PROCESS) + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -2722,9 +2811,13 @@ def spruce_b0topimunu_muondecayinflight_line( SL Spruce line for the decay B0 -> pi mu nu, with a muon consistent with decay in flight. """ line_alg = make_b0topimunu_fakemu(process=PROCESS, is_decayinflight=True) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B0", anti_parent="B~0" - ) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B0", + anti_parent="B~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2733,16 +2826,17 @@ def spruce_b0topimunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2760,14 +2854,14 @@ def spruce_b0topimunu_fakek_line( SL Spruce line for the decay B0 -> pi mu, with a fake pions. """ line_alg = make_b0topimunu_fakek(process=PROCESS) + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B0", anti_parent="B~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2776,9 +2870,9 @@ def spruce_b0topimunu_fakek_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -2802,8 +2896,10 @@ def spruce_lbtopmunu_line( """ line_alg = make_lbtopmunu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2812,9 +2908,9 @@ def spruce_lbtopmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -2832,15 +2928,17 @@ def spruce_lbtopmunu_line( def spruce_lbtopmunu_fakep_line( - name="SpruceSLB_LbToPMuNu_FakeP", prescale=0.5, persistreco=False, legacy_name=False + name="SpruceSLB_LbToPMuNu_FakeProton", prescale=0.5, persistreco=False, legacy_name=False ): """ SL Spruce line for the decay Lb0 -> p mu nu, with a fake proton. """ line_alg = make_lbtopmunu_fakep(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2849,9 +2947,9 @@ def spruce_lbtopmunu_fakep_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -2916,7 +3014,11 @@ def spruce_lbtopmunu_muondecayinflight_line( SL Spruce line for the decay Lb0 -> p mu nu, with a muon consistent with decay in flight. """ line_alg = make_lbtopmunu_fakemu(process=PROCESS, is_decayinflight=True) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2925,16 +3027,17 @@ def spruce_lbtopmunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -2950,8 +3053,10 @@ def spruce_lbtopmunu_ss_line( """ line_alg = make_lbtopmunu_ss(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2960,9 +3065,9 @@ def spruce_lbtopmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -2981,7 +3086,7 @@ def spruce_lbtopmunu_ss_line( @register_line_builder(spruce_lines) def spruce_lbtopmunu_ss_fakep_line( - name="SpruceSLB_LbToPMuNu_WS_FakeP", + name="SpruceSLB_LbToPMuNu_WS_FakeProton", prescale=0.5, persistreco=False, legacy_name=False, @@ -2991,8 +3096,10 @@ def spruce_lbtopmunu_ss_fakep_line( """ line_alg = make_lbtopmunu_ss_fakep(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3001,9 +3108,9 @@ def spruce_lbtopmunu_ss_fakep_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -3068,7 +3175,11 @@ def spruce_lbtopmunu_ss_muondecayinflight_line( SL Spruce line for the decay Lb0 -> p mu nu (same-sign), with a muon consistent with decay in flight. """ line_alg = make_lbtopmunu_ss_fakemu(process=PROCESS, is_decayinflight=True) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3077,16 +3188,17 @@ def spruce_lbtopmunu_ss_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3101,6 +3213,7 @@ def spruce_bstokmunu_line( SL Spruce line for the decay Bs0 -> K mu nu. """ line_alg = make_bstokmunu(process=PROCESS) + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -3145,8 +3258,13 @@ def spruce_bstokmunu_ss_line( SL Spruce line for the decay Bs0 -> K mu nu same-sign. """ line_alg = make_bstokmunu_ss(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -3156,6 +3274,10 @@ def spruce_bstokmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -3165,10 +3287,7 @@ def spruce_bstokmunu_ss_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -3229,8 +3348,13 @@ def spruce_bstokmunu_muondecayinflight_line( SL Spruce line for the decay Bs0 -> K mu nu, with a muon consistent with decay in flight. """ line_alg = make_bstokmunu_fakemu(process=PROCESS, is_decayinflight=True) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -3316,16 +3440,17 @@ def spruce_bstokmunu_decayinflight_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3334,7 +3459,7 @@ def spruce_bstokmunu_decayinflight_ss_line( @register_line_builder(spruce_lines) def spruce_bstokmunu_fakek_line( - name="SpruceSLB_BsToKMuNu_FakeK", + name="SpruceSLB_BsToKMuNu_FakeKaon", prescale=0.5, persistreco=False, legacy_name=False, @@ -3378,7 +3503,7 @@ def spruce_bstokmunu_fakek_line( @register_line_builder(spruce_lines) def spruce_bstokmunu_fakek_ss_line( - name="SpruceSLB_BsToKMuNu_SS_FakeK", + name="SpruceSLB_BsToKMuNu_SS_FakeKaon", prescale=0.5, persistreco=False, legacy_name=False, @@ -3387,8 +3512,13 @@ def spruce_bstokmunu_fakek_ss_line( SL Spruce line for the decay Bs0 -> K mu, with a fake kaon (same-sign). """ line_alg = make_bstokmunu_ss_fakek(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -3416,7 +3546,7 @@ def spruce_bstokmunu_fakek_ss_line( @register_line_builder(spruce_lines) def spruce_bstokmunu_fakek_fakemuon_line( - name="SpruceSLB_BsToKMuNu_FakeK_FakeMuon", + name="SpruceSLB_BsToKMuNu_FakeKaon_FakeMuon", prescale=0.5, persistreco=False, legacy_name=False, @@ -3425,8 +3555,13 @@ def spruce_bstokmunu_fakek_fakemuon_line( SL Spruce line for the decay Bs0 -> K mu, with a fake kaon and a fake muon. """ line_alg = make_bstokmunu_fakek_fakemu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -3454,7 +3589,7 @@ def spruce_bstokmunu_fakek_fakemuon_line( @register_line_builder(spruce_lines) def spruce_bstokmunu_fakek_muondecayinflight_line( - name="SpruceSLB_BsToKMuNu_FakeK_MuonDecayInFlight", + name="SpruceSLB_BsToKMuNu_FakeKaon_MuonDecayInFlight", prescale=0.5, persistreco=False, legacy_name=False, @@ -3468,6 +3603,10 @@ def spruce_bstokmunu_fakek_muondecayinflight_line( ) extra_neutrals = get_neutral_tracks() + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + line_mon = generate_default_monitoring_vars( name, line_alg, charged=False, charmed=False ) @@ -3480,10 +3619,7 @@ def spruce_bstokmunu_fakek_muondecayinflight_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3539,8 +3675,13 @@ def spruce_bstokenu_ss_line( SL Spruce line for the decay Bs0 -> K e nu (same-sign). """ line_alg = make_bstokenu_ss(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -3550,6 +3691,10 @@ def spruce_bstokenu_ss_line( hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -3559,10 +3704,7 @@ def spruce_bstokenu_ss_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -3617,8 +3759,13 @@ def spruce_bstokenu_fakeelectron_ss_line( SL Spruce line for the decay Bs0 -> K e nu, with a fake electron (same-sign). """ line_alg = make_bstokenu_ss_fakeelectron(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -3628,16 +3775,17 @@ def spruce_bstokenu_fakeelectron_ss_line( hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3646,7 +3794,7 @@ def spruce_bstokenu_fakeelectron_ss_line( @register_line_builder(spruce_lines) def spruce_bstokenu_fakek_line( - name="SpruceSLB_BsToKENu_FakeK", prescale=0.5, persistreco=False + name="SpruceSLB_BsToKENu_FakeKaon", prescale=0.5, persistreco=False ): """ SL Spruce line for the decay Bs0 -> K e, with a fake kaon. @@ -3687,14 +3835,19 @@ def spruce_bstokenu_fakek_line( @register_line_builder(spruce_lines) def spruce_bstokenu_fakek_ss_line( - name="SpruceSLB_BsToKENu_SS_FakeK", prescale=0.5, persistreco=False + name="SpruceSLB_BsToKENu_SS_FakeKaon", prescale=0.5, persistreco=False ): """ SL Spruce line for the decay Bs0 -> K e, with a fake kaon (same-sign). """ line_alg = make_bstokenu_ss_fakek(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -3722,7 +3875,7 @@ def spruce_bstokenu_fakek_ss_line( @register_line_builder(spruce_lines) def spruce_bstokenu_fakek_fakeelectron_line( - name="SpruceSLB_BsToKENu_FakeK_FakeElectron", prescale=0.5, persistreco=False + name="SpruceSLB_BsToKENu_FakeKaon_FakeElectron", prescale=0.5, persistreco=False ): """ SL Spruce line for the decay Bs0 -> K e, with a fake kaon and a fake electron. @@ -3739,16 +3892,17 @@ def spruce_bstokenu_fakek_fakeelectron_line( hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3763,14 +3917,14 @@ def spruce_b2ppbarmunu_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays """ line_alg = make_b2ppbarmunu(process=PROCESS) + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -3780,9 +3934,9 @@ def spruce_b2ppbarmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -3845,7 +3999,7 @@ def spruce_b2ppbarmunu_ss_line( @register_line_builder(spruce_lines) def spruce_b2ppbarmunu_fakep_line( - name="SpruceSLB_BuToPPbarMuNu_FakeP", + name="SpruceSLB_BuToPPbarMuNu_FakeProton", prescale=1, persistreco=False, legacy_name=False, @@ -3944,8 +4098,13 @@ def spruce_b2ppbarmunu_muondecayinflight_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays with a muon consistent with decay in flight """ line_alg = make_b2ppbarmunu_fakemu(process=PROCESS, is_decayinflight=True) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -3955,16 +4114,17 @@ def spruce_b2ppbarmunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3988,18 +4148,17 @@ def spruce_b2pipimunu_line( b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, - parent="B+", - anti_parent="B-", + parent='B+', + anti_parent='B-', persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4033,19 +4192,18 @@ def spruce_b2pipimunu_ss_line( b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, - parent="B+", - anti_parent="B-", + parent='B+', + anti_parent='B-', persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4122,14 +4280,23 @@ def spruce_b2pipimunu_muondecayinflight_line( name, line_alg, charged=True, charmed=False ) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -4137,11 +4304,7 @@ def spruce_b2pipimunu_muondecayinflight_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ] - + extra_PV_tracks, + extra_outputs=extra_outputs_iso + extra_PV_tracks, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -4149,7 +4312,7 @@ def spruce_b2pipimunu_muondecayinflight_line( @register_line_builder(spruce_lines) def spruce_b2pipimunu_fakepi_line( - name="SpruceSLB_BuToPiPiMuNu_FakePi", + name="SpruceSLB_BuToPiPiMuNu_FakePion", prescale=0.1, persistreco=False, legacy_name=False, @@ -4165,19 +4328,18 @@ def spruce_b2pipimunu_fakepi_line( b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, - parent="B+", - anti_parent="B-", + parent='B+', + anti_parent='B-', persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4200,14 +4362,15 @@ def spruce_b2kkmunu_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays """ line_alg = make_b2kkmunu(process=PROCESS) + + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -4217,9 +4380,9 @@ def spruce_b2kkmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4244,14 +4407,15 @@ def spruce_b2kkmunu_ss_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays with same-sign kaons """ line_alg = make_b2kkmunu_ss(process=PROCESS) + + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -4261,9 +4425,9 @@ def spruce_b2kkmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4291,6 +4455,8 @@ def spruce_b2kkmunu_fakemuon_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays with a fake muon """ line_alg = make_b2kkmunu_fakemu(process=PROCESS) + + #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4336,8 +4502,13 @@ def spruce_b2kkmunu_muondecayinflight_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays with a muon consistent with decay in flight """ line_alg = make_b2kkmunu_fakemu(process=PROCESS, is_decayinflight=True) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B+", anti_parent="B-" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B+", + anti_parent="B-", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -4347,16 +4518,17 @@ def spruce_b2kkmunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -4378,8 +4550,7 @@ def spruce_b2mumumunu_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -4389,9 +4560,9 @@ def spruce_b2mumumunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4423,8 +4594,7 @@ def spruce_b2emumunu_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -4434,9 +4604,9 @@ def spruce_b2emumunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4468,8 +4638,7 @@ def spruce_b2mueenu_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -4479,9 +4648,9 @@ def spruce_b2mueenu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4516,8 +4685,7 @@ def spruce_b2mugammanu_cnvll_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4573,9 +4741,9 @@ def spruce_b2mugammanu_cnvdd_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4610,8 +4778,7 @@ def spruce_b2egammanu_cnvll_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4620,9 +4787,9 @@ def spruce_b2egammanu_cnvll_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4657,8 +4824,7 @@ def spruce_b2egammanu_cnvdd_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4667,9 +4833,9 @@ def spruce_b2egammanu_cnvdd_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4701,8 +4867,7 @@ def spruce_b2eeenu_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -4712,9 +4877,9 @@ def spruce_b2eeenu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4733,7 +4898,7 @@ def spruce_b2eeenu_line( @register_line_builder(spruce_lines) def spruce_b2taumumunu_3pi_line( - name="SpruceSLB_B2TauMuMuNu_3Pi", prescale=1, persistreco=False + name="SpruceSLB_BToTauMuMuNu_TauToPiPiPiNu", prescale=1, persistreco=False ): """ SL Spruce line for the B(c)+ -> tau+mu-mu+nu decays with hadronic tau->3pi @@ -4746,17 +4911,16 @@ def spruce_b2taumumunu_3pi_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=False ) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4792,9 +4956,9 @@ def spruce_b2taueenu_3pi_line( name, line_alg, charged=True, charmed=False ) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4822,8 +4986,7 @@ def spruce_b2mumumunu_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -4833,9 +4996,9 @@ def spruce_b2mumumunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4867,8 +5030,7 @@ def spruce_b2emumunu_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -4878,9 +5040,9 @@ def spruce_b2emumunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4912,8 +5074,7 @@ def spruce_b2mueenu_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -4923,9 +5084,9 @@ def spruce_b2mueenu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4957,8 +5118,7 @@ def spruce_b2eeenu_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -4968,9 +5128,9 @@ def spruce_b2eeenu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -5002,8 +5162,7 @@ def spruce_b2taumumunu_3pi_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -5011,9 +5170,9 @@ def spruce_b2taumumunu_3pi_ss_line( name, line_alg, charged=True, charmed=False ) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -5041,8 +5200,7 @@ def spruce_b2taueenu_3pi_ss( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -5050,9 +5208,9 @@ def spruce_b2taueenu_3pi_ss( name, line_alg, charged=True, charmed=False ) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -5077,8 +5235,10 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_line( """ line_alg = make_omegabtoomegacmunu_omegactopkkpi(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5087,9 +5247,9 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -5158,7 +5318,9 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_muondecayinflight_line( line_alg = make_omegabtoomegacmunu_omegactopkkpi_fakelepton( process=PROCESS, is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5167,16 +5329,17 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -5280,7 +5443,9 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_muondecayinflight_line( line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautomununu_fakelepton( process=PROCESS, is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5289,6 +5454,10 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -5296,10 +5465,7 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_muondecayinflight_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5317,11 +5483,12 @@ def spruce_lbtolcmunu_lctopksLL_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu" - ) + process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5330,9 +5497,9 @@ def spruce_lbtolcmunu_lctopksLL_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( persistreco=persistreco, @@ -5361,11 +5528,12 @@ def spruce_lbtolcmunu_lctopksDD_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'downstream' tracks ('DD' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu" - ) + process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5374,9 +5542,9 @@ def spruce_lbtolcmunu_lctopksDD_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( persistreco=persistreco, @@ -5453,7 +5621,9 @@ def spruce_lbtolcmunu_lctopksLL_muondecayinflight_line( lepton_name="mu", is_decayinflight=True, ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5462,6 +5632,10 @@ def spruce_lbtolcmunu_lctopksLL_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5469,10 +5643,7 @@ def spruce_lbtolcmunu_lctopksLL_muondecayinflight_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5538,7 +5709,9 @@ def spruce_lbtolcmunu_lctopksDD_muondecayinflight_line( lepton_name="mu", is_decayinflight=True, ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5547,6 +5720,10 @@ def spruce_lbtolcmunu_lctopksDD_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5554,10 +5731,7 @@ def spruce_lbtolcmunu_lctopksDD_muondecayinflight_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5714,7 +5888,9 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_muondecayinflight_line( lepton_name="mu", is_decayinflight=True, ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5723,6 +5899,10 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5730,10 +5910,7 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_muondecayinflight_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5800,7 +5977,9 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_muondecayinflight_line( lepton_name="mu", is_decayinflight=True, ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5809,6 +5988,10 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5816,10 +5999,7 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_muondecayinflight_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -5837,11 +6017,12 @@ def spruce_lbtolcmunu_lctolambdapiLL_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu" - ) + process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5850,9 +6031,9 @@ def spruce_lbtolcmunu_lctolambdapiLL_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( persistreco=persistreco, @@ -5881,11 +6062,12 @@ def spruce_lbtolcmunu_lctolambdapiDD_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'downstream' tracks ('DD' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu" - ) + process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5894,9 +6076,9 @@ def spruce_lbtolcmunu_lctolambdapiDD_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( persistreco=persistreco, @@ -5973,7 +6155,9 @@ def spruce_lbtolcmunu_lctolambdapiLL_muondecayinflight_line( lepton_name="mu", is_decayinflight=True, ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5982,6 +6166,10 @@ def spruce_lbtolcmunu_lctolambdapiLL_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -5989,10 +6177,7 @@ def spruce_lbtolcmunu_lctolambdapiLL_muondecayinflight_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6058,7 +6243,9 @@ def spruce_lbtolcmunu_lctolambdapiDD_muondecayinflight_line( lepton_name="mu", is_decayinflight=True, ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6067,6 +6254,10 @@ def spruce_lbtolcmunu_lctolambdapiDD_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -6074,10 +6265,7 @@ def spruce_lbtolcmunu_lctolambdapiDD_muondecayinflight_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6109,9 +6297,9 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( persistreco=persistreco, @@ -6232,7 +6420,9 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_muondecayinflight_line( lepton_name="mu", is_decayinflight=True, ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6241,16 +6431,17 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -6317,7 +6508,9 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_muondecayinflight_line( lepton_name="mu", is_decayinflight=True, ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6326,6 +6519,10 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( persistreco=persistreco, name=name, @@ -6333,10 +6530,7 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_muondecayinflight_line( f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -7669,7 +7863,9 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautopipipinu_line( Xi_b0 -> Xi_c+ (-> p K- pi+) tau+ nu (Wrong sign), hadronic tau decay """ line_alg = make_xib0toxicplustaunu_xicplustopkpi_tautopipipinu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -7678,6 +7874,10 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -7812,10 +8012,7 @@ def spruce_bstoktaunu_muonic_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -7831,10 +8028,16 @@ def spruce_bstoktaunu_muonic_ss_line( """ SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu) same-sign. """ - line_alg = make_bstoktaunu_muonic_ss(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" - ) + line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautopipipinu( + process=PROCESS) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -7843,6 +8046,10 @@ def spruce_bstoktaunu_muonic_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -7872,8 +8079,9 @@ def spruce_bstoktaunu_muonic_fakemuon_line( SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu), with a fake muon. """ line_alg = make_bstoktaunu_muonic_fakemu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -7883,16 +8091,56 @@ def spruce_bstoktaunu_muonic_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), + extra_outputs=extra_outputs_iso, + persistreco=persistreco, + algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, + monitoring_variables=_MONITORING_VARIABLES, + ) + +@register_line_builder(spruce_lines) +def spruce_bstoktaunu_muonic_muondecayinflight_line( + name="SpruceSLB_BsToKTauNu_TauToMuNuNu_MuonDecayInFlight", + prescale=0.5, + persistreco=False, + legacy_name=False, +): + """ + SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu), with a muon decaying in flight. + """ + line_alg = make_bstoktaunu_muonic_fakemu(process=PROCESS, is_decayinflight=True) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False + ) + extra_neutrals = get_neutral_tracks() + + line_mon = generate_default_monitoring_vars( + name, line_alg, charged=False, charmed=False + ) + + hlt2_name = map_line_name(name, legacy_name=legacy_name) + + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + + return SpruceLine( + name=name, + hlt2_filter_code=[ + f"{hlt2_name}Decision", ], + prescale=prescale, + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -7910,8 +8158,9 @@ def spruce_bstoktaunu_muonic_fakemuon_ss_line( SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu), with a fake muon (same-sign). """ line_alg = make_bstoktaunu_muonic_ss_fakemu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -7921,25 +8170,65 @@ def spruce_bstoktaunu_muonic_fakemuon_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) +@register_line_builder(spruce_lines) +def spruce_bstoktaunu_muonic_muondecayinflight_ss_line( + name="SpruceSLB_BsToKTauNu_TauToMuNuNu_SS_MuonDecayInFlight", + prescale=0.5, + persistreco=False, + legacy_name=False, +): + """ + SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu), with a muon decay in flight (same-sign). + """ + line_alg = make_bstoktaunu_muonic_ss_fakemu(process=PROCESS, is_decayinflight=True) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False + ) + extra_neutrals = get_neutral_tracks() + + line_mon = generate_default_monitoring_vars( + name, line_alg, charged=False, charmed=False + ) + + hlt2_name = map_line_name(name, legacy_name=legacy_name) + + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + + return SpruceLine( + name=name, + hlt2_filter_code=[ + f"{hlt2_name}Decision", + ], + prescale=prescale, + extra_outputs=extra_outputs_iso, + persistreco=persistreco, + algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, + monitoring_variables=_MONITORING_VARIABLES, + ) + @register_line_builder(spruce_lines) def spruce_bstoktaunu_muonic_fakek_line( - name="SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeK", + name="SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeKaon", prescale=0.5, persistreco=False, legacy_name=False, @@ -7948,8 +8237,9 @@ def spruce_bstoktaunu_muonic_fakek_line( SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon. """ line_alg = make_bstoktaunu_muonic_fakek(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -7959,16 +8249,17 @@ def spruce_bstoktaunu_muonic_fakek_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -7977,7 +8268,7 @@ def spruce_bstoktaunu_muonic_fakek_line( @register_line_builder(spruce_lines) def spruce_bstoktaunu_muonic_fakek_ss_line( - name="SpruceSLB_BsToKTauNu_TauToMuNuNu_SS_FakeK", + name="SpruceSLB_BsToKTauNu_TauToMuNuNu_SS_FakeKaon", prescale=0.5, persistreco=False, legacy_name=False, @@ -7986,8 +8277,9 @@ def spruce_bstoktaunu_muonic_fakek_ss_line( SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon (same-sign). """ line_alg = make_bstoktaunu_muonic_ss_fakek(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -7997,16 +8289,17 @@ def spruce_bstoktaunu_muonic_fakek_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -8015,7 +8308,7 @@ def spruce_bstoktaunu_muonic_fakek_ss_line( @register_line_builder(spruce_lines) def spruce_bstoktaunu_muonic_fakek_fakemuon_line( - name="SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeK_FakeMuon", + name="SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeKaon_FakeMuon", prescale=0.5, persistreco=False, legacy_name=False, @@ -8024,8 +8317,9 @@ def spruce_bstoktaunu_muonic_fakek_fakemuon_line( SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon and a fake muon. """ line_alg = make_bstoktaunu_muonic_fakek_fakemu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8035,21 +8329,60 @@ def spruce_bstoktaunu_muonic_fakek_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) +@register_line_builder(spruce_lines) +def spruce_bstoktaunu_muonic_fakek_muondecayinflight_line( + name="SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeKaon_MuonDecayInFlight", + prescale=0.5, + persistreco=False, + legacy_name=False, +): + """ + SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon and a muon decay in flight. + """ + line_alg = make_bstoktaunu_muonic_fakek_fakemu(process=PROCESS, is_decayinflight=True) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False + ) + extra_neutrals = get_neutral_tracks() + + line_mon = generate_default_monitoring_vars( + name, line_alg, charged=False, charmed=False + ) + + hlt2_name = map_line_name(name, legacy_name=legacy_name) + + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + + return SpruceLine( + name=name, + hlt2_filter_code=[ + f"{hlt2_name}Decision", + ], + prescale=prescale, + extra_outputs=extra_outputs_iso, + persistreco=persistreco, + algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, + monitoring_variables=_MONITORING_VARIABLES, + ) @register_line_builder(spruce_lines) def spruce_bstoktaunu_electronic_line( @@ -8060,7 +8393,8 @@ def spruce_bstoktaunu_electronic_line( """ line_alg = make_bstoktaunu_electronic(process=PROCESS) extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8070,6 +8404,10 @@ def spruce_bstoktaunu_electronic_line( hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -8079,10 +8417,7 @@ def spruce_bstoktaunu_electronic_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -8096,8 +8431,9 @@ def spruce_bstoktaunu_electronic_ss_line( SL Spruce line for the decay Bs0 -> K tau nu (tau -> e nu nu) (same-sign). """ line_alg = make_bstoktaunu_electronic_ss(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8107,6 +8443,10 @@ def spruce_bstoktaunu_electronic_ss_line( hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ @@ -8116,10 +8456,7 @@ def spruce_bstoktaunu_electronic_ss_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -8133,8 +8470,9 @@ def spruce_bstoktaunu_electronic_fakeelectron_line( SL Spruce line for the decay Bs0 -> K tau nu (tau -> e nu nu), with a fake electron. """ line_alg = make_bstoktaunu_electronic_fakeelectron(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8144,16 +8482,17 @@ def spruce_bstoktaunu_electronic_fakeelectron_line( hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -8170,8 +8509,9 @@ def spruce_bstoktaunu_electronic_fakeelectron_ss_line( SL Spruce line for the decay Bs0 -> K tau nu (tau -> e nu nu), with a fake electron (same-sign). """ line_alg = make_bstoktaunu_electronic_ss_fakeelectron(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8181,16 +8521,17 @@ def spruce_bstoktaunu_electronic_fakeelectron_ss_line( hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -8199,14 +8540,15 @@ def spruce_bstoktaunu_electronic_fakeelectron_ss_line( @register_line_builder(spruce_lines) def spruce_bstoktaunu_electronic_fakek_line( - name="SpruceSLB_BsToKTauNu_TauToENuNu_FakeK", prescale=0.5, persistreco=False + name="SpruceSLB_BsToKTauNu_TauToENuNu_FakeKaon", prescale=0.5, persistreco=False ): """ SL Spruce line for the decay Bs0 -> K tau nu (tau -> e nu nu), with a fake kaon. """ line_alg = make_bstoktaunu_electronic_fakek(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8216,16 +8558,17 @@ def spruce_bstoktaunu_electronic_fakek_line( hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -8234,14 +8577,15 @@ def spruce_bstoktaunu_electronic_fakek_line( @register_line_builder(spruce_lines) def spruce_bstoktaunu_electronic_fakek_ss_line( - name="SpruceSLB_BsToKTauNu_TauToENuNu_SS_FakeK", prescale=0.5, persistreco=False + name="SpruceSLB_BsToKTauNu_TauToENuNu_SS_FakeKaon", prescale=0.5, persistreco=False ): """ SL Spruce line for the decay Bs0 -> K tau nu (tau -> e nu nu), with a fake kaon (same-sign). """ line_alg = make_bstoktaunu_electronic_ss_fakek(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8251,16 +8595,17 @@ def spruce_bstoktaunu_electronic_fakek_ss_line( hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -8269,7 +8614,7 @@ def spruce_bstoktaunu_electronic_fakek_ss_line( @register_line_builder(spruce_lines) def spruce_bstoktaunu_electronic_fakek_fakeelectron_line( - name="SpruceSLB_BsToKTauNu_TauToENuNu_FakeK_FakeElectron", + name="SpruceSLB_BsToKTauNu_TauToENuNu_FakeKaon_FakeElectron", prescale=0.5, persistreco=False, ): @@ -8277,8 +8622,9 @@ def spruce_bstoktaunu_electronic_fakek_fakeelectron_line( SL Spruce line for the decay Bs0 -> K tau nu (tau -> e nu nu), with a fake kaon and a fake electron. """ line_alg = make_bstoktaunu_electronic_fakek_fakeelectron(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8288,16 +8634,17 @@ def spruce_bstoktaunu_electronic_fakek_fakeelectron_line( hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, diff --git a/Hlt/Moore/python/Moore/persistence/particle_moving.py b/Hlt/Moore/python/Moore/persistence/particle_moving.py index 304b59a813d..df57e729edd 100644 --- a/Hlt/Moore/python/Moore/persistence/particle_moving.py +++ b/Hlt/Moore/python/Moore/persistence/particle_moving.py @@ -39,6 +39,7 @@ def __get_type(dh): def cloning_map(): from PyConf.Algorithms import ( +<<<<<<< HEAD CopyCaloClusters, CopyCaloHypos, CopyFlavourTags, @@ -54,6 +55,12 @@ def cloning_map(): CopyTracks, CopyVertices, ) +======= + CopyParticles, CopyFlavourTags, CopyTracks, CopyCaloClusters, + CopyCaloHypos, CopyProtoParticles, CopyRecVertices, CopyVertices, + CopyP2InfoRelations, CopyP2IntRelations, CopyP2MCPRelations, + CopyP2VRelations, CopyPP2MCPRelations, CopyP2PRelations) +>>>>>>> d0f3ac1f02 (Squashed commit of the following:) return { "Particles": CopyParticles, -- GitLab From 1d4cb7e885fec3d05f18744b5923af8b8e942f9a Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Mon, 27 Jan 2025 11:34:07 +0000 Subject: [PATCH 08/22] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/49941474 --- .../lines/semileptonic/isolationMVA.py | 29 ++++++++++--------- .../lines/semileptonic/spruce_semileptonic.py | 2 +- .../Moore/persistence/particle_moving.py | 7 ----- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py index 967f4218652..a00546a31a7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py @@ -11,11 +11,7 @@ import math import re from dataclasses import dataclass -from PyConf.Algorithms import MVAWeightedRelTableAlg, SelectionFromWeightedRelationTable -from SelAlgorithms.monitoring import monitor, histogram_1d -from RecoConf.standard_particles import make_has_rich_long_pions -from RecoConf.standard_particles import make_has_rich_up_pions -from RecoConf.standard_particles import make_has_rich_down_pions + from DaVinciTools import SubstitutePID from Moore.monitoring import run_default_monitoring from PyConf.Algorithms import ( @@ -380,17 +376,24 @@ def prepare_MVA( name=f"{line_name}", CompositeSelection=Bst_z_subset, SignalSelection=line_output, - MVAFunctor=MVA_functor) + MVAFunctor=MVA_functor, + ) b_iso_relations = iso_relations_alg.BOutputRelations bst_iso_relations = iso_relations_alg.BstOutputRelations extra_tracks = SelectionFromWeightedRelationTable( - InputRelations=bst_iso_relations).OutputLocation + InputRelations=bst_iso_relations + ).OutputLocation - monitoring_histos = ([ - monitor(data=Bst_z, histograms=input_monitoring + [monitoring_histo]) - ] if run_default_monitoring() else []) + monitoring_histos = ( + [monitor(data=Bst_z, histograms=input_monitoring + [monitoring_histo])] + if run_default_monitoring() + else [] + ) - return (b_iso_relations if persist_b_iso_relations else None, - bst_iso_relations if persist_bst_iso_relations else None, - extra_tracks, monitoring_histos) + return ( + b_iso_relations if persist_b_iso_relations else None, + bst_iso_relations if persist_bst_iso_relations else None, + extra_tracks, + monitoring_histos, + ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index f830ab0bb47..2baf3ec29f4 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -185,7 +185,7 @@ def set_extra_outputs(name, b_iso_relations, bst_iso_relations, extra_tracks, extra_neutrals: Neutral particles. Returns: - List for extra output. + List for extra output. """ extra_output = [(f"{name}_extra_tracks", extra_tracks), (f"{name}_extra_neutrals", extra_neutrals)] diff --git a/Hlt/Moore/python/Moore/persistence/particle_moving.py b/Hlt/Moore/python/Moore/persistence/particle_moving.py index df57e729edd..304b59a813d 100644 --- a/Hlt/Moore/python/Moore/persistence/particle_moving.py +++ b/Hlt/Moore/python/Moore/persistence/particle_moving.py @@ -39,7 +39,6 @@ def __get_type(dh): def cloning_map(): from PyConf.Algorithms import ( -<<<<<<< HEAD CopyCaloClusters, CopyCaloHypos, CopyFlavourTags, @@ -55,12 +54,6 @@ def cloning_map(): CopyTracks, CopyVertices, ) -======= - CopyParticles, CopyFlavourTags, CopyTracks, CopyCaloClusters, - CopyCaloHypos, CopyProtoParticles, CopyRecVertices, CopyVertices, - CopyP2InfoRelations, CopyP2IntRelations, CopyP2MCPRelations, - CopyP2VRelations, CopyPP2MCPRelations, CopyP2PRelations) ->>>>>>> d0f3ac1f02 (Squashed commit of the following:) return { "Particles": CopyParticles, -- GitLab From 4dbcae4ec580ef8282d1099bb46fa880d89a9276 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 27 Jan 2025 15:15:38 +0100 Subject: [PATCH 09/22] Fix rebase --- .../lines/semileptonic/isolationMVA.py | 23 +++++++++++++++++++ .../lines/semileptonic/spruce_semileptonic.py | 7 +++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py index a00546a31a7..c1d445d5d68 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py @@ -12,6 +12,8 @@ import math import re from dataclasses import dataclass +import Functors as F +import Functors.math as fmath from DaVinciTools import SubstitutePID from Moore.monitoring import run_default_monitoring from PyConf.Algorithms import ( @@ -298,6 +300,7 @@ def extract_parent_name(line_name: str) -> (str, str): def prepare_MVA( +<<<<<<< HEAD line_name: str, line_output: ParticleCombiner, *, #All further options must be given as keyword arguments @@ -313,6 +316,26 @@ def prepare_MVA( new_parent_name = 'B*+' anti_new_parent_name = 'B*-' +======= + line_name: str, + line_output: ParticleCombiner, + *, # All further options must be given as keyword arguments + mva_min: float = None, + parent: str = "", + anti_parent: str = "", + mva_used: str = "inclusive", + apply_fiducial_cut: bool = True, + persist_b_iso_relations: bool = True, + persist_bst_iso_relations: bool = True, +) -> ( + ParticleToParticleWeightedRelTableAlg, + ParticleToParticleWeightedRelTableAlg, + SelectionFromWeightedRelationTable, + [monitor], +): + new_parent_name = "B*+" + anti_new_parent_name = "B*-" +>>>>>>> eb331d83a9 (Fix rebase) if not parent and not anti_parent: parent_name, anti_parent_name = extract_parent_name(line_name) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index 2baf3ec29f4..cf0b7ed9697 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -23,6 +23,7 @@ No lines have persistreco enabled from Moore.config import SpruceLine, register_line_builder from PyConf.dataflow import DataHandle from RecoConf.algorithms_thor import ParticleContainersMerger +from PyConf.dataflow import DataHandle from RecoConf.standard_particles import ( make_merged_pi0s, make_photons, @@ -157,10 +158,8 @@ from .HbToTauNu_BTracking import (get_btracking_hlt2_particles_for_sprucing, get_btracking_raw_banks, make_spruce_filtered_btracking_parts, get_btracking_extra_outputs_for_spruce) -from RecoConf.standard_particles import (make_photons, make_resolved_pi0s, - make_merged_pi0s) -from RecoConf.algorithms_thor import ParticleContainersMerger -from PyConf.dataflow import DataHandle +from .isolationMVA import prepare_MVA +from .pv_tracks import get_pv_tracks_for_bstar PROCESS = "spruce" spruce_lines = {} -- GitLab From 14938009b0c551f1bdc7abad42879a967e597185 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Mon, 27 Jan 2025 14:16:38 +0000 Subject: [PATCH 10/22] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/49951513 --- .../lines/semileptonic/spruce_semileptonic.py | 946 +++++++++--------- 1 file changed, 458 insertions(+), 488 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index cf0b7ed9697..387ad050e74 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -24,6 +24,7 @@ from Moore.config import SpruceLine, register_line_builder from PyConf.dataflow import DataHandle from RecoConf.algorithms_thor import ParticleContainersMerger from PyConf.dataflow import DataHandle +from RecoConf.algorithms_thor import ParticleContainersMerger from RecoConf.standard_particles import ( make_merged_pi0s, make_photons, @@ -148,16 +149,29 @@ from .HbToHuLNu import ( make_lbtopmunu_ss_fakep, ) from .HbToLLLNu import ( - make_b2mumumunu, make_b2emumunu, make_b2mueenu, make_b2eeenu, - make_b2mugammanu_cnvll, make_b2mugammanu_cnvdd, make_b2egammanu_cnvll, - make_b2egammanu_cnvdd, make_b2taumumunu_3pi, make_b2taueenu_3pi, - make_b2mumumunu_ss, make_b2emumunu_ss, make_b2mueenu_ss, make_b2eeenu_ss, - make_b2taumumunu_3pi_ss, make_b2taueenu_3pi_ss) -from .HbToHbprimeLNu import make_bctobsx -from .HbToTauNu_BTracking import (get_btracking_hlt2_particles_for_sprucing, - get_btracking_raw_banks, - make_spruce_filtered_btracking_parts, - get_btracking_extra_outputs_for_spruce) + make_b2eeenu, + make_b2eeenu_ss, + make_b2egammanu_cnvdd, + make_b2egammanu_cnvll, + make_b2emumunu, + make_b2emumunu_ss, + make_b2mueenu, + make_b2mueenu_ss, + make_b2mugammanu_cnvdd, + make_b2mugammanu_cnvll, + make_b2mumumunu, + make_b2mumumunu_ss, + make_b2taueenu_3pi, + make_b2taueenu_3pi_ss, + make_b2taumumunu_3pi, + make_b2taumumunu_3pi_ss, +) +from .HbToTauNu_BTracking import ( + get_btracking_extra_outputs_for_spruce, + get_btracking_hlt2_particles_for_sprucing, + get_btracking_raw_banks, + make_spruce_filtered_btracking_parts, +) from .isolationMVA import prepare_MVA from .pv_tracks import get_pv_tracks_for_bstar @@ -172,8 +186,9 @@ def get_neutral_tracks(): return ParticleContainersMerger(saved_tracks, name="extra_track_combiner") -def set_extra_outputs(name, b_iso_relations, bst_iso_relations, extra_tracks, - extra_neutrals) -> DataHandle: +def set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_tracks, extra_neutrals +) -> DataHandle: """Set the extra output for the line. Args: @@ -185,14 +200,15 @@ def set_extra_outputs(name, b_iso_relations, bst_iso_relations, extra_tracks, Returns: List for extra output. - """ - extra_output = [(f"{name}_extra_tracks", extra_tracks), - (f"{name}_extra_neutrals", extra_neutrals)] + """ + extra_output = [ + (f"{name}_extra_tracks", extra_tracks), + (f"{name}_extra_neutrals", extra_neutrals), + ] if b_iso_relations is not None: extra_output += [(f"{name}_signal_iso_relations", b_iso_relations)] if bst_iso_relations is not None: - extra_output += [(f"{name}_combination_iso_relations", - bst_iso_relations)] + extra_output += [(f"{name}_combination_iso_relations", bst_iso_relations)] return extra_output @@ -209,10 +225,8 @@ def spruce_bptod0taunu_d0tokpipipi_tautopipipinu_line( """ line_alg = make_bptod0taunu_d0tok3pi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -221,9 +235,9 @@ def spruce_bptod0taunu_d0tokpipipi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -250,14 +264,11 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( """ SL Spruce line for the decay Bc -> J/psi(1S)(-> mu mu) tau(-> mu nu nu) nu. """ - line_alg = make_bctojpsitaunu_jpsitomumu_tautolnunu( - process=PROCESS, lepton="mu") + line_alg = make_bctojpsitaunu_jpsitomumu_tautolnunu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) @@ -266,9 +277,9 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( name, line_alg, charged=True, charmed=True ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) extra_outputs_iso = set_extra_outputs( name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals @@ -285,7 +296,8 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( persistreco=persistreco, extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon, - monitoring_variables=_MONITORING_VARIABLES) + monitoring_variables=_MONITORING_VARIABLES, + ) @register_line_builder(spruce_lines) @@ -352,9 +364,9 @@ def spruce_bctojpsitaunu_jpsitomumu_muondecayinflight_line( name, line_alg, charged=True, charmed=True ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -365,7 +377,8 @@ def spruce_bctojpsitaunu_jpsitomumu_muondecayinflight_line( persistreco=persistreco, extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon, - monitoring_variables=_MONITORING_VARIABLES) + monitoring_variables=_MONITORING_VARIABLES, + ) @register_line_builder(spruce_lines) @@ -378,24 +391,22 @@ def spruce_b0todptaunu_dptokpipi_tautomununu_line( """ SL Spruce line for the decay B0 -> D+(-> K pi pi) tau(-> mu nu nu) nu. """ - line_alg = make_b0todptaunu_dptokpipi_tautolnunu( - process=PROCESS, lepton="mu") + line_alg = make_b0todptaunu_dptokpipi_tautolnunu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) line_mon = generate_default_monitoring_vars( - name, line_alg, charged=True, charmed=True) + name, line_alg, charged=True, charmed=True + ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -408,7 +419,8 @@ def spruce_b0todptaunu_dptokpipi_tautomununu_line( persistreco=persistreco, extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon, - monitoring_variables=_MONITORING_VARIABLES) + monitoring_variables=_MONITORING_VARIABLES, + ) @register_line_builder(spruce_lines) @@ -504,13 +516,10 @@ def spruce_butod0taunu_d0tokpi_tautomununu_line( """ SL Spruce line for the decay B+ -> D0(-> K pi) tau(-> mu nu nu) nu. """ - line_alg = make_butod0taunu_d0tokpi_tautolnunu( - process=PROCESS, lepton="mu") + line_alg = make_butod0taunu_d0tokpi_tautolnunu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -519,9 +528,9 @@ def spruce_butod0taunu_d0tokpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -603,9 +612,9 @@ def spruce_butod0taunu_d0tokpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -630,13 +639,10 @@ def spruce_butod0taunu_d0tok3pi_tautomununu_line( """ SL Spruce line for the decay B+ -> D0(-> K pi pi pi) tau(-> mu nu nu) nu. """ - line_alg = make_butod0taunu_d0tok3pi_tautolnunu( - process=PROCESS, lepton="mu") + line_alg = make_butod0taunu_d0tok3pi_tautolnunu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -645,9 +651,9 @@ def spruce_butod0taunu_d0tok3pi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -729,9 +735,9 @@ def spruce_butod0taunu_d0tok3pi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -756,13 +762,10 @@ def spruce_bstodstaunu_dstokkpi_tautomununu_line( """ SL Spruce line for the decay Bs0 -> Ds-(-> K K pi) tau+(-> mu nu nu) nu, and combinatorial (same sign). """ - line_alg = make_bstodstaunu_dstokkpi_tautolnunu( - process=PROCESS, lepton="mu") + line_alg = make_bstodstaunu_dstokkpi_tautolnunu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() @@ -772,9 +775,9 @@ def spruce_bstodstaunu_dstokkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -886,10 +889,8 @@ def spruce_lbtolcmunu_lctopkpi_line( """ line_alg = make_lbtolclnu_lctopkpi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -898,9 +899,9 @@ def spruce_lbtolcmunu_lctopkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -980,9 +981,9 @@ def spruce_lbtolcmunu_lctopkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1009,10 +1010,8 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_line( """ line_alg = make_lbtolctaunu_lctopkpi_tautolnu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1021,9 +1020,9 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1105,9 +1104,9 @@ def spruce_lbtolctaunu_lctopkpi_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1134,10 +1133,8 @@ def spruce_bctojpsimunu_jpsitomumu_line( """ line_alg = make_bctojpsilnu_jpsitomumu(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1146,9 +1143,9 @@ def spruce_bctojpsimunu_jpsitomumu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -1228,9 +1225,9 @@ def spruce_bctojpsimunu_jpsitomumu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -1257,10 +1254,8 @@ def spruce_butod0munu_d0tokpi_line( """ line_alg = make_butod0lnu_d0tokpi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) @@ -1270,9 +1265,9 @@ def spruce_butod0munu_d0tokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1352,9 +1347,9 @@ def spruce_butod0munu_d0tokpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1378,10 +1373,8 @@ def spruce_butod0enu_d0tokpi_line( """ line_alg = make_butod0lnu_d0tokpi(process=PROCESS, lepton="e") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1390,9 +1383,9 @@ def spruce_butod0enu_d0tokpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1421,10 +1414,8 @@ def spruce_butod0enu_d0tokpi_fakeelectron_line( """ line_alg = make_butod0lnu_d0tokpi_fakelepton(process=PROCESS, lepton="e") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1433,9 +1424,9 @@ def spruce_butod0enu_d0tokpi_fakeelectron_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1462,10 +1453,8 @@ def spruce_butod0munu_d0tok3pi_line( """ line_alg = make_butod0lnu_d0tok3pi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1474,9 +1463,9 @@ def spruce_butod0munu_d0tok3pi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1556,9 +1545,9 @@ def spruce_butod0munu_d0tok3pi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1585,10 +1574,8 @@ def spruce_b0todpmunu_dptokpipi_line( """ line_alg = make_b0todplnu_dptokpipi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1597,9 +1584,9 @@ def spruce_b0todpmunu_dptokpipi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1679,9 +1666,9 @@ def spruce_b0todpmunu_dptokpipi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1708,10 +1695,8 @@ def spruce_b0todpmunu_dptokkpi_line( """ line_alg = make_b0todplnu_dptokkpi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1720,9 +1705,9 @@ def spruce_b0todpmunu_dptokkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1802,9 +1787,9 @@ def spruce_b0todpmunu_dptokkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1831,10 +1816,8 @@ def spruce_bstodsmunu_dstokkpi_line( """ line_alg = make_bstodslnu_dstokkpi(process=PROCESS, lepton="mu") b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1843,9 +1826,9 @@ def spruce_bstodsmunu_dstokkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1873,12 +1856,11 @@ def spruce_bstodstlnu_dsttodsgamma_dstokkpi_gammatoee_line( SL Spruce line for the decay B_s0 -> D*s(-> Ds(-> K K pi) gamma (-> ee) ) mu nu. """ line_alg = make_bstodstlnu_dsttodsgamma_dstokkpi_gammatoee( - process=PROCESS, lepton="mu") + process=PROCESS, lepton="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -1887,9 +1869,9 @@ def spruce_bstodstlnu_dsttodsgamma_dstokkpi_gammatoee_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -1969,9 +1951,9 @@ def spruce_bstodsmunu_dstokkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2000,10 +1982,8 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_line( """ line_alg = make_xib0toxicplusmunu_xicplustopkpi(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=False, charmed=True @@ -2011,9 +1991,9 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2042,13 +2022,10 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_line( Xi_b0 -> Xi_c+ (-> p K- pi+) tau- (-> mu- nu nu) nu (Right sign) Xi_b0 -> Xi_c+ (-> p K- pi+) tau+ (-> mu+ nu nu) nu (Wrong sign) """ - line_alg = make_xib0toxicplustaunu_xicplustopkpi_tautomununu( - process=PROCESS) + line_alg = make_xib0toxicplustaunu_xicplustopkpi_tautomununu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2057,9 +2034,9 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2141,9 +2118,9 @@ def spruce_xib0toxicplusmunu_xicplustopkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2225,9 +2202,9 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2256,10 +2233,8 @@ def spruce_xibminustoxic0munu_xic0topkkpi_line( """ line_alg = make_xibminustoxic0munu_xic0topkkpi(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True @@ -2267,9 +2242,9 @@ def spruce_xibminustoxic0munu_xic0topkkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2298,13 +2273,10 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_line( Xi_b- -> Xi_c0 (-> p K- K- pi+) tau- (-> mu- nu nu) nu (Right sign) Xi_b- -> Xi_c0 (-> p K- K- pi+) tau+ (-> mu+ nu nu) nu (Wrong sign) """ - line_alg = make_xibminustoxic0taunu_xic0topkkpi_tautomununu( - process=PROCESS) + line_alg = make_xibminustoxic0taunu_xic0topkkpi_tautomununu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2313,9 +2285,9 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2397,9 +2369,9 @@ def spruce_xibminustoxic0munu_xic0topkkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2481,9 +2453,9 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2510,10 +2482,8 @@ def spruce_b0todptaunu_dptokpipi_tautopipipinu_line( """ line_alg = make_b0todptaunu_dptokpipi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2522,9 +2492,9 @@ def spruce_b0todptaunu_dptokpipi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2553,10 +2523,8 @@ def spruce_bctojpsitaunu_jpsitomumu_tautopipipinu_line( """ line_alg = make_bctojpsitaunu_jpsitomumu_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2565,9 +2533,9 @@ def spruce_bctojpsitaunu_jpsitomumu_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2596,10 +2564,8 @@ def spruce_bptod0taunu_d0tokpi_tautopipipinu_line( """ line_alg = make_bptod0taunu_d0tokpi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2608,9 +2574,9 @@ def spruce_bptod0taunu_d0tokpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2639,10 +2605,8 @@ def spruce_bstodstaunu_dstokkpi_tautopipipinu_line( """ line_alg = make_bstodstaunu_dstokkpi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2651,9 +2615,9 @@ def spruce_bstodstaunu_dstokkpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, hlt2_filter_code=[ @@ -2681,10 +2645,8 @@ def spruce_lbtolctaunu_lctopkpi_tautopipipinu_line( """ line_alg = make_lbtolctaunu_lctopkpi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2693,9 +2655,9 @@ def spruce_lbtolctaunu_lctopkpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2726,7 +2688,8 @@ def spruce_b0topimunu_line( parent="B0", anti_parent="B~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2735,9 +2698,9 @@ def spruce_b0topimunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2765,7 +2728,7 @@ def spruce_b0topimunu_fakemuon_line( SL Spruce line for the decay B0 -> pi mu nu, with a fake muon. """ line_alg = make_b0topimunu_fakemu(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -2825,9 +2788,9 @@ def spruce_b0topimunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2853,14 +2816,15 @@ def spruce_b0topimunu_fakek_line( SL Spruce line for the decay B0 -> pi mu, with a fake pions. """ line_alg = make_b0topimunu_fakek(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B0", anti_parent="B~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2869,9 +2833,9 @@ def spruce_b0topimunu_fakek_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2895,10 +2859,8 @@ def spruce_lbtopmunu_line( """ line_alg = make_lbtopmunu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2907,9 +2869,9 @@ def spruce_lbtopmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2934,10 +2896,8 @@ def spruce_lbtopmunu_fakep_line( """ line_alg = make_lbtopmunu_fakep(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2946,9 +2906,9 @@ def spruce_lbtopmunu_fakep_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3026,9 +2986,9 @@ def spruce_lbtopmunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3052,10 +3012,8 @@ def spruce_lbtopmunu_ss_line( """ line_alg = make_lbtopmunu_ss(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3064,9 +3022,9 @@ def spruce_lbtopmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3095,10 +3053,8 @@ def spruce_lbtopmunu_ss_fakep_line( """ line_alg = make_lbtopmunu_ss_fakep(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3107,9 +3063,9 @@ def spruce_lbtopmunu_ss_fakep_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3187,9 +3143,9 @@ def spruce_lbtopmunu_ss_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3212,7 +3168,7 @@ def spruce_bstokmunu_line( SL Spruce line for the decay Bs0 -> K mu nu. """ line_alg = make_bstokmunu(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -3439,9 +3395,9 @@ def spruce_bstokmunu_decayinflight_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3602,9 +3558,9 @@ def spruce_bstokmunu_fakek_muondecayinflight_line( ) extra_neutrals = get_neutral_tracks() - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) line_mon = generate_default_monitoring_vars( name, line_alg, charged=False, charmed=False @@ -3690,9 +3646,9 @@ def spruce_bstokenu_ss_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3774,9 +3730,9 @@ def spruce_bstokenu_fakeelectron_ss_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3891,9 +3847,9 @@ def spruce_bstokenu_fakek_fakeelectron_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3916,14 +3872,15 @@ def spruce_b2ppbarmunu_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays """ line_alg = make_b2ppbarmunu(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -3933,9 +3890,9 @@ def spruce_b2ppbarmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4147,17 +4104,18 @@ def spruce_b2pipimunu_line( b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, - parent='B+', - anti_parent='B-', + parent="B+", + anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4191,18 +4149,19 @@ def spruce_b2pipimunu_ss_line( b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, - parent='B+', - anti_parent='B-', + parent="B+", + anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4292,9 +4251,9 @@ def spruce_b2pipimunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4327,18 +4286,19 @@ def spruce_b2pipimunu_fakepi_line( b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, - parent='B+', - anti_parent='B-', + parent="B+", + anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() extra_PV_tracks = get_pv_tracks_for_bstar(name, line_alg) hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4362,14 +4322,15 @@ def spruce_b2kkmunu_line( """ line_alg = make_b2kkmunu(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4379,9 +4340,9 @@ def spruce_b2kkmunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4407,14 +4368,15 @@ def spruce_b2kkmunu_ss_line( """ line_alg = make_b2kkmunu_ss(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4424,9 +4386,9 @@ def spruce_b2kkmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4455,7 +4417,7 @@ def spruce_b2kkmunu_fakemuon_line( """ line_alg = make_b2kkmunu_fakemu(process=PROCESS) - #We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4549,7 +4511,8 @@ def spruce_b2mumumunu_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4559,9 +4522,9 @@ def spruce_b2mumumunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4593,7 +4556,8 @@ def spruce_b2emumunu_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4603,9 +4567,9 @@ def spruce_b2emumunu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4637,7 +4601,8 @@ def spruce_b2mueenu_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4647,9 +4612,9 @@ def spruce_b2mueenu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4684,7 +4649,8 @@ def spruce_b2mugammanu_cnvll_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4740,9 +4706,9 @@ def spruce_b2mugammanu_cnvdd_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4777,7 +4743,8 @@ def spruce_b2egammanu_cnvll_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4786,9 +4753,9 @@ def spruce_b2egammanu_cnvll_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4823,7 +4790,8 @@ def spruce_b2egammanu_cnvdd_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -4832,9 +4800,9 @@ def spruce_b2egammanu_cnvdd_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4866,7 +4834,8 @@ def spruce_b2eeenu_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4876,9 +4845,9 @@ def spruce_b2eeenu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4910,16 +4879,17 @@ def spruce_b2taumumunu_3pi_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=False ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4955,9 +4925,9 @@ def spruce_b2taueenu_3pi_line( name, line_alg, charged=True, charmed=False ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4985,7 +4955,8 @@ def spruce_b2mumumunu_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -4995,9 +4966,9 @@ def spruce_b2mumumunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5029,7 +5000,8 @@ def spruce_b2emumunu_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -5039,9 +5011,9 @@ def spruce_b2emumunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5073,7 +5045,8 @@ def spruce_b2mueenu_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -5083,9 +5056,9 @@ def spruce_b2mueenu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5117,7 +5090,8 @@ def spruce_b2eeenu_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -5127,9 +5101,9 @@ def spruce_b2eeenu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5161,7 +5135,8 @@ def spruce_b2taumumunu_3pi_ss_line( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -5169,9 +5144,9 @@ def spruce_b2taumumunu_3pi_ss_line( name, line_alg, charged=True, charmed=False ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5199,7 +5174,8 @@ def spruce_b2taueenu_3pi_ss( parent="B+", anti_parent="B-", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -5207,9 +5183,9 @@ def spruce_b2taueenu_3pi_ss( name, line_alg, charged=True, charmed=False ) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5234,10 +5210,8 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_line( """ line_alg = make_omegabtoomegacmunu_omegactopkkpi(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5246,9 +5220,9 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5328,9 +5302,9 @@ def spruce_omegabtoomegacmunu_omegactopkkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5482,12 +5456,11 @@ def spruce_lbtolcmunu_lctopksLL_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu") + process=PROCESS, V0_name="KS0", V0_type="LL", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5496,9 +5469,9 @@ def spruce_lbtolcmunu_lctopksLL_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5527,12 +5500,11 @@ def spruce_lbtolcmunu_lctopksDD_line( Here (KS0 -> pi+ pi-) is reconstructed using two 'downstream' tracks ('DD' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu") + process=PROCESS, V0_name="KS0", V0_type="DD", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -5541,9 +5513,9 @@ def spruce_lbtolcmunu_lctopksDD_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5631,9 +5603,9 @@ def spruce_lbtolcmunu_lctopksLL_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5719,9 +5691,9 @@ def spruce_lbtolcmunu_lctopksDD_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6016,12 +5988,11 @@ def spruce_lbtolcmunu_lctolambdapiLL_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'long' tracks ('LL' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu") + process=PROCESS, V0_name="Lambda0", V0_type="LL", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6030,9 +6001,9 @@ def spruce_lbtolcmunu_lctolambdapiLL_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6061,12 +6032,11 @@ def spruce_lbtolcmunu_lctolambdapiDD_line( Here (Lambda0 -> pi+ pi-) is reconstructed using two 'downstream' tracks ('DD' category). """ line_alg = make_lbtolclnu_lctoV0h( - process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu") + process=PROCESS, V0_name="Lambda0", V0_type="DD", lepton_name="mu" + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -6075,9 +6045,9 @@ def spruce_lbtolcmunu_lctolambdapiDD_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6165,9 +6135,9 @@ def spruce_lbtolcmunu_lctolambdapiLL_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6253,9 +6223,9 @@ def spruce_lbtolcmunu_lctolambdapiDD_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6296,9 +6266,9 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6430,9 +6400,9 @@ def spruce_lbtolctaunu_lctolambdapiLL_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -7873,9 +7843,9 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautopipipinu_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8045,9 +8015,9 @@ def spruce_bstoktaunu_muonic_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, -- GitLab From 19da31b0b8f6f83dd3102f6ce280de4acb749511 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 27 Jan 2025 22:41:53 +0100 Subject: [PATCH 11/22] Fix changes during rebase --- .../lines/semileptonic/spruce_semileptonic.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index 387ad050e74..14aa5955735 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -271,12 +271,12 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( ) extra_neutrals = get_neutral_tracks() - hlt2_name = map_line_name(name, legacy_name=legacy_name) - line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True ) + hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs( name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals ) @@ -317,6 +317,7 @@ def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() +<<<<<<< HEAD line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True ) @@ -360,10 +361,14 @@ def spruce_bctojpsitaunu_jpsitomumu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) +======= +>>>>>>> 816031f584 (Fix changes during rebase) line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True ) + hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs( name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals ) @@ -398,12 +403,12 @@ def spruce_b0todptaunu_dptokpipi_tautomununu_line( ) extra_neutrals = get_neutral_tracks() - hlt2_name = map_line_name(name, legacy_name=legacy_name) - line_mon = generate_default_monitoring_vars( - name, line_alg, charged=True, charmed=True + name, line_alg, charged=False, charmed=True ) + hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs( name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals ) -- GitLab From a7cb219037273dfd6894135619caf02068e36ffb Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 27 Jan 2025 22:54:07 +0100 Subject: [PATCH 12/22] Fix name of spruce line and remove commented lines --- .../lines/semileptonic/spruce_semileptonic.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index 14aa5955735..fabd045d596 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -302,10 +302,18 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( @register_line_builder(spruce_lines) def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( +<<<<<<< HEAD name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", prescale=0.5, persistreco=False, legacy_name=False): +======= + name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", + prescale=0.5, + persistreco=False, + legacy_name=False, +): +>>>>>>> dbd04822b6 (Fix name of spruce line and remove commented lines) """ SL Spruce line for the decay Bc -> J/psi(1S)(-> mu mu) tau(-> mu nu nu) nu, with a fake muon. """ @@ -2733,7 +2741,6 @@ def spruce_b0topimunu_fakemuon_line( SL Spruce line for the decay B0 -> pi mu nu, with a fake muon. """ line_alg = make_b0topimunu_fakemu(process=PROCESS) - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -2821,7 +2828,6 @@ def spruce_b0topimunu_fakek_line( SL Spruce line for the decay B0 -> pi mu, with a fake pions. """ line_alg = make_b0topimunu_fakek(process=PROCESS) - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -3173,7 +3179,6 @@ def spruce_bstokmunu_line( SL Spruce line for the decay Bs0 -> K mu nu. """ line_alg = make_bstokmunu(process=PROCESS) - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -3877,7 +3882,6 @@ def spruce_b2ppbarmunu_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays """ line_alg = make_b2ppbarmunu(process=PROCESS) - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4326,8 +4330,6 @@ def spruce_b2kkmunu_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays """ line_alg = make_b2kkmunu(process=PROCESS) - - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4372,8 +4374,6 @@ def spruce_b2kkmunu_ss_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays with same-sign kaons """ line_alg = make_b2kkmunu_ss(process=PROCESS) - - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4421,8 +4421,6 @@ def spruce_b2kkmunu_fakemuon_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays with a fake muon """ line_alg = make_b2kkmunu_fakemu(process=PROCESS) - - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, -- GitLab From 6b6836a4a0234320bdc9de05bce902703ae32991 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 27 Jan 2025 12:31:51 +0100 Subject: [PATCH 13/22] Squashed commit of the following: commit 911d563fa5ff5cc29e45a0de12581cb0c0d7bbbe Author: Tommaso Fulghesu Date: Sun Jan 19 21:44:27 2025 +0100 Use only extra tracks not duplicated commit 994edab40900403a22fe7bef328f50f1a807b58d Author: Gitlab CI Date: Thu Jan 16 11:09:36 2025 +0000 Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/49414770 commit 45e8c3083f3d73a8acb036d3ec162fb09f55fcf6 Author: Tommaso Fulghesu Date: Thu Jan 16 12:08:52 2025 +0100 Fix linting commit 253950879e5ecf060da05a8f32609106848e2af6 Author: Tommaso Fulghesu Date: Thu Jan 16 09:58:47 2025 +0100 Fix linting commit 6cbb3e35f78d6400546f1c8ac4977521abb2a0ae Author: Gitlab CI Date: Thu Jan 16 08:55:20 2025 +0000 Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/49406999 commit 254abca33da46311565c3e6b5f833c88ebcbc7cf Author: Tommaso Fulghesu Date: Thu Jan 16 09:54:42 2025 +0100 Fix linting and returned value for legacy name case commit de9b7d10f94dedb092a3908435685aa8ebfee919 Author: Tommaso Fulghesu Date: Thu Jan 16 09:29:18 2025 +0100 Test fixing linting commit 7b4ea77fd924c664f856929f1f4788af9fad6193 Author: Tommaso Fulghesu Date: Wed Jan 15 22:33:47 2025 +0100 Fix linting commit c7cd83d32ff493534812f711e7a0ccde3aa098b3 Author: Tommaso Fulghesu Date: Wed Jan 15 22:28:19 2025 +0100 Rebase and add new isolation to other lines --- .../lines/semileptonic/isolationMVA.py | 52 +++++-------------- .../lines/semileptonic/spruce_semileptonic.py | 21 ++++---- 2 files changed, 23 insertions(+), 50 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py index c1d445d5d68..967f4218652 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py @@ -11,9 +11,11 @@ import math import re from dataclasses import dataclass - -import Functors as F -import Functors.math as fmath +from PyConf.Algorithms import MVAWeightedRelTableAlg, SelectionFromWeightedRelationTable +from SelAlgorithms.monitoring import monitor, histogram_1d +from RecoConf.standard_particles import make_has_rich_long_pions +from RecoConf.standard_particles import make_has_rich_up_pions +from RecoConf.standard_particles import make_has_rich_down_pions from DaVinciTools import SubstitutePID from Moore.monitoring import run_default_monitoring from PyConf.Algorithms import ( @@ -300,7 +302,6 @@ def extract_parent_name(line_name: str) -> (str, str): def prepare_MVA( -<<<<<<< HEAD line_name: str, line_output: ParticleCombiner, *, #All further options must be given as keyword arguments @@ -316,26 +317,6 @@ def prepare_MVA( new_parent_name = 'B*+' anti_new_parent_name = 'B*-' -======= - line_name: str, - line_output: ParticleCombiner, - *, # All further options must be given as keyword arguments - mva_min: float = None, - parent: str = "", - anti_parent: str = "", - mva_used: str = "inclusive", - apply_fiducial_cut: bool = True, - persist_b_iso_relations: bool = True, - persist_bst_iso_relations: bool = True, -) -> ( - ParticleToParticleWeightedRelTableAlg, - ParticleToParticleWeightedRelTableAlg, - SelectionFromWeightedRelationTable, - [monitor], -): - new_parent_name = "B*+" - anti_new_parent_name = "B*-" ->>>>>>> eb331d83a9 (Fix rebase) if not parent and not anti_parent: parent_name, anti_parent_name = extract_parent_name(line_name) @@ -399,24 +380,17 @@ def prepare_MVA( name=f"{line_name}", CompositeSelection=Bst_z_subset, SignalSelection=line_output, - MVAFunctor=MVA_functor, - ) + MVAFunctor=MVA_functor) b_iso_relations = iso_relations_alg.BOutputRelations bst_iso_relations = iso_relations_alg.BstOutputRelations extra_tracks = SelectionFromWeightedRelationTable( - InputRelations=bst_iso_relations - ).OutputLocation + InputRelations=bst_iso_relations).OutputLocation - monitoring_histos = ( - [monitor(data=Bst_z, histograms=input_monitoring + [monitoring_histo])] - if run_default_monitoring() - else [] - ) + monitoring_histos = ([ + monitor(data=Bst_z, histograms=input_monitoring + [monitoring_histo]) + ] if run_default_monitoring() else []) - return ( - b_iso_relations if persist_b_iso_relations else None, - bst_iso_relations if persist_bst_iso_relations else None, - extra_tracks, - monitoring_histos, - ) + return (b_iso_relations if persist_b_iso_relations else None, + bst_iso_relations if persist_bst_iso_relations else None, + extra_tracks, monitoring_histos) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index fabd045d596..40b5ad1e10c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -302,18 +302,10 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( @register_line_builder(spruce_lines) def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( -<<<<<<< HEAD name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", prescale=0.5, persistreco=False, legacy_name=False): -======= - name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", - prescale=0.5, - persistreco=False, - legacy_name=False, -): ->>>>>>> dbd04822b6 (Fix name of spruce line and remove commented lines) """ SL Spruce line for the decay Bc -> J/psi(1S)(-> mu mu) tau(-> mu nu nu) nu, with a fake muon. """ @@ -325,7 +317,6 @@ def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() -<<<<<<< HEAD line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True ) @@ -369,8 +360,6 @@ def spruce_bctojpsitaunu_jpsitomumu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) -======= ->>>>>>> 816031f584 (Fix changes during rebase) line_mon = generate_default_monitoring_vars( name, line_alg, charged=True, charmed=True ) @@ -2741,6 +2730,7 @@ def spruce_b0topimunu_fakemuon_line( SL Spruce line for the decay B0 -> pi mu nu, with a fake muon. """ line_alg = make_b0topimunu_fakemu(process=PROCESS) + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -2828,6 +2818,7 @@ def spruce_b0topimunu_fakek_line( SL Spruce line for the decay B0 -> pi mu, with a fake pions. """ line_alg = make_b0topimunu_fakek(process=PROCESS) + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -3179,6 +3170,7 @@ def spruce_bstokmunu_line( SL Spruce line for the decay Bs0 -> K mu nu. """ line_alg = make_bstokmunu(process=PROCESS) + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -3882,6 +3874,7 @@ def spruce_b2ppbarmunu_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays """ line_alg = make_b2ppbarmunu(process=PROCESS) + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4330,6 +4323,8 @@ def spruce_b2kkmunu_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays """ line_alg = make_b2kkmunu(process=PROCESS) + + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4374,6 +4369,8 @@ def spruce_b2kkmunu_ss_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays with same-sign kaons """ line_alg = make_b2kkmunu_ss(process=PROCESS) + + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4421,6 +4418,8 @@ def spruce_b2kkmunu_fakemuon_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays with a fake muon """ line_alg = make_b2kkmunu_fakemu(process=PROCESS) + + # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, -- GitLab From 89653ffee42ee885a98a871cd8a9912e7d26b05b Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Mon, 27 Jan 2025 11:34:07 +0000 Subject: [PATCH 14/22] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/49941474 --- .../lines/semileptonic/isolationMVA.py | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py index 967f4218652..a00546a31a7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py @@ -11,11 +11,7 @@ import math import re from dataclasses import dataclass -from PyConf.Algorithms import MVAWeightedRelTableAlg, SelectionFromWeightedRelationTable -from SelAlgorithms.monitoring import monitor, histogram_1d -from RecoConf.standard_particles import make_has_rich_long_pions -from RecoConf.standard_particles import make_has_rich_up_pions -from RecoConf.standard_particles import make_has_rich_down_pions + from DaVinciTools import SubstitutePID from Moore.monitoring import run_default_monitoring from PyConf.Algorithms import ( @@ -380,17 +376,24 @@ def prepare_MVA( name=f"{line_name}", CompositeSelection=Bst_z_subset, SignalSelection=line_output, - MVAFunctor=MVA_functor) + MVAFunctor=MVA_functor, + ) b_iso_relations = iso_relations_alg.BOutputRelations bst_iso_relations = iso_relations_alg.BstOutputRelations extra_tracks = SelectionFromWeightedRelationTable( - InputRelations=bst_iso_relations).OutputLocation + InputRelations=bst_iso_relations + ).OutputLocation - monitoring_histos = ([ - monitor(data=Bst_z, histograms=input_monitoring + [monitoring_histo]) - ] if run_default_monitoring() else []) + monitoring_histos = ( + [monitor(data=Bst_z, histograms=input_monitoring + [monitoring_histo])] + if run_default_monitoring() + else [] + ) - return (b_iso_relations if persist_b_iso_relations else None, - bst_iso_relations if persist_bst_iso_relations else None, - extra_tracks, monitoring_histos) + return ( + b_iso_relations if persist_b_iso_relations else None, + bst_iso_relations if persist_bst_iso_relations else None, + extra_tracks, + monitoring_histos, + ) -- GitLab From 53751b2a5f72e7dbec2aa6c51b0157616e916009 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 27 Jan 2025 15:15:38 +0100 Subject: [PATCH 15/22] Fix rebase --- Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py | 2 ++ .../python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py | 1 + 2 files changed, 3 insertions(+) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py index a00546a31a7..73b34676608 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py @@ -12,6 +12,8 @@ import math import re from dataclasses import dataclass +import Functors as F +import Functors.math as fmath from DaVinciTools import SubstitutePID from Moore.monitoring import run_default_monitoring from PyConf.Algorithms import ( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index 40b5ad1e10c..e83cbc4d076 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -25,6 +25,7 @@ from PyConf.dataflow import DataHandle from RecoConf.algorithms_thor import ParticleContainersMerger from PyConf.dataflow import DataHandle from RecoConf.algorithms_thor import ParticleContainersMerger +from PyConf.dataflow import DataHandle from RecoConf.standard_particles import ( make_merged_pi0s, make_photons, -- GitLab From 38299b4ba7cfafab96f40c8e5f9ffdcc4fca1c45 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Mon, 27 Jan 2025 14:16:38 +0000 Subject: [PATCH 16/22] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/49951513 --- .../Hlt2Conf/lines/semileptonic/spruce_semileptonic.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index e83cbc4d076..ab6acc6e508 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -23,9 +23,6 @@ No lines have persistreco enabled from Moore.config import SpruceLine, register_line_builder from PyConf.dataflow import DataHandle from RecoConf.algorithms_thor import ParticleContainersMerger -from PyConf.dataflow import DataHandle -from RecoConf.algorithms_thor import ParticleContainersMerger -from PyConf.dataflow import DataHandle from RecoConf.standard_particles import ( make_merged_pi0s, make_photons, @@ -2782,7 +2779,8 @@ def spruce_b0topimunu_muondecayinflight_line( parent="B0", anti_parent="B~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( -- GitLab From e6e8ea5abc425a7f4e7c577eed52ffc1038a3cbb Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 27 Jan 2025 22:41:53 +0100 Subject: [PATCH 17/22] Fix changes during rebase --- .../lines/semileptonic/spruce_semileptonic.py | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index ab6acc6e508..fc3ec96a68f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -279,10 +279,6 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals ) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) - return SpruceLine( name=name, hlt2_filter_code=[ @@ -3320,16 +3316,17 @@ def spruce_bstokmunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3347,8 +3344,13 @@ def spruce_bstokmunu_fakemuon_ss_line( SL Spruce line for the decay Bs0 -> K mu nu, with a fake muon (same-sign). """ line_alg = make_bstokmunu_ss_fakemu(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -3358,16 +3360,17 @@ def spruce_bstokmunu_fakemuon_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3484,16 +3487,17 @@ def spruce_bstokmunu_fakek_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3527,16 +3531,17 @@ def spruce_bstokmunu_fakek_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -3813,16 +3818,17 @@ def spruce_bstokenu_fakek_ss_line( hlt2_name = map_line_name(name) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) + return SpruceLine( name=name, hlt2_filter_code=[ f"{hlt2_name}Decision", ], prescale=prescale, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, persistreco=persistreco, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, @@ -7857,10 +7863,7 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautopipipinu_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) @@ -8029,10 +8032,7 @@ def spruce_bstoktaunu_muonic_ss_line( ], prescale=prescale, persistreco=persistreco, - extra_outputs=[ - (f"{name}_extra_tracks", extra_track_TES), - (f"{name}_extra_neutrals", extra_neutrals), - ], + extra_outputs=extra_outputs_iso, algs=sl_line_prefilter() + [line_alg] + line_mon + iso_monitoring, monitoring_variables=_MONITORING_VARIABLES, ) -- GitLab From 1aca824eb7d1713de382f265808f9932658113bc Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 27 Jan 2025 22:54:07 +0100 Subject: [PATCH 18/22] Fix name of spruce line and remove commented lines --- .../Hlt2Conf/lines/semileptonic/spruce_semileptonic.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index fc3ec96a68f..97888ab604d 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -2724,7 +2724,6 @@ def spruce_b0topimunu_fakemuon_line( SL Spruce line for the decay B0 -> pi mu nu, with a fake muon. """ line_alg = make_b0topimunu_fakemu(process=PROCESS) - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -2813,7 +2812,6 @@ def spruce_b0topimunu_fakek_line( SL Spruce line for the decay B0 -> pi mu, with a fake pions. """ line_alg = make_b0topimunu_fakek(process=PROCESS) - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -3165,7 +3163,6 @@ def spruce_bstokmunu_line( SL Spruce line for the decay Bs0 -> K mu nu. """ line_alg = make_bstokmunu(process=PROCESS) - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -3879,7 +3876,6 @@ def spruce_b2ppbarmunu_line( SL Spruce line for the B->ppmunu and muonic B->pptaunu decays """ line_alg = make_b2ppbarmunu(process=PROCESS) - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4328,8 +4324,6 @@ def spruce_b2kkmunu_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays """ line_alg = make_b2kkmunu(process=PROCESS) - - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4374,8 +4368,6 @@ def spruce_b2kkmunu_ss_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays with same-sign kaons """ line_alg = make_b2kkmunu_ss(process=PROCESS) - - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, @@ -4423,8 +4415,6 @@ def spruce_b2kkmunu_fakemuon_line( SL Spruce line for the B->KKmunu and muonic B->KKtaunu decays with a fake muon """ line_alg = make_b2kkmunu_fakemu(process=PROCESS) - - # We give the decay descriptor manually for this line in the isolation tool since it follows a different naming convention b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, -- GitLab From dd805c208600c2898044421d1a68bb413bdc2054 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Mon, 14 Apr 2025 09:47:19 +0000 Subject: [PATCH 19/22] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/54616994 --- .../lines/semileptonic/hlt2_semileptonic.py | 4 +- .../lines/semileptonic/isolationMVA.py | 33 +- .../lines/semileptonic/line_naming.py | 76 ++--- .../lines/semileptonic/spruce_semileptonic.py | 304 +++++++++++------- 4 files changed, 244 insertions(+), 173 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/hlt2_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/hlt2_semileptonic.py index a66c0c8e300..088ed51e2fc 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/hlt2_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/hlt2_semileptonic.py @@ -2658,7 +2658,9 @@ def hlt2_bstokmunu_fakek_fakemuon_line( @register_line_builder(hlt2_lines) def hlt2_bstokmunu_fakek_muondecayinflight_line( - name="Hlt2SLB_BsToKMuNu_FakeKaon_MuonDecayInFlight", prescale=0.004, persistreco=True + name="Hlt2SLB_BsToKMuNu_FakeKaon_MuonDecayInFlight", + prescale=0.004, + persistreco=True, ): """ SL Hlt2 line for the decay Bs0 -> K mu nu and Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon and a decay in flight muon. diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py index 73b34676608..2ee8f9ff6f1 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py @@ -300,21 +300,24 @@ def extract_parent_name(line_name: str) -> (str, str): def prepare_MVA( - line_name: str, - line_output: ParticleCombiner, - *, #All further options must be given as keyword arguments - mva_min: float = None, - parent: str = "", - anti_parent: str = "", - mva_used: str = "inclusive", - apply_fiducial_cut: bool = True, - persist_b_iso_relations: bool = True, - persist_bst_iso_relations: bool = True -) -> (ParticleToParticleWeightedRelTableAlg, ParticleToParticleWeightedRelTableAlg, - SectionFromWeightedRelationTable, [monitor]): - - new_parent_name = 'B*+' - anti_new_parent_name = 'B*-' + line_name: str, + line_output: ParticleCombiner, + *, # All further options must be given as keyword arguments + mva_min: float = None, + parent: str = "", + anti_parent: str = "", + mva_used: str = "inclusive", + apply_fiducial_cut: bool = True, + persist_b_iso_relations: bool = True, + persist_bst_iso_relations: bool = True, +) -> ( + ParticleToParticleWeightedRelTableAlg, + ParticleToParticleWeightedRelTableAlg, + SectionFromWeightedRelationTable, + [monitor], +): + new_parent_name = "B*+" + anti_new_parent_name = "B*-" if not parent and not anti_parent: parent_name, anti_parent_name = extract_parent_name(line_name) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/line_naming.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/line_naming.py index 52329a65eb3..c77c9b5c7aa 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/line_naming.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/line_naming.py @@ -12,79 +12,79 @@ This module provides the mapping of the line names between the old (2024 data taking) and new (2025 data taking) naming conventions. Comments are related to lines that were added in the 2025 trigger configuration. -The mapping is used to ensure that the spruce lines are filtered based on the correct -exclusive HLT2 lines in the given period of data taking. +The mapping is used to ensure that the spruce lines are filtered based on the correct +exclusive HLT2 lines in the given period of data taking. """ line_name_mapping = { "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToPiPiPiNu": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_TauToPiPiPiNu", "SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon": "SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_FakeMuon", - "SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_B0ToDpTauNu_DpToKPiPi_TauToMuNuNu_FakeMuon": "SpruceSLB_B0ToDpTauNu_DpToKPiPi_FakeMuon", - "SpruceSLB_B0ToDpTauNu_DpToKPiPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_B0ToDpTauNu_DpToKPiPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_B0ToDpTauNu_DpToKPiPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_B0ToDpTauNu_DpToKPiPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_BuToD0TauNu_D0ToKPi_TauToMuNuNu_FakeMuon": "SpruceSLB_BuToD0TauNu_D0ToKPi_FakeMuon", - "SpruceSLB_BuToD0TauNu_D0ToKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_BuToD0TauNu_D0ToKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_BuToD0TauNu_D0ToKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_BuToD0TauNu_D0ToKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToMuNuNu": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_TauToMuNuNu", "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToMuNuNu_FakeMuon": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_FakeMuon", - "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_FakeMuon", # ADDED TO SPRUCE - "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToENuNu_FakeElectron": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_FakeElectron", # REMOVED FROM SPRUCE + "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_BuToD0TauNu_D0ToKPiPiPi_TauToENuNu_FakeElectron": "SpruceSLB_BuToD0TauNu_D0ToK3Pi_FakeElectron", # REMOVED FROM SPRUCE "SpruceSLB_BsToDsTauNu_DsToKKPi_TauToMuNuNu_FakeMuon": "SpruceSLB_BsToDsTauNu_DsToKKPi_FakeMuon", - "SpruceSLB_BsToDsTauNu_DsToKKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_BsToDsTauNu_DsToKKPi_FakeMuon", # ADDED TO SPRUCE - "SpruceSLB_LbToLcMuNu_LcToPKPi_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToPKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_BsToDsTauNu_DsToKKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_BsToDsTauNu_DsToKKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcMuNu_LcToPKPi_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToPKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_LbToLcTauNu_LcToPKPi_TauToMuNuNu_FakeMuon": "SpruceSLB_LbToLcTauNu_LcToPKPi_FakeMuon", - "SpruceSLB_LbToLcTauNu_LcToPKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToPKPi_FakeMuon", # ADDED TO SPRUCE - "SpruceSLB_BcToJpsiMuNu_JpsiToMuMu_MuonDecayInFlight": "SpruceSLB_BcToJpsiMuNu_JpsiToMuMu_FakeMuon", # ADDED TO SPRUCE - "SpruceSLB_BuToD0MuNu_D0ToKPi_MuonDecayInFlight": "SpruceSLB_BuToD0MuNu_D0ToKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcTauNu_LcToPKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToPKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_BcToJpsiMuNu_JpsiToMuMu_MuonDecayInFlight": "SpruceSLB_BcToJpsiMuNu_JpsiToMuMu_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_BuToD0MuNu_D0ToKPi_MuonDecayInFlight": "SpruceSLB_BuToD0MuNu_D0ToKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_BuToD0MuNu_D0ToKPiPiPi": "SpruceSLB_BuToD0MuNu_D0ToK3Pi", "SpruceSLB_BuToD0MuNu_D0ToKPiPiPi_FakeMuon": "SpruceSLB_BuToD0MuNu_D0ToK3Pi_FakeMuon", - "SpruceSLB_BuToD0MuNu_D0ToKPiPiPi_MuonDecayInFlight": "SpruceSLB_BuToD0MuNu_D0ToK3Pi_FakeMuon", # ADDED TO SPRUCE - "SpruceSLB_B0ToDpMuNu_DpToKPiPi_MuonDecayInFlight": "SpruceSLB_B0ToDpMuNu_DpToKPiPi_FakeMuon", # ADDED TO SPRUCE - "SpruceSLB_B0ToDpMuNu_DpToKKPi_MuonDecayInFlight": "SpruceSLB_B0ToDpMuNu_DpToKKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_BuToD0MuNu_D0ToKPiPiPi_MuonDecayInFlight": "SpruceSLB_BuToD0MuNu_D0ToK3Pi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_B0ToDpMuNu_DpToKPiPi_MuonDecayInFlight": "SpruceSLB_B0ToDpMuNu_DpToKPiPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_B0ToDpMuNu_DpToKKPi_MuonDecayInFlight": "SpruceSLB_B0ToDpMuNu_DpToKKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_BsToDsstMuNu_DsstToDsGamma_DsToKKPi_GammaToEE": "SpruceSLB_BsToDsstMuNu_DsstToDsGamma_DsToKKPi_Gamma2EE", - "SpruceSLB_BsToDsMuNu_DsToKKPi_MuonDecayInFlight": "SpruceSLB_BsToDsMuNu_DsToKKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_BsToDsMuNu_DsToKKPi_MuonDecayInFlight": "SpruceSLB_BsToDsMuNu_DsToKKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_Xib0ToXicplusMuNu_XicplusToPKPi": "SpruceSLB_Xib0ToXicplusMuNu_XicplusTopKPi", "SpruceSLB_Xib0ToXicplusTauNu_XicplusToPKPi_TauToMuNuNu": "SpruceSLB_Xib0ToXicplusTauNu_XicplusTopKPi_TauToMuNuNu", "SpruceSLB_Xib0ToXicplusMuNu_XicplusToPKPi_FakeMuon": "SpruceSLB_Xib0ToXicplusMuNu_XicplusTopKPi_FakeMuon", - "SpruceSLB_Xib0ToXicplusMuNu_XicplusToPKPi_MuonDecayInFlight": "SpruceSLB_Xib0ToXicplusMuNu_XicplusTopKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_Xib0ToXicplusMuNu_XicplusToPKPi_MuonDecayInFlight": "SpruceSLB_Xib0ToXicplusMuNu_XicplusTopKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_Xib0ToXicplusTauNu_XicplusToPKPi_TauToMuNuNu_FakeMuon": "SpruceSLB_Xib0ToXicplusTauNu_XicplusTopKPi_FakeMuon", - "SpruceSLB_Xib0ToXicplusTauNu_XicplusToPKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_Xib0ToXicplusTauNu_XicplusTopKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_Xib0ToXicplusTauNu_XicplusToPKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_Xib0ToXicplusTauNu_XicplusTopKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_XibminusToXic0MuNu_Xic0ToPKKPi": "SpruceSLB_XibminusToXic0MuNu_Xic0TopKKPi", "SpruceSLB_XibminusToXic0TauNu_Xic0ToPKKPi_TauToMuNuNu": "SpruceSLB_XibminusToXic0TauNu_Xic0TopKKPi_TauToMuNuNu", "SpruceSLB_XibminusToXic0MuNu_Xic0ToPKKPi_FakeMuon": "SpruceSLB_XibminusToXic0MuNu:_Xic0TopKKPi_FakeMuon", - "SpruceSLB_XibminusToXic0MuNu_Xic0ToPKKPi_MuonDecayInFlight": "SpruceSLB_XibminusToXic0MuNu_Xic0TopKKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_XibminusToXic0MuNu_Xic0ToPKKPi_MuonDecayInFlight": "SpruceSLB_XibminusToXic0MuNu_Xic0TopKKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_XibminusToXic0TauNu_Xic0ToPKKPi_TauToMuNuNu_FakeMuon": "SpruceSLB_XibminusToXic0TauNu_Xic0TopKKPi_FakeMuon", - "SpruceSLB_XibminusToXic0TauNu_Xic0ToPKKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_XibminusToXic0TauNu_Xic0TopKKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_XibminusToXic0TauNu_Xic0ToPKKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_XibminusToXic0TauNu_Xic0TopKKPi_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_LbToLcTauNu_LcToPKPi_TauToPiPiPiNu": "SpruceSLB_LbToLcTauNu_LcTopKPi_TauToPiPiPiNu", "SpruceSLB_B0ToPiMuNu": "SpruceSLB_B2XuMuNuB02Pi", "SpruceSLB_B0ToPiMuNu_FakeMuon": "SpruceSLB_B2XuMuNuB02pi_NoPIDMu", - "SpruceSLB_B0ToPiMuNu_MuonDecayInFlight": "SpruceSLB_B2XuMuNuB02pi_NoPIDMu", # ADDED TO SPRUCE + "SpruceSLB_B0ToPiMuNu_MuonDecayInFlight": "SpruceSLB_B2XuMuNuB02pi_NoPIDMu", # ADDED TO SPRUCE "SpruceSLB_B0ToPiMuNu_NoPIDPi": "SpruceSLB_B2XuMuNuB02pi_NoPIDPi", "SpruceSLB_LbToPMuNu_FakeProton": "SpruceSLB_LbToPMuNu_FakeP", - "SpruceSLB_LbToPMuNu_MuonDecayInFlight": "SpruceSLB_LbToPMuNu_FakeP", # ADDED TO SPRUCE + "SpruceSLB_LbToPMuNu_MuonDecayInFlight": "SpruceSLB_LbToPMuNu_FakeP", # ADDED TO SPRUCE "SpruceSLB_LbToPMuNu_WS_FakeProton": "SpruceSLB_LbToPMuNu_WS_FakeP", - "SpruceSLB_LbToPMuNu_WS_MuonDecayInFlight": "SpruceSLB_LbToPMuNu_WS_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToPMuNu_WS_MuonDecayInFlight": "SpruceSLB_LbToPMuNu_WS_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_BsToKMuNu": "SpruceSLB_B2XuMuNuBs2K", "SpruceSLB_BsToKMuNu_FakeMuon": "SpruceSLB_B2XuMuNuBs2K_NoPIDMu", - "SpruceSLB_BsToKMuNu_MuonDecayInFlight": "SpruceSLB_B2XuMuNuBs2K_NoPIDMu", # ADDED TO SPRUCE + "SpruceSLB_BsToKMuNu_MuonDecayInFlight": "SpruceSLB_B2XuMuNuBs2K_NoPIDMu", # ADDED TO SPRUCE "SpruceSLB_BsToKMuNu_FakeKaon": "SpruceSLB_B2XuMuNuBs2K_NoPIDK", "SpruceSLB_BsToKTauNu_TauToMuNuNu": "SpruceSLB_B2XuTauNu_MuonicBs2K", "SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeMuon": "SpruceSLB_B2XuTauNu_MuonicBs2K_NoPIDMu", - "SpruceSLB_BsToKTauNu_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_B2XuTauNu_MuonicBs2K_NoPIDMu", # ADDED TO SPRUCE + "SpruceSLB_BsToKTauNu_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_B2XuTauNu_MuonicBs2K_NoPIDMu", # ADDED TO SPRUCE "SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeKaon": "SpruceSLB_B2XuTauNu_MuonicBs2K_NoPIDK", "SpruceSLB_BuToPPbarMuNu": "SpruceSLB_B2PPbarMuNu", "SpruceSLB_BuToPPbarMuNu_SS": "SpruceSLB_B2PPbarMuNu_SS", "SpruceSLB_BuToPPbarMuNu_FakeProton": "SpruceSLB_B2PPbarMuNu_FakeP", "SpruceSLB_BuToPPbarMuNu_FakeMuon": "SpruceSLB_B2PPbarMuNu_FakeMu", - "SpruceSLB_BuToPPbarMuNu_MuonDecayInFlight": "SpruceSLB_B2PPbarMuNu_FakeP", # ADDED TO SPRUCE + "SpruceSLB_BuToPPbarMuNu_MuonDecayInFlight": "SpruceSLB_B2PPbarMuNu_FakeP", # ADDED TO SPRUCE "SpruceSLB_BuToPiPiMuNu": "SpruceSLB_B2PiPiMuNu", "SpruceSLB_BuToPiPiMuNu_SS": "SpruceSLB_B2PiPiMuNu_SS", "SpruceSLB_BuToPiPiMuNu_FakeMuon": "SpruceSLB_B2PiPiMuNu_FakeMu", - "SpruceSLB_BuToPiPiMuNu_MuonDecayInFlight": "SpruceSLB_B2PiPiMuNu_FakeMu", # ADDED TO SPRUCE + "SpruceSLB_BuToPiPiMuNu_MuonDecayInFlight": "SpruceSLB_B2PiPiMuNu_FakeMu", # ADDED TO SPRUCE "SpruceSLB_BuToPiPiMuNu_FakePion": "SpruceSLB_B2PiPiMuNu_FakePi", "SpruceSLB_BuToKKMuNu": "SpruceSLB_B2KKMuNu", "SpruceSLB_BuToKKMuNu_SS": "SpruceSLB_B2KKMuNu_SS", "SpruceSLB_BuToKKMuNu_FakeMuon": "SpruceSLB_B2KKMuNu_FakeMu", - "SpruceSLB_BuToKKMuNu_MuonDecayInFlight": "SpruceSLB_B2KKMuNu_FakeMu", # ADDED TO SPRUCE + "SpruceSLB_BuToKKMuNu_MuonDecayInFlight": "SpruceSLB_B2KKMuNu_FakeMu", # ADDED TO SPRUCE "SpruceSLB_BuToMuMuMuNu": "SpruceSLB_B2MuMuMuNu", "SpruceSLB_BuToEMuMuNu": "SpruceSLB_B2EMuMuNu", "SpruceSLB_BuToMuEENu": "SpruceSLB_B2MuEENu", @@ -101,28 +101,28 @@ line_name_mapping = { "SpruceSLB_BuToEEENu_SS": "SpruceSLB_B2EEENu_SS", "SpruceSLB_BuToTauMuMuNu_TauToPiPiPiNu_SS": "SpruceSLB_B2TauMuMuNu_3Pi_SS", "SpruceSLB_BuToTauEENu_TauToPiPiPiNu_SS": "SpruceSLB_B2TauEENu_3Pi_SS", - "SpruceSLB_OmegabToOmegacMuNu_OmegacToPKKPi_MuonDecayInFlight": "SpruceSLB_OmegabToOmegacMuNu_OmegacTopKKPi_FakeMuon", # ADDED TO SPRUCE - "SpruceSLB_OmegabToOmegacTauNu_OmegacToPKKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_OmegabToOmegacTauNu_OmegacTopKKPi_TauToMuNuNu_FakeMuon", # ADDED TO SPRUCE - "SpruceSLB_LbToLcMuNu_LcToPKSLL_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToPKSLL_FakeMuon", # ADDED TO SPRUCE - "SpruceSLB_LbToLcMuNu_LcToPKSDD_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToPKSDD_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_OmegabToOmegacMuNu_OmegacToPKKPi_MuonDecayInFlight": "SpruceSLB_OmegabToOmegacMuNu_OmegacTopKKPi_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_OmegabToOmegacTauNu_OmegacToPKKPi_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_OmegabToOmegacTauNu_OmegacTopKKPi_TauToMuNuNu_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcMuNu_LcToPKSLL_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToPKSLL_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcMuNu_LcToPKSDD_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToPKSDD_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_LbToLcTauNu_LcToPKSLL_TauToMuNuNu": "SpruceSLB_LbToLcTauNu_LcToPKSLL_TautoMuNuNu", "SpruceSLB_LbToLcTauNu_LcToPKSDD_TauToMuNuNu": "SpruceSLB_LbToLcTauNu_LcToPKSDD_TautoMuNuNu", "SpruceSLB_LbToLcTauNu_LcToPKSLL_TauToMuNuNu_FakeMuon": "SpruceSLB_LbToLcTauNu_LcToPKSLL_FakeMuon", - "SpruceSLB_LbToLcTauNu_LcToPKSLL_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToPKSLL_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcTauNu_LcToPKSLL_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToPKSLL_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_LbToLcTauNu_LcToPKSDD_TauToMuNuNu_FakeMuon": "SpruceSLB_LbToLcTauNu_LcToPKSDD_FakeMuon", - "SpruceSLB_LbToLcTauNu_LcToPKSDD_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToPKSDD_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcTauNu_LcToPKSDD_TauToMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToPKSDD_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_LbToLcTauNu_LcToPKSLL_TauToENuNu": "SpruceSLB_LbToLcTauNu_LcToPKSLL_TautoENuNu", "SpruceSLB_LbToLcTauNu_LcToPKSDD_TauToENuNu": "SpruceSLB_LbToLcTauNu_LcToPKSDD_TautoENuNu", "SpruceSLB_LbToLcTauNu_LcToPKSLL_TauToENuNu_FakeElectron": "SpruceSLB_LbToLcTauNu_LcToPKSLL_FakeElectron", "SpruceSLB_LbToLcTauNu_LcToPKSDD_TauToENuNu_FakeElectron": "SpruceSLB_LbToLcTauNu_LcToPKSDD_FakeElectron", - "SpruceSLB_LbToLcMuNu_LcToLambdaPiLL_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToLambdaPiLL_FakeMuon", # ADDED TO SPRUCE - "SpruceSLB_LbToLcMuNu_LcToLambdaPiDD_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToLambdaPiDD_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcMuNu_LcToLambdaPiLL_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToLambdaPiLL_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcMuNu_LcToLambdaPiDD_MuonDecayInFlight": "SpruceSLB_LbToLcMuNu_LcToLambdaPiDD_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TauToMuNuNu": "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TautoMuNuNu", "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TauToMuNuNu": "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TautoMuNuNu", "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TauToMuNuNu_FakeMuon": "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_FakeMuon", "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TauToMuNuNu_FakeMuon": "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_FakeMuon", - "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TautoMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_FakeMuon", # ADDED TO SPRUCE - "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TautoMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TautoMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_FakeMuon", # ADDED TO SPRUCE + "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TautoMuNuNu_MuonDecayInFlight": "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_FakeMuon", # ADDED TO SPRUCE "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TauToENuNu": "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TautoENuNu", "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TauToENuNu": "SpruceSLB_LbToLcTauNu_LcToLambdaPiDD_TautoENuNu", "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_TauToENuNu_FakeElectron": "SpruceSLB_LbToLcTauNu_LcToLambdaPiLL_FakeElectron", diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index 97888ab604d..ab02094f5b8 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -296,10 +296,11 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( @register_line_builder(spruce_lines) def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( - name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", - prescale=0.5, - persistreco=False, - legacy_name=False): + name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", + prescale=0.5, + persistreco=False, + legacy_name=False, +): """ SL Spruce line for the decay Bc -> J/psi(1S)(-> mu mu) tau(-> mu nu nu) nu, with a fake muon. """ @@ -485,9 +486,9 @@ def spruce_b0todptaunu_dptokpipi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -856,9 +857,9 @@ def spruce_bstodstaunu_dstokkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2884,7 +2885,10 @@ def spruce_lbtopmunu_line( def spruce_lbtopmunu_fakep_line( - name="SpruceSLB_LbToPMuNu_FakeProton", prescale=0.5, persistreco=False, legacy_name=False + name="SpruceSLB_LbToPMuNu_FakeProton", + prescale=0.5, + persistreco=False, + legacy_name=False, ): """ SL Spruce line for the decay Lb0 -> p mu nu, with a fake proton. @@ -2969,10 +2973,8 @@ def spruce_lbtopmunu_muondecayinflight_line( """ line_alg = make_lbtopmunu_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3126,10 +3128,8 @@ def spruce_lbtopmunu_ss_muondecayinflight_line( """ line_alg = make_lbtopmunu_ss_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3223,9 +3223,9 @@ def spruce_bstokmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4073,9 +4073,9 @@ def spruce_b2ppbarmunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4476,9 +4476,9 @@ def spruce_b2kkmunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5424,9 +5424,9 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5867,9 +5867,9 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5956,9 +5956,9 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6485,9 +6485,9 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -7991,15 +7991,15 @@ def spruce_bstoktaunu_muonic_ss_line( """ SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu) same-sign. """ - line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautopipipinu( - process=PROCESS) + line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B_s0", anti_parent="B_s~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -8040,8 +8040,12 @@ def spruce_bstoktaunu_muonic_fakemuon_line( """ line_alg = make_bstoktaunu_muonic_fakemu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8051,9 +8055,9 @@ def spruce_bstoktaunu_muonic_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8067,6 +8071,7 @@ def spruce_bstoktaunu_muonic_fakemuon_line( monitoring_variables=_MONITORING_VARIABLES, ) + @register_line_builder(spruce_lines) def spruce_bstoktaunu_muonic_muondecayinflight_line( name="SpruceSLB_BsToKTauNu_TauToMuNuNu_MuonDecayInFlight", @@ -8079,8 +8084,12 @@ def spruce_bstoktaunu_muonic_muondecayinflight_line( """ line_alg = make_bstoktaunu_muonic_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8090,9 +8099,9 @@ def spruce_bstoktaunu_muonic_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8119,8 +8128,12 @@ def spruce_bstoktaunu_muonic_fakemuon_ss_line( """ line_alg = make_bstoktaunu_muonic_ss_fakemu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8130,9 +8143,9 @@ def spruce_bstoktaunu_muonic_fakemuon_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8159,8 +8172,12 @@ def spruce_bstoktaunu_muonic_muondecayinflight_ss_line( """ line_alg = make_bstoktaunu_muonic_ss_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8170,9 +8187,9 @@ def spruce_bstoktaunu_muonic_muondecayinflight_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8186,6 +8203,7 @@ def spruce_bstoktaunu_muonic_muondecayinflight_ss_line( monitoring_variables=_MONITORING_VARIABLES, ) + @register_line_builder(spruce_lines) def spruce_bstoktaunu_muonic_fakek_line( name="SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeKaon", @@ -8198,8 +8216,12 @@ def spruce_bstoktaunu_muonic_fakek_line( """ line_alg = make_bstoktaunu_muonic_fakek(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8209,9 +8231,9 @@ def spruce_bstoktaunu_muonic_fakek_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8238,8 +8260,12 @@ def spruce_bstoktaunu_muonic_fakek_ss_line( """ line_alg = make_bstoktaunu_muonic_ss_fakek(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8249,9 +8275,9 @@ def spruce_bstoktaunu_muonic_fakek_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8278,8 +8304,12 @@ def spruce_bstoktaunu_muonic_fakek_fakemuon_line( """ line_alg = make_bstoktaunu_muonic_fakek_fakemu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8289,9 +8319,9 @@ def spruce_bstoktaunu_muonic_fakek_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8305,6 +8335,7 @@ def spruce_bstoktaunu_muonic_fakek_fakemuon_line( monitoring_variables=_MONITORING_VARIABLES, ) + @register_line_builder(spruce_lines) def spruce_bstoktaunu_muonic_fakek_muondecayinflight_line( name="SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeKaon_MuonDecayInFlight", @@ -8315,10 +8346,16 @@ def spruce_bstoktaunu_muonic_fakek_muondecayinflight_line( """ SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon and a muon decay in flight. """ - line_alg = make_bstoktaunu_muonic_fakek_fakemu(process=PROCESS, is_decayinflight=True) + line_alg = make_bstoktaunu_muonic_fakek_fakemu( + process=PROCESS, is_decayinflight=True + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8328,9 +8365,9 @@ def spruce_bstoktaunu_muonic_fakek_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8344,6 +8381,7 @@ def spruce_bstoktaunu_muonic_fakek_muondecayinflight_line( monitoring_variables=_MONITORING_VARIABLES, ) + @register_line_builder(spruce_lines) def spruce_bstoktaunu_electronic_line( name="SpruceSLB_BsToKTauNu_TauToENuNu", prescale=1, persistreco=False @@ -8353,8 +8391,12 @@ def spruce_bstoktaunu_electronic_line( """ line_alg = make_bstoktaunu_electronic(process=PROCESS) extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8364,9 +8406,9 @@ def spruce_bstoktaunu_electronic_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8392,8 +8434,12 @@ def spruce_bstoktaunu_electronic_ss_line( """ line_alg = make_bstoktaunu_electronic_ss(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8403,9 +8449,9 @@ def spruce_bstoktaunu_electronic_ss_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8431,8 +8477,12 @@ def spruce_bstoktaunu_electronic_fakeelectron_line( """ line_alg = make_bstoktaunu_electronic_fakeelectron(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8442,9 +8492,9 @@ def spruce_bstoktaunu_electronic_fakeelectron_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8470,8 +8520,12 @@ def spruce_bstoktaunu_electronic_fakeelectron_ss_line( """ line_alg = make_bstoktaunu_electronic_ss_fakeelectron(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8481,9 +8535,9 @@ def spruce_bstoktaunu_electronic_fakeelectron_ss_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8507,8 +8561,12 @@ def spruce_bstoktaunu_electronic_fakek_line( """ line_alg = make_bstoktaunu_electronic_fakek(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8518,9 +8576,9 @@ def spruce_bstoktaunu_electronic_fakek_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8544,8 +8602,12 @@ def spruce_bstoktaunu_electronic_fakek_ss_line( """ line_alg = make_bstoktaunu_electronic_ss_fakek(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8555,9 +8617,9 @@ def spruce_bstoktaunu_electronic_fakek_ss_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8583,8 +8645,12 @@ def spruce_bstoktaunu_electronic_fakek_fakeelectron_line( """ line_alg = make_bstoktaunu_electronic_fakek_fakeelectron(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8594,9 +8660,9 @@ def spruce_bstoktaunu_electronic_fakek_fakeelectron_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, -- GitLab From 132470da09418073287fdb1183a17c7d3d667d84 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 14 Apr 2025 13:00:55 +0200 Subject: [PATCH 20/22] Fix rebase --- .../lines/semileptonic/isolationMVA.py | 2 +- .../lines/semileptonic/spruce_semileptonic.py | 338 ++++++++---------- 2 files changed, 145 insertions(+), 195 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py index 2ee8f9ff6f1..f3ca01684b2 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/isolationMVA.py @@ -313,7 +313,7 @@ def prepare_MVA( ) -> ( ParticleToParticleWeightedRelTableAlg, ParticleToParticleWeightedRelTableAlg, - SectionFromWeightedRelationTable, + SelectionFromWeightedRelationTable, [monitor], ): new_parent_name = "B*+" diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index ab02094f5b8..094648fdf77 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -296,11 +296,10 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( @register_line_builder(spruce_lines) def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( - name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", - prescale=0.5, - persistreco=False, - legacy_name=False, -): + name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", + prescale=0.5, + persistreco=False, + legacy_name=False): """ SL Spruce line for the decay Bc -> J/psi(1S)(-> mu mu) tau(-> mu nu nu) nu, with a fake muon. """ @@ -486,9 +485,9 @@ def spruce_b0todptaunu_dptokpipi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -857,9 +856,9 @@ def spruce_bstodstaunu_dstokkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -2190,7 +2189,9 @@ def spruce_xib0toxicplustaunu_xicplustopkpi_tautomununu_muondecayinflight_line( line_alg = make_xib0toxicplustaunu_xicplustopkpi_tautomununu_fakelepton( process=PROCESS, is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2441,7 +2442,10 @@ def spruce_xibminustoxic0taunu_xic0topkkpi_tautomununu_muondecayinflight_line( line_alg = make_xibminustoxic0taunu_xic0topkkpi_tautomununu_fakelepton( process=PROCESS, is_decayinflight=True ) - extra_track_TES, iso_monitoring = prepare_MVA(name, line_alg) + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) + extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -2885,10 +2889,7 @@ def spruce_lbtopmunu_line( def spruce_lbtopmunu_fakep_line( - name="SpruceSLB_LbToPMuNu_FakeProton", - prescale=0.5, - persistreco=False, - legacy_name=False, + name="SpruceSLB_LbToPMuNu_FakeProton", prescale=0.5, persistreco=False, legacy_name=False ): """ SL Spruce line for the decay Lb0 -> p mu nu, with a fake proton. @@ -2973,8 +2974,10 @@ def spruce_lbtopmunu_muondecayinflight_line( """ line_alg = make_lbtopmunu_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3128,8 +3131,10 @@ def spruce_lbtopmunu_ss_muondecayinflight_line( """ line_alg = make_lbtopmunu_ss_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False - ) + name, + line_alg, + persist_b_iso_relations=False, + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3223,9 +3228,9 @@ def spruce_bstokmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -3385,8 +3390,13 @@ def spruce_bstokmunu_decayinflight_ss_line( SL Spruce line for the decay Bs0 -> K mu nu, with a muon consistent with decay in flight (same-sign). """ line_alg = make_bstokmunu_ss_fakemu(process=PROCESS, is_decayinflight=True) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -3556,8 +3566,13 @@ def spruce_bstokmunu_fakek_muondecayinflight_line( SL Spruce line for the decay Bs0 -> K mu, with a fake kaon and a fake muon. """ line_alg = make_bstokmunu_fakek_fakemu(process=PROCESS, is_decayinflight=True) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -4073,9 +4088,9 @@ def spruce_b2ppbarmunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -4476,9 +4491,9 @@ def spruce_b2kkmunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -5424,9 +5439,9 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -5867,9 +5882,9 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( persistreco=persistreco, @@ -5956,9 +5971,9 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( persistreco=persistreco, @@ -6485,9 +6500,9 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( persistreco=persistreco, @@ -7955,8 +7970,9 @@ def spruce_bstoktaunu_muonic_line( SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu). """ line_alg = make_bstoktaunu_muonic(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -7991,15 +8007,15 @@ def spruce_bstoktaunu_muonic_ss_line( """ SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu) same-sign. """ - line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautopipipinu(process=PROCESS) + line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautopipipinu( + process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B_s0", anti_parent="B_s~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False, - ) + persist_bst_iso_relations=False) extra_neutrals = get_neutral_tracks() @@ -8040,12 +8056,8 @@ def spruce_bstoktaunu_muonic_fakemuon_line( """ line_alg = make_bstoktaunu_muonic_fakemu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8055,9 +8067,9 @@ def spruce_bstoktaunu_muonic_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8071,7 +8083,6 @@ def spruce_bstoktaunu_muonic_fakemuon_line( monitoring_variables=_MONITORING_VARIABLES, ) - @register_line_builder(spruce_lines) def spruce_bstoktaunu_muonic_muondecayinflight_line( name="SpruceSLB_BsToKTauNu_TauToMuNuNu_MuonDecayInFlight", @@ -8084,12 +8095,8 @@ def spruce_bstoktaunu_muonic_muondecayinflight_line( """ line_alg = make_bstoktaunu_muonic_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8099,9 +8106,9 @@ def spruce_bstoktaunu_muonic_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8128,12 +8135,8 @@ def spruce_bstoktaunu_muonic_fakemuon_ss_line( """ line_alg = make_bstoktaunu_muonic_ss_fakemu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8143,9 +8146,9 @@ def spruce_bstoktaunu_muonic_fakemuon_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8172,12 +8175,8 @@ def spruce_bstoktaunu_muonic_muondecayinflight_ss_line( """ line_alg = make_bstoktaunu_muonic_ss_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8187,9 +8186,9 @@ def spruce_bstoktaunu_muonic_muondecayinflight_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8203,7 +8202,6 @@ def spruce_bstoktaunu_muonic_muondecayinflight_ss_line( monitoring_variables=_MONITORING_VARIABLES, ) - @register_line_builder(spruce_lines) def spruce_bstoktaunu_muonic_fakek_line( name="SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeKaon", @@ -8216,12 +8214,8 @@ def spruce_bstoktaunu_muonic_fakek_line( """ line_alg = make_bstoktaunu_muonic_fakek(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8231,9 +8225,9 @@ def spruce_bstoktaunu_muonic_fakek_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8260,12 +8254,8 @@ def spruce_bstoktaunu_muonic_fakek_ss_line( """ line_alg = make_bstoktaunu_muonic_ss_fakek(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8275,9 +8265,9 @@ def spruce_bstoktaunu_muonic_fakek_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8304,12 +8294,8 @@ def spruce_bstoktaunu_muonic_fakek_fakemuon_line( """ line_alg = make_bstoktaunu_muonic_fakek_fakemu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8319,9 +8305,9 @@ def spruce_bstoktaunu_muonic_fakek_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8335,7 +8321,6 @@ def spruce_bstoktaunu_muonic_fakek_fakemuon_line( monitoring_variables=_MONITORING_VARIABLES, ) - @register_line_builder(spruce_lines) def spruce_bstoktaunu_muonic_fakek_muondecayinflight_line( name="SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeKaon_MuonDecayInFlight", @@ -8346,16 +8331,10 @@ def spruce_bstoktaunu_muonic_fakek_muondecayinflight_line( """ SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon and a muon decay in flight. """ - line_alg = make_bstoktaunu_muonic_fakek_fakemu( - process=PROCESS, is_decayinflight=True - ) + line_alg = make_bstoktaunu_muonic_fakek_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8365,9 +8344,9 @@ def spruce_bstoktaunu_muonic_fakek_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8381,7 +8360,6 @@ def spruce_bstoktaunu_muonic_fakek_muondecayinflight_line( monitoring_variables=_MONITORING_VARIABLES, ) - @register_line_builder(spruce_lines) def spruce_bstoktaunu_electronic_line( name="SpruceSLB_BsToKTauNu_TauToENuNu", prescale=1, persistreco=False @@ -8390,13 +8368,9 @@ def spruce_bstoktaunu_electronic_line( SL Spruce line for the decay Bs0 -> K tau nu (tau -> e nu nu). """ line_alg = make_bstoktaunu_electronic(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8406,9 +8380,9 @@ def spruce_bstoktaunu_electronic_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8434,12 +8408,8 @@ def spruce_bstoktaunu_electronic_ss_line( """ line_alg = make_bstoktaunu_electronic_ss(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8449,9 +8419,9 @@ def spruce_bstoktaunu_electronic_ss_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8477,12 +8447,8 @@ def spruce_bstoktaunu_electronic_fakeelectron_line( """ line_alg = make_bstoktaunu_electronic_fakeelectron(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8492,9 +8458,9 @@ def spruce_bstoktaunu_electronic_fakeelectron_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8520,12 +8486,8 @@ def spruce_bstoktaunu_electronic_fakeelectron_ss_line( """ line_alg = make_bstoktaunu_electronic_ss_fakeelectron(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8535,9 +8497,9 @@ def spruce_bstoktaunu_electronic_fakeelectron_ss_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8561,12 +8523,8 @@ def spruce_bstoktaunu_electronic_fakek_line( """ line_alg = make_bstoktaunu_electronic_fakek(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8576,9 +8534,9 @@ def spruce_bstoktaunu_electronic_fakek_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8602,12 +8560,8 @@ def spruce_bstoktaunu_electronic_fakek_ss_line( """ line_alg = make_bstoktaunu_electronic_ss_fakek(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8617,9 +8571,9 @@ def spruce_bstoktaunu_electronic_fakek_ss_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, @@ -8645,12 +8599,8 @@ def spruce_bstoktaunu_electronic_fakek_fakeelectron_line( """ line_alg = make_bstoktaunu_electronic_fakek_fakeelectron(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - parent="B_s0", - anti_parent="B_s~0", - persist_b_iso_relations=False, - persist_bst_iso_relations=False, + name, line_alg, parent="B_s0", anti_parent="B_s~0", + persist_b_iso_relations=False, persist_bst_iso_relations=False ) extra_neutrals = get_neutral_tracks() @@ -8660,9 +8610,9 @@ def spruce_bstoktaunu_electronic_fakek_fakeelectron_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs( - name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals - ) + extra_outputs_iso = set_extra_outputs(name, b_iso_relations, + bst_iso_relations, extra_track_TES, + extra_neutrals) return SpruceLine( name=name, -- GitLab From 597a1008b42fc07d776c892caa558a69d1d4376a Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu Date: Mon, 14 Apr 2025 13:05:16 +0200 Subject: [PATCH 21/22] Add missing relation table --- .../lines/semileptonic/spruce_semileptonic.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index 094648fdf77..4608fcd63d7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -3855,8 +3855,13 @@ def spruce_bstokenu_fakek_fakeelectron_line( SL Spruce line for the decay Bs0 -> K e, with a fake kaon and a fake electron. """ line_alg = make_bstokenu_fakek_fakeelectron(process=PROCESS) - extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0" + b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -7982,6 +7987,10 @@ def spruce_bstoktaunu_muonic_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) + return SpruceLine( name=name, hlt2_filter_code=[ -- GitLab From 0bfe526331550a36259daa6d0031d1b15a19a647 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Mon, 14 Apr 2025 11:05:53 +0000 Subject: [PATCH 22/22] pre-commit fixes patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/54620545 --- .../lines/semileptonic/spruce_semileptonic.py | 314 +++++++++++------- 1 file changed, 192 insertions(+), 122 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py index 4608fcd63d7..ae011052018 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/spruce_semileptonic.py @@ -296,10 +296,11 @@ def spruce_bctojpsitaunu_jpsitomumu_tautomununu_line( @register_line_builder(spruce_lines) def spruce_bctojpsitaunu_jpsitomumu_fakemuon_line( - name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", - prescale=0.5, - persistreco=False, - legacy_name=False): + name="SpruceSLB_BcToJpsiTauNu_JpsiToMuMu_TauToMuNuNu_FakeMuon", + prescale=0.5, + persistreco=False, + legacy_name=False, +): """ SL Spruce line for the decay Bc -> J/psi(1S)(-> mu mu) tau(-> mu nu nu) nu, with a fake muon. """ @@ -485,9 +486,9 @@ def spruce_b0todptaunu_dptokpipi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -856,9 +857,9 @@ def spruce_bstodstaunu_dstokkpi_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -2889,7 +2890,10 @@ def spruce_lbtopmunu_line( def spruce_lbtopmunu_fakep_line( - name="SpruceSLB_LbToPMuNu_FakeProton", prescale=0.5, persistreco=False, legacy_name=False + name="SpruceSLB_LbToPMuNu_FakeProton", + prescale=0.5, + persistreco=False, + legacy_name=False, ): """ SL Spruce line for the decay Lb0 -> p mu nu, with a fake proton. @@ -2974,10 +2978,8 @@ def spruce_lbtopmunu_muondecayinflight_line( """ line_alg = make_lbtopmunu_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3131,10 +3133,8 @@ def spruce_lbtopmunu_ss_muondecayinflight_line( """ line_alg = make_lbtopmunu_ss_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, - line_alg, - persist_b_iso_relations=False, - persist_bst_iso_relations=False) + name, line_alg, persist_b_iso_relations=False, persist_bst_iso_relations=False + ) extra_neutrals = get_neutral_tracks() line_mon = generate_default_monitoring_vars( @@ -3228,9 +3228,9 @@ def spruce_bstokmunu_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -3391,7 +3391,7 @@ def spruce_bstokmunu_decayinflight_ss_line( """ line_alg = make_bstokmunu_ss_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, + name, line_alg, parent="B_s0", anti_parent="B_s~0", @@ -4093,9 +4093,9 @@ def spruce_b2ppbarmunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -4496,9 +4496,9 @@ def spruce_b2kkmunu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5444,9 +5444,9 @@ def spruce_omegabtoomegactaunu_omegactopkkpi_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -5887,9 +5887,9 @@ def spruce_lbtolctaunu_lctopksLL_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -5976,9 +5976,9 @@ def spruce_lbtolctaunu_lctopksDD_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -6505,9 +6505,9 @@ def spruce_lbtolctaunu_lctolambdapiDD_tautomununu_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( persistreco=persistreco, @@ -7976,8 +7976,12 @@ def spruce_bstoktaunu_muonic_line( """ line_alg = make_bstoktaunu_muonic(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8016,15 +8020,15 @@ def spruce_bstoktaunu_muonic_ss_line( """ SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu) same-sign. """ - line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautopipipinu( - process=PROCESS) + line_alg = make_omegabtoomegactaunu_omegactopkkpi_tautopipipinu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( name, line_alg, parent="B_s0", anti_parent="B_s~0", persist_b_iso_relations=False, - persist_bst_iso_relations=False) + persist_bst_iso_relations=False, + ) extra_neutrals = get_neutral_tracks() @@ -8065,8 +8069,12 @@ def spruce_bstoktaunu_muonic_fakemuon_line( """ line_alg = make_bstoktaunu_muonic_fakemu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8076,9 +8084,9 @@ def spruce_bstoktaunu_muonic_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8092,6 +8100,7 @@ def spruce_bstoktaunu_muonic_fakemuon_line( monitoring_variables=_MONITORING_VARIABLES, ) + @register_line_builder(spruce_lines) def spruce_bstoktaunu_muonic_muondecayinflight_line( name="SpruceSLB_BsToKTauNu_TauToMuNuNu_MuonDecayInFlight", @@ -8104,8 +8113,12 @@ def spruce_bstoktaunu_muonic_muondecayinflight_line( """ line_alg = make_bstoktaunu_muonic_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8115,9 +8128,9 @@ def spruce_bstoktaunu_muonic_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8144,8 +8157,12 @@ def spruce_bstoktaunu_muonic_fakemuon_ss_line( """ line_alg = make_bstoktaunu_muonic_ss_fakemu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8155,9 +8172,9 @@ def spruce_bstoktaunu_muonic_fakemuon_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8184,8 +8201,12 @@ def spruce_bstoktaunu_muonic_muondecayinflight_ss_line( """ line_alg = make_bstoktaunu_muonic_ss_fakemu(process=PROCESS, is_decayinflight=True) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8195,9 +8216,9 @@ def spruce_bstoktaunu_muonic_muondecayinflight_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8211,6 +8232,7 @@ def spruce_bstoktaunu_muonic_muondecayinflight_ss_line( monitoring_variables=_MONITORING_VARIABLES, ) + @register_line_builder(spruce_lines) def spruce_bstoktaunu_muonic_fakek_line( name="SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeKaon", @@ -8223,8 +8245,12 @@ def spruce_bstoktaunu_muonic_fakek_line( """ line_alg = make_bstoktaunu_muonic_fakek(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8234,9 +8260,9 @@ def spruce_bstoktaunu_muonic_fakek_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8263,8 +8289,12 @@ def spruce_bstoktaunu_muonic_fakek_ss_line( """ line_alg = make_bstoktaunu_muonic_ss_fakek(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8274,9 +8304,9 @@ def spruce_bstoktaunu_muonic_fakek_ss_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8303,8 +8333,12 @@ def spruce_bstoktaunu_muonic_fakek_fakemuon_line( """ line_alg = make_bstoktaunu_muonic_fakek_fakemu(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8314,9 +8348,9 @@ def spruce_bstoktaunu_muonic_fakek_fakemuon_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8330,6 +8364,7 @@ def spruce_bstoktaunu_muonic_fakek_fakemuon_line( monitoring_variables=_MONITORING_VARIABLES, ) + @register_line_builder(spruce_lines) def spruce_bstoktaunu_muonic_fakek_muondecayinflight_line( name="SpruceSLB_BsToKTauNu_TauToMuNuNu_FakeKaon_MuonDecayInFlight", @@ -8340,10 +8375,16 @@ def spruce_bstoktaunu_muonic_fakek_muondecayinflight_line( """ SL Spruce line for the decay Bs0 -> K tau nu (tau -> mu nu nu), with a fake kaon and a muon decay in flight. """ - line_alg = make_bstoktaunu_muonic_fakek_fakemu(process=PROCESS, is_decayinflight=True) + line_alg = make_bstoktaunu_muonic_fakek_fakemu( + process=PROCESS, is_decayinflight=True + ) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8353,9 +8394,9 @@ def spruce_bstoktaunu_muonic_fakek_muondecayinflight_line( hlt2_name = map_line_name(name, legacy_name=legacy_name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8369,6 +8410,7 @@ def spruce_bstoktaunu_muonic_fakek_muondecayinflight_line( monitoring_variables=_MONITORING_VARIABLES, ) + @register_line_builder(spruce_lines) def spruce_bstoktaunu_electronic_line( name="SpruceSLB_BsToKTauNu_TauToENuNu", prescale=1, persistreco=False @@ -8378,8 +8420,12 @@ def spruce_bstoktaunu_electronic_line( """ line_alg = make_bstoktaunu_electronic(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8389,9 +8435,9 @@ def spruce_bstoktaunu_electronic_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8417,8 +8463,12 @@ def spruce_bstoktaunu_electronic_ss_line( """ line_alg = make_bstoktaunu_electronic_ss(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8428,9 +8478,9 @@ def spruce_bstoktaunu_electronic_ss_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8456,8 +8506,12 @@ def spruce_bstoktaunu_electronic_fakeelectron_line( """ line_alg = make_bstoktaunu_electronic_fakeelectron(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8467,9 +8521,9 @@ def spruce_bstoktaunu_electronic_fakeelectron_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8495,8 +8549,12 @@ def spruce_bstoktaunu_electronic_fakeelectron_ss_line( """ line_alg = make_bstoktaunu_electronic_ss_fakeelectron(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8506,9 +8564,9 @@ def spruce_bstoktaunu_electronic_fakeelectron_ss_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8532,8 +8590,12 @@ def spruce_bstoktaunu_electronic_fakek_line( """ line_alg = make_bstoktaunu_electronic_fakek(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8543,9 +8605,9 @@ def spruce_bstoktaunu_electronic_fakek_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8569,8 +8631,12 @@ def spruce_bstoktaunu_electronic_fakek_ss_line( """ line_alg = make_bstoktaunu_electronic_ss_fakek(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8580,9 +8646,9 @@ def spruce_bstoktaunu_electronic_fakek_ss_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, @@ -8608,8 +8674,12 @@ def spruce_bstoktaunu_electronic_fakek_fakeelectron_line( """ line_alg = make_bstoktaunu_electronic_fakek_fakeelectron(process=PROCESS) b_iso_relations, bst_iso_relations, extra_track_TES, iso_monitoring = prepare_MVA( - name, line_alg, parent="B_s0", anti_parent="B_s~0", - persist_b_iso_relations=False, persist_bst_iso_relations=False + name, + line_alg, + parent="B_s0", + anti_parent="B_s~0", + persist_b_iso_relations=False, + persist_bst_iso_relations=False, ) extra_neutrals = get_neutral_tracks() @@ -8619,9 +8689,9 @@ def spruce_bstoktaunu_electronic_fakek_fakeelectron_line( hlt2_name = map_line_name(name) - extra_outputs_iso = set_extra_outputs(name, b_iso_relations, - bst_iso_relations, extra_track_TES, - extra_neutrals) + extra_outputs_iso = set_extra_outputs( + name, b_iso_relations, bst_iso_relations, extra_track_TES, extra_neutrals + ) return SpruceLine( name=name, -- GitLab