From bc6d995e8a08e6d873325ee35eb2fd1e17a95550 Mon Sep 17 00:00:00 2001
From: Pasquale Andreola <paandr@farm-gpu2.physik.uzh.ch>
Date: Wed, 26 Mar 2025 15:20:02 +0100
Subject: [PATCH 01/19] Fixing additional conflicts
---
.../lines/qee/b_to_majolep_majo_to_leplep.py | 11 ++++-
.../lines/qee/b_to_majolep_majo_to_leppi.py | 38 +++++++++++-----
.../python/Hlt2Conf/lines/qee/busca.py | 8 +++-
.../lines/qee/dielectron_persist_photons.py | 6 +++
.../python/Hlt2Conf/lines/qee/dimuon_no_ip.py | 18 ++++++--
.../python/Hlt2Conf/lines/qee/diphoton.py | 5 ++-
.../python/Hlt2Conf/lines/qee/drellyan.py | 9 ++++
.../lines/qee/drellyan_pp_ref_2024.py | 10 +++++
.../lines/qee/muon_detector_showers.py | 5 ++-
.../python/Hlt2Conf/lines/qee/quarkonia.py | 9 ++--
.../python/Hlt2Conf/lines/qee/sexaquark.py | 45 ++++++++++---------
.../python/Hlt2Conf/lines/qee/ttrack_llps.py | 43 +++++++++++++-----
.../lines/qee/wz_boson_rare_decays.py | 16 ++++++-
13 files changed, 166 insertions(+), 57 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leplep.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leplep.py
index 322294c6ac5..0e46f7c60af 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leplep.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leplep.py
@@ -169,7 +169,7 @@ def build_cut_on_track(cutDict, pvs, corrm=False):
return buildFromList(listOfFunctors)
-def builder_BToMajoL_line(name, bachelorName, children, cutDict=None, prescale=1):
+def builder_BToMajoL_line(name, bachelorName, children, stream, cutDict=None, prescale=1):
if cutDict is None:
cutDict = {}
@@ -250,6 +250,7 @@ def builder_BToMajoL_line(name, bachelorName, children, cutDict=None, prescale=1
algs=hnl_prefilter(require_GEC=True) + [b2LN] + mons,
prescale=prescale,
monitoring_variables=_HNL_DEFAULT_MONITORING_VARIABLES,
+ stream=stream,
)
@@ -258,8 +259,13 @@ for recoMode in ["LL", "DD"]:
for children in [("mu", "mu"), ("mu", "e"), ("e", "mu"), ("e", "e")]:
name = f"Hlt2QEE_BpToMajo{bachelor.capitalize()}_MajoTo{children[0].capitalize()}{children[1].capitalize()}_{recoMode}_Tight"
+ # Sending the Hlt2QEE_BpToMajoE_MajoToEE_LL_Tight line to the 'qee' stream and the others to the 'qeelow' stream
+ qee_stream = 'qeelow'
+ if bachelor == 'e' and children[0] == 'e' and children[1] == 'e' and recoMode == 'LL':
+ qee_stream = 'qee'
+
@register_line_builder(all_lines)
- def make_line(name=name, bachelor=bachelor, children=children):
+ def make_line(name=name, bachelor=bachelor, children=children, stream=qee_stream):
return builder_BToMajoL_line(
name,
bachelor,
@@ -272,4 +278,5 @@ for recoMode in ["LL", "DD"]:
"FDCHI2MIN": 3000,
},
},
+ stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
index 59a4e00a129..1e8c4206653 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
@@ -69,10 +69,12 @@ from Hlt2Conf.lines.qee.qee_builders import (
all_lines = {}
_HNL_MONITORING_VARIABLES = ("pt", "eta", "vchi2", "ipchi2", "n_candidates")
+# Sending the 'Hlt2QEE_BpToMajoMu_MajoTo{lepton}{pion}' lines to the 'qee_low' stream
+qee_stream = 'qeelow'
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_LL_Tight_line(
- name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Tight", prescale=1
+ name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Tight", prescale=1, stream=qee_stream,
):
pvs = make_pvs
@@ -118,12 +120,13 @@ def BpToMajoMu_MajoToEPi_LL_Tight_line(
algs=hnl_prefilter() + [majoranas2piE, b2MuN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
+ stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoE_MajoToMuPi_LL_Tight_line(
- name="Hlt2QEE_BpToMajoE_MajoToMuPi_LL_Tight", prescale=1
+ name="Hlt2QEE_BpToMajoE_MajoToMuPi_LL_Tight", prescale=1, stream=qee_stream,
):
pvs = make_pvs
@@ -166,12 +169,13 @@ def BpToMajoE_MajoToMuPi_LL_Tight_line(
algs=hnl_prefilter() + [majoranas2piMu, b2EN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
+ stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoMu_MajoToMuPi_LL_Tight_line(
- name="Hlt2QEE_BpToMajoMu_MajoToMuPi_LL_Tight", prescale=1
+ name="Hlt2QEE_BpToMajoMu_MajoToMuPi_LL_Tight", prescale=1, stream=qee_stream,
):
pvs = make_pvs
@@ -214,12 +218,13 @@ def BpToMajoMu_MajoToMuPi_LL_Tight_line(
algs=hnl_prefilter() + [majoranas2piMu, b2MuN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
+ stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoE_MajoToEPi_LL_Tight_line(
- name="Hlt2QEE_BpToMajoE_MajoToEPi_LL_Tight", prescale=1
+ name="Hlt2QEE_BpToMajoE_MajoToEPi_LL_Tight", prescale=1, stream=qee_stream,
):
pvs = make_pvs
@@ -265,12 +270,13 @@ def BpToMajoE_MajoToEPi_LL_Tight_line(
algs=hnl_prefilter() + [majoranas2piE, b2EN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
+ stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_DD_Tight_line(
- name="Hlt2QEE_BpToMajoMu_MajoToEPi_DD_Tight", prescale=1
+ name="Hlt2QEE_BpToMajoMu_MajoToEPi_DD_Tight", prescale=1, stream=qee_stream,
):
pvs = make_pvs
@@ -319,12 +325,13 @@ def BpToMajoMu_MajoToEPi_DD_Tight_line(
algs=hnl_prefilter() + [majoranas2piE, b2MuN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
+ stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoE_MajoToMuPi_DD_Tight_line(
- name="Hlt2QEE_BpToMajoE_MajoToMuPi_DD_Tight", prescale=1
+ name="Hlt2QEE_BpToMajoE_MajoToMuPi_DD_Tight", prescale=1, stream=qee_stream,
):
pvs = make_pvs
@@ -374,12 +381,13 @@ def BpToMajoE_MajoToMuPi_DD_Tight_line(
algs=hnl_prefilter() + [majoranas2piMu, b2EN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
+ stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_LL_Loose_line(
- name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Loose", prescale=1
+ name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Loose", prescale=1, stream=qee_stream,
):
pvs = make_pvs
@@ -425,12 +433,13 @@ def BpToMajoMu_MajoToEPi_LL_Loose_line(
algs=hnl_prefilter() + [majoranas2piE, b2MuN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
+ stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoE_MajoToMuPi_LL_Loose_line(
- name="Hlt2QEE_BpToMajoE_MajoToMuPi_LL_Loose", prescale=1
+ name="Hlt2QEE_BpToMajoE_MajoToMuPi_LL_Loose", prescale=1, stream=qee_stream,
):
pvs = make_pvs
@@ -473,12 +482,13 @@ def BpToMajoE_MajoToMuPi_LL_Loose_line(
algs=hnl_prefilter() + [majoranas2piMu, b2EN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
+ stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_DD_Loose_line(
- name="Hlt2QEE_BpToMajoMu_MajoToEPi_DD_Loose", prescale=1
+ name="Hlt2QEE_BpToMajoMu_MajoToEPi_DD_Loose", prescale=1, stream=qee_stream,
):
pvs = make_pvs
@@ -527,12 +537,13 @@ def BpToMajoMu_MajoToEPi_DD_Loose_line(
algs=hnl_prefilter() + [majoranas2piE, b2MuN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
+ stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoE_MajoToMuPi_DD_Loose_line(
- name="Hlt2QEE_BpToMajoE_MajoToMuPi_DD_Loose", prescale=1
+ name="Hlt2QEE_BpToMajoE_MajoToMuPi_DD_Loose", prescale=1, stream=qee_stream,
):
pvs = make_pvs
@@ -582,11 +593,12 @@ def BpToMajoE_MajoToMuPi_DD_Loose_line(
algs=hnl_prefilter() + [majoranas2piMu, b2EN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
+ stream=stream,
)
@register_line_builder(all_lines)
-def BuToKs0Pi_Ks0ToPiPi_LL_line(name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_LL", prescale=1):
+def BuToKs0Pi_Ks0ToPiPi_LL_line(name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_LL", prescale=1, stream=qee_stream,):
pvs = make_pvs
b_pions = make_majorana_lepton(
@@ -616,11 +628,12 @@ def BuToKs0Pi_Ks0ToPiPi_LL_line(name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_LL", prescale=
algs=hnl_prefilter() + [Ks2pipi, b2Ks0Pi],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
+ stream=stream,
)
@register_line_builder(all_lines)
-def BuToKs0Pi_Ks0ToPiPi_DD_line(name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_DD", prescale=1):
+def BuToKs0Pi_Ks0ToPiPi_DD_line(name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_DD", prescale=1, stream=qee_stream,):
pvs = make_pvs
long_pions = make_majorana_lepton(
@@ -649,4 +662,5 @@ def BuToKs0Pi_Ks0ToPiPi_DD_line(name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_DD", prescale=
algs=hnl_prefilter() + [Ks2pipi, b2Ks0Pi],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
+ stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
index f604750a687..415f2f46f53 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
@@ -26,6 +26,8 @@ from RecoConf.standard_particles import make_down_pions
turbo_lines = {}
+# Sending the 'Hlt2QEE_DownstreamBuScaInclusive2H_DD{,_ss}' lines to the 'qee_low' stream
+qee_stream = 'qeelow'
@configurable
def make_DownstreamBuScaInclusive2H_DD(
@@ -66,7 +68,7 @@ def make_DownstreamBuScaInclusive2H_DD(
@register_line_builder(turbo_lines)
@configurable
def DownstreamBuScaInclusive2H_DD(
- name="Hlt2QEE_DownstreamBuScaInclusive2H_DD", prescale=1.0
+ name="Hlt2QEE_DownstreamBuScaInclusive2H_DD", prescale=1.0, stream=qee_stream,
):
# We actually doesn't require any PID cuts, so it's inclusive
algs = (
@@ -80,13 +82,14 @@ def DownstreamBuScaInclusive2H_DD(
hlt1_filter_code=["Hlt1DownstreamBuSca.*Decision"],
prescale=prescale,
monitoring_variables=("pt", "eta", "m", "vchi2", "ipchi2", "n_candidates"),
+ stream=stream,
)
@register_line_builder(turbo_lines)
@configurable
def DownstreamBuScaInclusive2H_DD_same_sign(
- name="Hlt2QEE_DownstreamBuScaInclusive2H_DD_same_sign", prescale=1.0
+ name="Hlt2QEE_DownstreamBuScaInclusive2H_DD_same_sign", prescale=1.0, stream=qee_stream
):
# We actually doesn't require any PID cuts, so it's inclusive
algs = (
@@ -100,4 +103,5 @@ def DownstreamBuScaInclusive2H_DD_same_sign(
hlt1_filter_code=["Hlt1DownstreamBuSca.*Decision"],
prescale=prescale,
monitoring_variables=("pt", "eta", "m", "vchi2", "ipchi2", "n_candidates"),
+ stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
index 4b44210fd23..3e02359c06f 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
@@ -37,6 +37,8 @@ comb_mass_limits = (5.0 * MeV, 700.0 * MeV)
# NOTE: No dielectron mass monitors allowed (custom or default) to avoid potential unblinding.
_default_monitoring_variables = ("pt", "eta", "n_candidates", "ipchi2", "vchi2")
+# Setting the default stream the lines will be sent to
+qee_stream = 'qeelow'
@configurable
def photon_filter(
@@ -98,6 +100,7 @@ for kind in "", "Norm":
persistreco=False,
e_minpt=e_pt_cut, # HLT1 cuts on the PT
make_pvs=make_pvs,
+ stream=qee_stream,
):
"""Aiming for prompt pi0/eta -> gamma e+ e- decays. Label the dielectron
as J/psi(1S) [during brem-recovery-reconstruction of dielectron pair] and
@@ -129,6 +132,7 @@ for kind in "", "Norm":
prescale=prescale,
monitoring_variables=_default_monitoring_variables,
hlt1_filter_code=[f"Hlt1DiElectronLowMass_NoIP{kind}Decision"],
+ stream=stream,
)
@register_line_builder(full_lines)
@@ -184,6 +188,7 @@ for kind in "", "Norm":
persistreco=False,
e_minpt=e_pt_cut,
make_pvs=make_pvs,
+ stream=qee_stream,
):
"""Aiming to normalize prompt pi0/eta -> gamma e+ e+ or gamma e- e- decays. Label
the doubly-charged dielectron as J/psi(1S) and save photons if Pi0/eta in
@@ -215,6 +220,7 @@ for kind in "", "Norm":
prescale=prescale,
monitoring_variables=_default_monitoring_variables,
hlt1_filter_code=[f"Hlt1DiElectronLowMass_SS_NoIP{kind}Decision"],
+ stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
index 00ca38dca57..167e4e588c9 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
@@ -27,6 +27,8 @@ from RecoConf.standard_particles import make_ismuon_long_muon
turbo_lines = {}
full_lines = {}
+# Setting the default stream the lines will be sent to
+qee_stream = 'qeelow'
def filter_muons(particles, pvs, min_ipchi2, pid_mu, p_min=5 * GeV):
cut = require_all(
@@ -81,7 +83,9 @@ def make_dimuons(
@register_line_builder(turbo_lines)
-def dimuonnoip_line(name="Hlt2QEE_DiMuonNoIP", prescale=1):
+def dimuonnoip_line(name="Hlt2QEE_DiMuonNoIP", prescale=1,
+ stream='qee' # Hlt2QEE_DiMuonNoIP line is well above 10 MB/s thus it must go to 'qee' stream
+ ):
pvs = make_pvs()
dimuonnoip = make_dimuons(pvs)
return Hlt2Line(
@@ -89,22 +93,26 @@ def dimuonnoip_line(name="Hlt2QEE_DiMuonNoIP", prescale=1):
algs=upfront_reconstruction() + [require_pvs(pvs), dimuonnoip],
prescale=prescale,
hlt1_filter_code=hlt1_dimuonnoip_filter,
+ stream=stream,
)
@register_line_builder(turbo_lines)
-def displaceddimuon_line(name="Hlt2QEE_DisplacedDiMuon", prescale=1):
+def displaceddimuon_line(name="Hlt2QEE_DisplacedDiMuon", prescale=1,
+ stream='qee' # Hlt2QEE_DisplacedDiMuon line is above 10 MB/s thus it must go to 'qee' stream
+ ):
pvs = make_pvs()
dimuonnoip = make_dimuons(pvs, min_ipchi2=16, ownpvvdchi2_min=30)
return Hlt2Line(
name=name,
algs=upfront_reconstruction() + [require_pvs(pvs), dimuonnoip],
prescale=prescale,
+ stream=stream,
)
@register_line_builder(turbo_lines)
-def dimuonnoip_massrange1_ss_line(name="Hlt2QEE_DiMuonNoIP_ss", prescale=0.1):
+def dimuonnoip_massrange1_ss_line(name="Hlt2QEE_DiMuonNoIP_ss", prescale=0.1, stream=qee_stream):
pvs = make_pvs()
dimuonnoip = make_dimuons(pvs, opposite_sign=False)
return Hlt2Line(
@@ -112,11 +120,12 @@ def dimuonnoip_massrange1_ss_line(name="Hlt2QEE_DiMuonNoIP_ss", prescale=0.1):
algs=upfront_reconstruction() + [require_pvs(pvs), dimuonnoip],
prescale=prescale,
hlt1_filter_code=hlt1_dimuonnoipss_filter,
+ stream=stream,
)
@register_line_builder(turbo_lines)
-def displaceddimuon_ss_line(name="Hlt2QEE_DisplacedDiMuon_ss", prescale=0.1):
+def displaceddimuon_ss_line(name="Hlt2QEE_DisplacedDiMuon_ss", prescale=0.1, stream=qee_stream):
pvs = make_pvs()
dimuonnoip = make_dimuons(
pvs, min_ipchi2=16, ownpvvdchi2_min=30, opposite_sign=False
@@ -125,6 +134,7 @@ def displaceddimuon_ss_line(name="Hlt2QEE_DisplacedDiMuon_ss", prescale=0.1):
name=name,
algs=upfront_reconstruction() + [require_pvs(pvs), dimuonnoip],
prescale=prescale,
+ stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/diphoton.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/diphoton.py
index f4224666111..27ab9cc6fb5 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/diphoton.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/diphoton.py
@@ -30,6 +30,8 @@ from Hlt2Conf.lines.qee.qee_builders import parent_isolation_output
all_lines = {}
+# Setting the default stream the lines will be sent to
+qee_stream = 'qeelow'
@configurable
def filter_qee_photons(
@@ -93,7 +95,7 @@ def make_diphoton(
@register_line_builder(all_lines)
def Hlt2_ALPsToGammaGamma(
- name="Hlt2QEE_ALPsToGammaGamma", prescale=1, persistreco=False
+ name="Hlt2QEE_ALPsToGammaGamma", prescale=1, persistreco=False, stream=qee_stream,
):
"""
Register B2GammaGamma/ALPs2GammaGamma line
@@ -109,4 +111,5 @@ def Hlt2_ALPsToGammaGamma(
prescale=prescale,
extra_outputs=parent_isolation_output("B_s0", diphotons),
monitoring_variables=("m", "pt", "eta", "n_candidates"),
+ stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py
index 696bd6670b1..1fe5132748f 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py
@@ -46,6 +46,8 @@ mass_ranges = [
# fifth argument: underlying event on/off
# sixth argument: use softer muons
+# Setting the default stream the lines will be sent to
+qee_stream = 'qeelow'
@configurable
def filter_muons(
@@ -158,7 +160,13 @@ for is_ss in [True, False]:
prescale=prescale,
save_underlying_event=mass_range[4],
min_pidmu=min_pidmu,
+ stream=qee_stream,
):
+
+ # Hlt2QEE_DiMuon_DrellYan_VLowMass_OS_Prompt and Hlt2QEE_DiMuon_DrellYan_LowMass_OS_Prompt have an higher bandwidth than 10 MB/s
+ if mass_range[2] in ['VLowMass', 'LowMass'] and not is_ss and not displaced:
+ stream = 'qee'
+
pvs = make_pvs()
muon_min_p = 6 * GeV
@@ -188,4 +196,5 @@ for is_ss in [True, False]:
raw_banks=detectors_to_save,
persistreco=False,
prescale=prescale,
+ stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan_pp_ref_2024.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan_pp_ref_2024.py
index 5033f855cd5..fa1a83aa21c 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan_pp_ref_2024.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan_pp_ref_2024.py
@@ -38,6 +38,9 @@ from RecoConf.standard_particles import make_ismuon_long_muon
all_lines = {}
+# Setting the default stream the lines will be sent to
+qee_stream = 'qeelow'
+
### Line configuration
mass_ranges = [
[1.5 * GeV, 2.9 * GeV, "LowestMass", 0.2, True, True],
@@ -164,7 +167,13 @@ for is_ss in [True, False]:
prescale=prescale,
persist_reco=mass_range[4],
min_pidmu=min_pidmu,
+ stream=qee_stream,
):
+
+ # Hlt2QEE_DiMuon_DrellYan_VLowMass_OS_Prompt and Hlt2QEE_DiMuon_DrellYan_LowMass_OS_Prompt have an higher bandwidth than 10 MB/s
+ if mass_range[2] in ['VLowMass', 'LowMass'] and not is_ss and not displaced:
+ stream = 'qee'
+
pvs = make_pvs()
if use_soft_muons:
@@ -192,4 +201,5 @@ for is_ss in [True, False]:
algs=upfront_reconstruction() + [require_pvs(pvs), dimuons],
persistreco=persist_reco,
prescale=prescale,
+ stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
index 21b9bf5f219..3a4bfb94556 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
@@ -26,6 +26,8 @@ from SelAlgorithms import monitoring
full_lines = {}
turbo_lines = {}
+# Setting the default stream the lines will be sent to
+qee_stream = 'qee' # The 'Hlt2QEE_MDS_BDT_nHits_Turbo' line has an higher bandwidth than 10 MB/s
def mds_BDT_Monitoring(mva, prescale=0.1, line_type="full"):
prescaler = DeterministicPrescaler(
@@ -61,7 +63,7 @@ mva_config = {
@register_line_builder(turbo_lines)
@configurable
def mds_BDT_nHits_line_turbo(
- name="Hlt2QEE_MDS_BDT_nHits_Turbo", MVACut=0.995, prescale=1.0, persistreco=False
+ name="Hlt2QEE_MDS_BDT_nHits_Turbo", MVACut=0.995, prescale=1.0, persistreco=False, stream=qee_stream,
):
muon_hits = make_muon_hits()
inputs = {
@@ -90,6 +92,7 @@ def mds_BDT_nHits_line_turbo(
persistreco=persistreco,
extra_outputs=[("MuonLongTracks", long_muons)],
raw_banks=["Muon"],
+ stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py
index 48fb0e2a6a6..bf402393baa 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py
@@ -126,7 +126,7 @@ def make_upsilon():
@register_line_builder(all_lines)
@configurable
def jpsi_to_mu_mu_detached_line(
- name="Hlt2QEE_JpsiToMuMu_Detached", prescale=1, persistreco=False
+ name="Hlt2QEE_JpsiToMuMu_Detached", prescale=1, persistreco=False, stream='qee',
):
"""Jpsi (Detached) decay to two muons line"""
jpsi = make_jpsi(min_ownpvdls=3.0)
@@ -136,13 +136,14 @@ def jpsi_to_mu_mu_detached_line(
prescale=prescale,
persistreco=persistreco,
monitoring_variables=("m", "pt", "eta", "n_candidates"),
+ stream=stream,
)
@register_line_builder(all_lines)
@configurable
def jpsi_to_mu_mu_prompt_line(
- name="Hlt2QEE_JpsiToMuMu_Prompt", prescale=0.1, persistreco=False
+ name="Hlt2QEE_JpsiToMuMu_Prompt", prescale=0.1, persistreco=False, stream='qeelow'
):
"""Jpsi (Prompt) decay to two muons line"""
jpsi = make_jpsi(max_ownpvdls=3.0)
@@ -152,13 +153,14 @@ def jpsi_to_mu_mu_prompt_line(
prescale=prescale,
persistreco=persistreco,
monitoring_variables=("m", "pt", "eta", "n_candidates"),
+ stream=stream,
)
@register_line_builder(all_lines)
@configurable
def upsilon_to_mu_mu_line(
- name="Hlt2QEE_Upsilon1SToMuMu", prescale=1, persistreco=False
+ name="Hlt2QEE_Upsilon1SToMuMu", prescale=1, persistreco=False, stream='qeelow'
):
"""Upsilon(1S) decay to two muons line"""
u1s = make_upsilon()
@@ -168,4 +170,5 @@ def upsilon_to_mu_mu_line(
prescale=prescale,
persistreco=persistreco,
monitoring_variables=("m", "pt", "eta", "n_candidates"),
+ stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
index fbb7b12cbff..3d9d5f97a2a 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
@@ -48,6 +48,9 @@ from RecoConf.standard_particles import (
all_lines = {}
+# Setting the default stream the lines will be sent to
+qee_stream = 'qeelow'
+
#########################
### template builders ###
#########################
@@ -396,33 +399,33 @@ from collections import namedtuple
LineConf = namedtuple(
"LineConf",
- ["process", "stream", "prescale", "downstream"],
+ ["process", "stream", "prescale", "downstream", "turbostream"],
)
line_args = {
# L0Kp
- "ProtonToLambda0Kp_LLl": LineConf("L0Kp", "LLl", 1.0, [False, False]),
- "ProtonToLambda0Kp_DDl": LineConf("L0Kp", "DDl", 1.0, [True, False]),
- "ProtonToLambda0Kp_DDd": LineConf("L0Kp", "DDd", 1.0, [True, True]),
+ "ProtonToLambda0Kp_LLl": LineConf("L0Kp", "LLl", 1.0, [False, False], qee_stream),
+ "ProtonToLambda0Kp_DDl": LineConf("L0Kp", "DDl", 1.0, [True, False], qee_stream),
+ "ProtonToLambda0Kp_DDd": LineConf("L0Kp", "DDd", 1.0, [True, True], qee_stream),
# L0Ks
- "NeutronToLambda0KS_LLLL": LineConf("L0Ks", "LLLL", 1.0, [False, False]),
- "NeutronToLambda0KS_LLDD": LineConf("L0Ks", "LLDD", 1.0, [False, True]),
- "NeutronToLambda0KS_DDLL": LineConf("L0Ks", "DDLL", 1.0, [True, False]),
- "NeutronToLambda0KS_DDDD": LineConf("L0Ks", "DDDD", 1.0, [True, True]),
+ "NeutronToLambda0KS_LLLL": LineConf("L0Ks", "LLLL", 1.0, [False, False], qee_stream),
+ "NeutronToLambda0KS_LLDD": LineConf("L0Ks", "LLDD", 1.0, [False, True], qee_stream),
+ "NeutronToLambda0KS_DDLL": LineConf("L0Ks", "DDLL", 1.0, [True, False], qee_stream),
+ "NeutronToLambda0KS_DDDD": LineConf("L0Ks", "DDDD", 1.0, [True, True], qee_stream),
# L0L0
- "NucleonToLambda0Lambda0_LLLL": LineConf("L0L0", "LLLL", 1.0, [False, False]),
- "NucleonToLambda0Lambda0_LLDD": LineConf("L0L0", "LLDD", 1.0, [False, True]),
- "NucleonToLambda0Lambda0_DDDD": LineConf("L0L0", "DDDD", 1.0, [True, True]),
+ "NucleonToLambda0Lambda0_LLLL": LineConf("L0L0", "LLLL", 1.0, [False, False], qee_stream),
+ "NucleonToLambda0Lambda0_LLDD": LineConf("L0L0", "LLDD", 1.0, [False, True], qee_stream),
+ "NucleonToLambda0Lambda0_DDDD": LineConf("L0L0", "DDDD", 1.0, [True, True], qee_stream),
# KpKp
- "NucleonToKpKpPim_ll": LineConf("KpKpPim", "ll", 0.25, [False, False, False]),
- "NucleonToKpKpPim_dd": LineConf("KpKpPim", "dd", 0.5, [True, True, True]),
+ "NucleonToKpKpPim_ll": LineConf("KpKpPim", "ll", 0.25, [False, False, False], qee_stream),
+ "NucleonToKpKpPim_dd": LineConf("KpKpPim", "dd", 0.5, [True, True, True], 'qee'), # This line fires more than 10 MB/s
# KsKp
- "NucleonToKS0KpPim_LLl": LineConf("KsKpPim", "LLl", 1.0, [False, False, False]),
- "NucleonToKS0KpPim_DDl": LineConf("KsKpPim", "DDl", 1.0, [True, False, False]),
- "NucleonToKS0KpPim_DDd": LineConf("KsKpPim", "DDd", 1.0, [True, True, True]),
+ "NucleonToKS0KpPim_LLl": LineConf("KsKpPim", "LLl", 1.0, [False, False, False], qee_stream),
+ "NucleonToKS0KpPim_DDl": LineConf("KsKpPim", "DDl", 1.0, [True, False, False], qee_stream),
+ "NucleonToKS0KpPim_DDd": LineConf("KsKpPim", "DDd", 1.0, [True, True, True], 'qee'), # This line fires more than 10 MB/s
# KsKs
- "NucleonToKSKS_LLLL": LineConf("KsKs", "LLLL", 0.01, [False, False]),
- "NucleonToKSKS_LLDD": LineConf("KsKscc", "LLDD", 0.01, [False, True]),
- "NucleonToKSKS_DDDD": LineConf("KsKs", "DDDD", 0.01, [True, True]),
+ "NucleonToKSKS_LLLL": LineConf("KsKs", "LLLL", 0.01, [False, False], qee_stream),
+ "NucleonToKSKS_LLDD": LineConf("KsKscc", "LLDD", 0.01, [False, True], qee_stream),
+ "NucleonToKSKS_DDDD": LineConf("KsKs", "DDDD", 0.01, [True, True], qee_stream),
}
ProcessConf = namedtuple(
"ProcessConf",
@@ -472,7 +475,8 @@ for sfx, line_config in line_args.items():
@register_line_builder(all_lines)
def sexaquark_line(
- name=f"Hlt2QEE_Sexaquark{sfx}", prescale=line_config.prescale
+ name=f"Hlt2QEE_Sexaquark{sfx}", prescale=line_config.prescale,
+ turbostream = line_config.turbostream # Needed to pick the correct stream for each line
):
sexaquarks = make_sexaquark(
name=f"qee_make_S_to_{line_config.process}_{line_config.stream}"
@@ -498,6 +502,7 @@ for sfx, line_config in line_args.items():
algs=[require_pvs(make_pvs())] + [sexaquarks],
prescale=prescale,
extra_outputs=pions,
+ stream=turbostream,
)
return sexaquark_line
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
index 50550d23cb9..a6163490a6a 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
@@ -44,6 +44,9 @@ from Hlt2Conf.lines.qee.qee_builders import (
turbo_lines = {}
full_lines = {}
+# Setting the default stream the lines will be sent to
+qee_stream = "qeelow"
+
########################
### Dark Higgs modes ###
########################
@@ -51,7 +54,9 @@ full_lines = {}
@register_line_builder(turbo_lines)
@configurable
-def qee_BtoKH_KK_exclTT(name="Hlt2QEE_BtoKH_KK_exclTT", prescale=0.008):
+def qee_BtoKH_KK_exclTT(
+ name="Hlt2QEE_BtoKH_KK_exclTT", prescale=0.008, stream=qee_stream
+):
pvs = make_pvs()
filtered_long_kaons = qee_filtered_long_kaons()
dikaon = make_XtoTT_kaons(pvs)
@@ -65,12 +70,15 @@ def qee_BtoKH_KK_exclTT(name="Hlt2QEE_BtoKH_KK_exclTT", prescale=0.008):
algs=upfront_reconstruction()
+ [require_pvs(pvs), qee_set_max_pvs(pvs), b_candidate],
prescale=prescale,
+ stream=stream,
)
@register_line_builder(turbo_lines)
@configurable
-def qee_BtoKstar0H_KK_exclTT(name="Hlt2QEE_BtoKstar0H_KK_exclTT", prescale=0.01):
+def qee_BtoKstar0H_KK_exclTT(
+ name="Hlt2QEE_BtoKstar0H_KK_exclTT", prescale=0.01, stream=qee_stream
+):
pvs = make_pvs()
long_kstars = make_qee_detached_kstar0s()
dikaon = make_XtoTT_kaons(pvs)
@@ -84,6 +92,7 @@ def qee_BtoKstar0H_KK_exclTT(name="Hlt2QEE_BtoKstar0H_KK_exclTT", prescale=0.01)
algs=upfront_reconstruction()
+ [require_pvs(pvs), qee_set_max_pvs(pvs), b_candidate],
prescale=prescale,
+ stream=stream,
)
@@ -161,7 +170,9 @@ def qee_HtoMuMu_samesignDD(name="Hlt2QEE_HtoMuMu_samesignDDFull", prescale=0.1):
### HNL Exclusive Lines
@register_line_builder(turbo_lines)
@configurable
-def qee_BtoMuN_PiMu_exclTT(name="Hlt2QEE_BtoMuN_PiMu_exclTT", prescale=1.0):
+def qee_BtoMuN_PiMu_exclTT(
+ name="Hlt2QEE_BtoMuN_PiMu_exclTT", prescale=1.0, stream=qee_stream
+):
pvs = make_pvs()
long_muons = make_qee_detached_muons()
hnl = make_XtoTT_pimu(pvs)
@@ -175,12 +186,15 @@ def qee_BtoMuN_PiMu_exclTT(name="Hlt2QEE_BtoMuN_PiMu_exclTT", prescale=1.0):
algs=upfront_reconstruction()
+ [require_pvs(pvs), qee_set_max_pvs(pvs), b_candidate],
prescale=prescale,
+ stream=stream,
)
@register_line_builder(turbo_lines)
@configurable
-def qee_BctoMuN_PiMu_exclTT(name="Hlt2QEE_BctoMuN_PiMu_exclTT", prescale=1.0):
+def qee_BctoMuN_PiMu_exclTT(
+ name="Hlt2QEE_BctoMuN_PiMu_exclTT", prescale=1.0, stream=qee_stream
+):
pvs = make_pvs()
long_muons = make_qee_detached_muons()
hnl = make_XtoTT_pimu(pvs)
@@ -197,13 +211,14 @@ def qee_BctoMuN_PiMu_exclTT(name="Hlt2QEE_BctoMuN_PiMu_exclTT", prescale=1.0):
algs=upfront_reconstruction()
+ [require_pvs(pvs), qee_set_max_pvs(pvs), b_candidate],
prescale=prescale,
+ stream=stream,
)
## HNL Inclusive Lines
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoPiMu_inclTT(name="Hlt2QEE_N_PiMu_inclTT", prescale=1):
+def qee_NtoPiMu_inclTT(name="Hlt2QEE_N_PiMu_inclTT", prescale=1, stream=qee_stream):
"""A line to select the [N -> pi+ mu-]CC decay for an inclusive selection
for the [B -> X mu (N -> pi mu)] decay"""
@@ -227,12 +242,15 @@ def qee_NtoPiMu_inclTT(name="Hlt2QEE_N_PiMu_inclTT", prescale=1):
prescale=prescale,
raw_banks=DETECTORS,
extra_outputs=[("ISMUON_long_muons", long_muons)],
+ stream=stream,
)
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoPiMu_SS_inclTT(name="Hlt2QEE_N_PiMu_SS_inclTT", prescale=0.1):
+def qee_NtoPiMu_SS_inclTT(
+ name="Hlt2QEE_N_PiMu_SS_inclTT", prescale=0.1, stream=qee_stream
+):
"""A line to select the [N -> pi+ mu+]CC (i.e. same sign; SS) decay as a background control selection
for the [B -> X mu (N -> pi mu)] decay"""
@@ -256,12 +274,13 @@ def qee_NtoPiMu_SS_inclTT(name="Hlt2QEE_N_PiMu_SS_inclTT", prescale=0.1):
prescale=prescale,
raw_banks=DETECTORS,
extra_outputs=[("ISMUON_long_muons", long_muons)],
+ stream=stream,
)
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoEMuNu_inclTT(name="Hlt2QEE_N_EMuNu_inclTT", prescale=1):
+def qee_NtoEMuNu_inclTT(name="Hlt2QEE_N_EMuNu_inclTT", prescale=1, stream=qee_stream):
"""A line to select the [N -> e+ mu- nu_mu]CC decay for an inclusive selection
for the [B -> X mu (N -> e mu nu)] decay"""
@@ -290,12 +309,13 @@ def qee_NtoEMuNu_inclTT(name="Hlt2QEE_N_EMuNu_inclTT", prescale=1):
prescale=prescale,
raw_banks=DETECTORS,
extra_outputs=[("ISMUON_long_muons", long_muons)],
+ stream=stream
)
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoEMuNu_SS_inclTT(name="Hlt2QEE_N_EMuNu_SS_inclTT", prescale=0.1):
+def qee_NtoEMuNu_SS_inclTT(name="Hlt2QEE_N_EMuNu_SS_inclTT", prescale=0.1, stream=qee_stream):
"""A line to select the [N -> e+ mu+ nu_mu]CC (i.e. same sign; SS) decay as a background control
selection for the [B -> X mu (N -> e mu nu)] decay"""
@@ -324,12 +344,13 @@ def qee_NtoEMuNu_SS_inclTT(name="Hlt2QEE_N_EMuNu_SS_inclTT", prescale=0.1):
prescale=prescale,
raw_banks=DETECTORS,
extra_outputs=[("ISMUON_long_muons", long_muons)],
+ stream=stream,
)
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoMuMuNu_inclTT(name="Hlt2QEE_N_MuMuNu_inclTT", prescale=1):
+def qee_NtoMuMuNu_inclTT(name="Hlt2QEE_N_MuMuNu_inclTT", prescale=1, stream=qee_stream):
"""A line to select the [N -> mu+ mu- nu_mu]CC decay for an inclusive selection
for the [B -> X mu (N -> mu mu nu)] decay"""
@@ -354,12 +375,13 @@ def qee_NtoMuMuNu_inclTT(name="Hlt2QEE_N_MuMuNu_inclTT", prescale=1):
prescale=prescale,
raw_banks=DETECTORS,
extra_outputs=[("ISMUON_long_muons", long_muons)],
+ stream=stream,
)
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoMuMuNu_SS_inclTT(name="Hlt2QEE_N_MuMuNu_SS_inclTT", prescale=0.1):
+def qee_NtoMuMuNu_SS_inclTT(name="Hlt2QEE_N_MuMuNu_SS_inclTT", prescale=0.1, stream=qee_stream):
"""A line to select the [N -> mu+ mu+ nu_mu]CC (i.e. same sign; SS) decay as a background control
for the [B -> X mu (N -> mu mu nu)] decay"""
@@ -384,4 +406,5 @@ def qee_NtoMuMuNu_SS_inclTT(name="Hlt2QEE_N_MuMuNu_SS_inclTT", prescale=0.1):
prescale=prescale,
raw_banks=DETECTORS,
extra_outputs=[("ISMUON_long_muons", long_muons)],
+ stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/wz_boson_rare_decays.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/wz_boson_rare_decays.py
index 70f3e2b75a5..b53d6b38d6f 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/wz_boson_rare_decays.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/wz_boson_rare_decays.py
@@ -36,8 +36,11 @@ from Hlt2Conf.lines.qee.qee_monitors import qee_monitors1d
from Hlt2Conf.standard_jets import make_jets
all_lines = {}
-_default_monitoring_variables = ("pt", "eta", "n_candidates", "ipchi2", "vchi2")
+# Setting the default stream the lines will be sent to
+qee_stream = 'qeelow'
+
+_default_monitoring_variables = ("pt", "eta", "n_candidates", "ipchi2", "vchi2")
@configurable
def make_EW_pions(pvs, p_min=1 * GeV, min_pt=1 * GeV, p_pidk_max=5.0, mipchi2_min=0):
@@ -683,7 +686,7 @@ def make_WZRareDecay_DiMuonMeson_cand(pvs, decay_type="JPsiDsp"):
@register_line_builder(all_lines)
@configurable
-def Dimuon_PhiDsp_line(name="Hlt2QEE_WZRareJPsiPhiDsp", prescale=1, persistreco=False):
+def Dimuon_PhiDsp_line(name="Hlt2QEE_WZRareJPsiPhiDsp", prescale=1, persistreco=False, stream=qee_stream):
"""W+ -> Jpsi phi(1020) Ds+ line"""
pvs = make_pvs()
@@ -701,6 +704,7 @@ def Dimuon_PhiDsp_line(name="Hlt2QEE_WZRareJPsiPhiDsp", prescale=1, persistreco=
calo_digits=True,
calo_clusters=True,
monitoring_variables=_default_monitoring_variables,
+ stream=stream,
)
@@ -713,6 +717,7 @@ for decay_type in ["JPsiDsp", "DiMuonDsp", "DiMuonPion"]:
decay_type=f"{decay_type}",
prescale=1,
persistreco=False,
+ stream=qee_stream,
):
f"""{decay_type} line"""
@@ -731,6 +736,7 @@ for decay_type in ["JPsiDsp", "DiMuonDsp", "DiMuonPion"]:
persistreco=persistreco,
calo_digits=True,
monitoring_variables=_default_monitoring_variables,
+ stream=stream,
)
@@ -760,7 +766,12 @@ for decay_type in [
photon_type=f"{photon_type}",
prescale=1,
persistreco=False,
+ stream=qee_stream,
):
+ # Change the stream for 'Hlt2QEE_WZRareJetGamma' because it has a BW higher than 10 MB/s
+ if decay_type == 'JetGamma' and line_suffix == '':
+ stream='qee'
+
f"""{decay_type} ({photon_type} photons) line"""
pvs = make_pvs()
@@ -780,4 +791,5 @@ for decay_type in [
persistreco=persistreco,
calo_digits=True,
monitoring_variables=_default_monitoring_variables,
+ stream=stream,
)
--
GitLab
From 2027047613011de49bb13518a35de0985e75f9f1 Mon Sep 17 00:00:00 2001
From: Gitlab CI <noreply@cern.ch>
Date: Wed, 26 Mar 2025 14:27:51 +0000
Subject: [PATCH 02/19] Fixing additional conflicts
---
.../lines/qee/b_to_majolep_majo_to_leplep.py | 19 +++++--
.../lines/qee/b_to_majolep_majo_to_leppi.py | 55 ++++++++++++++-----
.../python/Hlt2Conf/lines/qee/busca.py | 11 +++-
.../python/Hlt2Conf/lines/qee/dimuon_no_ip.py | 27 ++++++---
.../python/Hlt2Conf/lines/qee/diphoton.py | 8 ++-
.../python/Hlt2Conf/lines/qee/drellyan.py | 12 ++--
.../lines/qee/drellyan_pp_ref_2024.py | 11 ++--
.../lines/qee/muon_detector_showers.py | 11 +++-
.../python/Hlt2Conf/lines/qee/quarkonia.py | 9 ++-
.../python/Hlt2Conf/lines/qee/sexaquark.py | 43 +++++++++++----
.../lines/qee/wz_boson_rare_decays.py | 11 ++--
11 files changed, 156 insertions(+), 61 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leplep.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leplep.py
index 0e46f7c60af..be9b0310fbe 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leplep.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leplep.py
@@ -169,7 +169,9 @@ def build_cut_on_track(cutDict, pvs, corrm=False):
return buildFromList(listOfFunctors)
-def builder_BToMajoL_line(name, bachelorName, children, stream, cutDict=None, prescale=1):
+def builder_BToMajoL_line(
+ name, bachelorName, children, stream, cutDict=None, prescale=1
+):
if cutDict is None:
cutDict = {}
@@ -260,12 +262,19 @@ for recoMode in ["LL", "DD"]:
name = f"Hlt2QEE_BpToMajo{bachelor.capitalize()}_MajoTo{children[0].capitalize()}{children[1].capitalize()}_{recoMode}_Tight"
# Sending the Hlt2QEE_BpToMajoE_MajoToEE_LL_Tight line to the 'qee' stream and the others to the 'qeelow' stream
- qee_stream = 'qeelow'
- if bachelor == 'e' and children[0] == 'e' and children[1] == 'e' and recoMode == 'LL':
- qee_stream = 'qee'
+ qee_stream = "qeelow"
+ if (
+ bachelor == "e"
+ and children[0] == "e"
+ and children[1] == "e"
+ and recoMode == "LL"
+ ):
+ qee_stream = "qee"
@register_line_builder(all_lines)
- def make_line(name=name, bachelor=bachelor, children=children, stream=qee_stream):
+ def make_line(
+ name=name, bachelor=bachelor, children=children, stream=qee_stream
+ ):
return builder_BToMajoL_line(
name,
bachelor,
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
index 1e8c4206653..af8fbb86cf6 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
@@ -70,11 +70,14 @@ all_lines = {}
_HNL_MONITORING_VARIABLES = ("pt", "eta", "vchi2", "ipchi2", "n_candidates")
# Sending the 'Hlt2QEE_BpToMajoMu_MajoTo{lepton}{pion}' lines to the 'qee_low' stream
-qee_stream = 'qeelow'
+qee_stream = "qeelow"
+
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_LL_Tight_line(
- name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Tight", prescale=1, stream=qee_stream,
+ name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Tight",
+ prescale=1,
+ stream=qee_stream,
):
pvs = make_pvs
@@ -126,7 +129,9 @@ def BpToMajoMu_MajoToEPi_LL_Tight_line(
@register_line_builder(all_lines)
def BpToMajoE_MajoToMuPi_LL_Tight_line(
- name="Hlt2QEE_BpToMajoE_MajoToMuPi_LL_Tight", prescale=1, stream=qee_stream,
+ name="Hlt2QEE_BpToMajoE_MajoToMuPi_LL_Tight",
+ prescale=1,
+ stream=qee_stream,
):
pvs = make_pvs
@@ -175,7 +180,9 @@ def BpToMajoE_MajoToMuPi_LL_Tight_line(
@register_line_builder(all_lines)
def BpToMajoMu_MajoToMuPi_LL_Tight_line(
- name="Hlt2QEE_BpToMajoMu_MajoToMuPi_LL_Tight", prescale=1, stream=qee_stream,
+ name="Hlt2QEE_BpToMajoMu_MajoToMuPi_LL_Tight",
+ prescale=1,
+ stream=qee_stream,
):
pvs = make_pvs
@@ -224,7 +231,9 @@ def BpToMajoMu_MajoToMuPi_LL_Tight_line(
@register_line_builder(all_lines)
def BpToMajoE_MajoToEPi_LL_Tight_line(
- name="Hlt2QEE_BpToMajoE_MajoToEPi_LL_Tight", prescale=1, stream=qee_stream,
+ name="Hlt2QEE_BpToMajoE_MajoToEPi_LL_Tight",
+ prescale=1,
+ stream=qee_stream,
):
pvs = make_pvs
@@ -276,7 +285,9 @@ def BpToMajoE_MajoToEPi_LL_Tight_line(
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_DD_Tight_line(
- name="Hlt2QEE_BpToMajoMu_MajoToEPi_DD_Tight", prescale=1, stream=qee_stream,
+ name="Hlt2QEE_BpToMajoMu_MajoToEPi_DD_Tight",
+ prescale=1,
+ stream=qee_stream,
):
pvs = make_pvs
@@ -331,7 +342,9 @@ def BpToMajoMu_MajoToEPi_DD_Tight_line(
@register_line_builder(all_lines)
def BpToMajoE_MajoToMuPi_DD_Tight_line(
- name="Hlt2QEE_BpToMajoE_MajoToMuPi_DD_Tight", prescale=1, stream=qee_stream,
+ name="Hlt2QEE_BpToMajoE_MajoToMuPi_DD_Tight",
+ prescale=1,
+ stream=qee_stream,
):
pvs = make_pvs
@@ -387,7 +400,9 @@ def BpToMajoE_MajoToMuPi_DD_Tight_line(
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_LL_Loose_line(
- name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Loose", prescale=1, stream=qee_stream,
+ name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Loose",
+ prescale=1,
+ stream=qee_stream,
):
pvs = make_pvs
@@ -439,7 +454,9 @@ def BpToMajoMu_MajoToEPi_LL_Loose_line(
@register_line_builder(all_lines)
def BpToMajoE_MajoToMuPi_LL_Loose_line(
- name="Hlt2QEE_BpToMajoE_MajoToMuPi_LL_Loose", prescale=1, stream=qee_stream,
+ name="Hlt2QEE_BpToMajoE_MajoToMuPi_LL_Loose",
+ prescale=1,
+ stream=qee_stream,
):
pvs = make_pvs
@@ -488,7 +505,9 @@ def BpToMajoE_MajoToMuPi_LL_Loose_line(
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_DD_Loose_line(
- name="Hlt2QEE_BpToMajoMu_MajoToEPi_DD_Loose", prescale=1, stream=qee_stream,
+ name="Hlt2QEE_BpToMajoMu_MajoToEPi_DD_Loose",
+ prescale=1,
+ stream=qee_stream,
):
pvs = make_pvs
@@ -543,7 +562,9 @@ def BpToMajoMu_MajoToEPi_DD_Loose_line(
@register_line_builder(all_lines)
def BpToMajoE_MajoToMuPi_DD_Loose_line(
- name="Hlt2QEE_BpToMajoE_MajoToMuPi_DD_Loose", prescale=1, stream=qee_stream,
+ name="Hlt2QEE_BpToMajoE_MajoToMuPi_DD_Loose",
+ prescale=1,
+ stream=qee_stream,
):
pvs = make_pvs
@@ -598,7 +619,11 @@ def BpToMajoE_MajoToMuPi_DD_Loose_line(
@register_line_builder(all_lines)
-def BuToKs0Pi_Ks0ToPiPi_LL_line(name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_LL", prescale=1, stream=qee_stream,):
+def BuToKs0Pi_Ks0ToPiPi_LL_line(
+ name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_LL",
+ prescale=1,
+ stream=qee_stream,
+):
pvs = make_pvs
b_pions = make_majorana_lepton(
@@ -633,7 +658,11 @@ def BuToKs0Pi_Ks0ToPiPi_LL_line(name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_LL", prescale=
@register_line_builder(all_lines)
-def BuToKs0Pi_Ks0ToPiPi_DD_line(name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_DD", prescale=1, stream=qee_stream,):
+def BuToKs0Pi_Ks0ToPiPi_DD_line(
+ name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_DD",
+ prescale=1,
+ stream=qee_stream,
+):
pvs = make_pvs
long_pions = make_majorana_lepton(
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
index 415f2f46f53..e71e68d13da 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
@@ -27,7 +27,8 @@ from RecoConf.standard_particles import make_down_pions
turbo_lines = {}
# Sending the 'Hlt2QEE_DownstreamBuScaInclusive2H_DD{,_ss}' lines to the 'qee_low' stream
-qee_stream = 'qeelow'
+qee_stream = "qeelow"
+
@configurable
def make_DownstreamBuScaInclusive2H_DD(
@@ -68,7 +69,9 @@ def make_DownstreamBuScaInclusive2H_DD(
@register_line_builder(turbo_lines)
@configurable
def DownstreamBuScaInclusive2H_DD(
- name="Hlt2QEE_DownstreamBuScaInclusive2H_DD", prescale=1.0, stream=qee_stream,
+ name="Hlt2QEE_DownstreamBuScaInclusive2H_DD",
+ prescale=1.0,
+ stream=qee_stream,
):
# We actually doesn't require any PID cuts, so it's inclusive
algs = (
@@ -89,7 +92,9 @@ def DownstreamBuScaInclusive2H_DD(
@register_line_builder(turbo_lines)
@configurable
def DownstreamBuScaInclusive2H_DD_same_sign(
- name="Hlt2QEE_DownstreamBuScaInclusive2H_DD_same_sign", prescale=1.0, stream=qee_stream
+ name="Hlt2QEE_DownstreamBuScaInclusive2H_DD_same_sign",
+ prescale=1.0,
+ stream=qee_stream,
):
# We actually doesn't require any PID cuts, so it's inclusive
algs = (
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
index 167e4e588c9..700f3e3a213 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
@@ -28,7 +28,8 @@ turbo_lines = {}
full_lines = {}
# Setting the default stream the lines will be sent to
-qee_stream = 'qeelow'
+qee_stream = "qeelow"
+
def filter_muons(particles, pvs, min_ipchi2, pid_mu, p_min=5 * GeV):
cut = require_all(
@@ -83,9 +84,11 @@ def make_dimuons(
@register_line_builder(turbo_lines)
-def dimuonnoip_line(name="Hlt2QEE_DiMuonNoIP", prescale=1,
- stream='qee' # Hlt2QEE_DiMuonNoIP line is well above 10 MB/s thus it must go to 'qee' stream
- ):
+def dimuonnoip_line(
+ name="Hlt2QEE_DiMuonNoIP",
+ prescale=1,
+ stream="qee", # Hlt2QEE_DiMuonNoIP line is well above 10 MB/s thus it must go to 'qee' stream
+):
pvs = make_pvs()
dimuonnoip = make_dimuons(pvs)
return Hlt2Line(
@@ -98,9 +101,11 @@ def dimuonnoip_line(name="Hlt2QEE_DiMuonNoIP", prescale=1,
@register_line_builder(turbo_lines)
-def displaceddimuon_line(name="Hlt2QEE_DisplacedDiMuon", prescale=1,
- stream='qee' # Hlt2QEE_DisplacedDiMuon line is above 10 MB/s thus it must go to 'qee' stream
- ):
+def displaceddimuon_line(
+ name="Hlt2QEE_DisplacedDiMuon",
+ prescale=1,
+ stream="qee", # Hlt2QEE_DisplacedDiMuon line is above 10 MB/s thus it must go to 'qee' stream
+):
pvs = make_pvs()
dimuonnoip = make_dimuons(pvs, min_ipchi2=16, ownpvvdchi2_min=30)
return Hlt2Line(
@@ -112,7 +117,9 @@ def displaceddimuon_line(name="Hlt2QEE_DisplacedDiMuon", prescale=1,
@register_line_builder(turbo_lines)
-def dimuonnoip_massrange1_ss_line(name="Hlt2QEE_DiMuonNoIP_ss", prescale=0.1, stream=qee_stream):
+def dimuonnoip_massrange1_ss_line(
+ name="Hlt2QEE_DiMuonNoIP_ss", prescale=0.1, stream=qee_stream
+):
pvs = make_pvs()
dimuonnoip = make_dimuons(pvs, opposite_sign=False)
return Hlt2Line(
@@ -125,7 +132,9 @@ def dimuonnoip_massrange1_ss_line(name="Hlt2QEE_DiMuonNoIP_ss", prescale=0.1, st
@register_line_builder(turbo_lines)
-def displaceddimuon_ss_line(name="Hlt2QEE_DisplacedDiMuon_ss", prescale=0.1, stream=qee_stream):
+def displaceddimuon_ss_line(
+ name="Hlt2QEE_DisplacedDiMuon_ss", prescale=0.1, stream=qee_stream
+):
pvs = make_pvs()
dimuonnoip = make_dimuons(
pvs, min_ipchi2=16, ownpvvdchi2_min=30, opposite_sign=False
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/diphoton.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/diphoton.py
index 27ab9cc6fb5..83af64c2e85 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/diphoton.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/diphoton.py
@@ -31,7 +31,8 @@ from Hlt2Conf.lines.qee.qee_builders import parent_isolation_output
all_lines = {}
# Setting the default stream the lines will be sent to
-qee_stream = 'qeelow'
+qee_stream = "qeelow"
+
@configurable
def filter_qee_photons(
@@ -95,7 +96,10 @@ def make_diphoton(
@register_line_builder(all_lines)
def Hlt2_ALPsToGammaGamma(
- name="Hlt2QEE_ALPsToGammaGamma", prescale=1, persistreco=False, stream=qee_stream,
+ name="Hlt2QEE_ALPsToGammaGamma",
+ prescale=1,
+ persistreco=False,
+ stream=qee_stream,
):
"""
Register B2GammaGamma/ALPs2GammaGamma line
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py
index 1fe5132748f..4ba5a9a3b97 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py
@@ -47,7 +47,8 @@ mass_ranges = [
# sixth argument: use softer muons
# Setting the default stream the lines will be sent to
-qee_stream = 'qeelow'
+qee_stream = "qeelow"
+
@configurable
def filter_muons(
@@ -162,10 +163,13 @@ for is_ss in [True, False]:
min_pidmu=min_pidmu,
stream=qee_stream,
):
-
# Hlt2QEE_DiMuon_DrellYan_VLowMass_OS_Prompt and Hlt2QEE_DiMuon_DrellYan_LowMass_OS_Prompt have an higher bandwidth than 10 MB/s
- if mass_range[2] in ['VLowMass', 'LowMass'] and not is_ss and not displaced:
- stream = 'qee'
+ if (
+ mass_range[2] in ["VLowMass", "LowMass"]
+ and not is_ss
+ and not displaced
+ ):
+ stream = "qee"
pvs = make_pvs()
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan_pp_ref_2024.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan_pp_ref_2024.py
index fa1a83aa21c..967403f0306 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan_pp_ref_2024.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan_pp_ref_2024.py
@@ -39,7 +39,7 @@ from RecoConf.standard_particles import make_ismuon_long_muon
all_lines = {}
# Setting the default stream the lines will be sent to
-qee_stream = 'qeelow'
+qee_stream = "qeelow"
### Line configuration
mass_ranges = [
@@ -169,10 +169,13 @@ for is_ss in [True, False]:
min_pidmu=min_pidmu,
stream=qee_stream,
):
-
# Hlt2QEE_DiMuon_DrellYan_VLowMass_OS_Prompt and Hlt2QEE_DiMuon_DrellYan_LowMass_OS_Prompt have an higher bandwidth than 10 MB/s
- if mass_range[2] in ['VLowMass', 'LowMass'] and not is_ss and not displaced:
- stream = 'qee'
+ if (
+ mass_range[2] in ["VLowMass", "LowMass"]
+ and not is_ss
+ and not displaced
+ ):
+ stream = "qee"
pvs = make_pvs()
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
index 3a4bfb94556..3c6b478d601 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
@@ -27,7 +27,10 @@ full_lines = {}
turbo_lines = {}
# Setting the default stream the lines will be sent to
-qee_stream = 'qee' # The 'Hlt2QEE_MDS_BDT_nHits_Turbo' line has an higher bandwidth than 10 MB/s
+qee_stream = (
+ "qee" # The 'Hlt2QEE_MDS_BDT_nHits_Turbo' line has an higher bandwidth than 10 MB/s
+)
+
def mds_BDT_Monitoring(mva, prescale=0.1, line_type="full"):
prescaler = DeterministicPrescaler(
@@ -63,7 +66,11 @@ mva_config = {
@register_line_builder(turbo_lines)
@configurable
def mds_BDT_nHits_line_turbo(
- name="Hlt2QEE_MDS_BDT_nHits_Turbo", MVACut=0.995, prescale=1.0, persistreco=False, stream=qee_stream,
+ name="Hlt2QEE_MDS_BDT_nHits_Turbo",
+ MVACut=0.995,
+ prescale=1.0,
+ persistreco=False,
+ stream=qee_stream,
):
muon_hits = make_muon_hits()
inputs = {
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py
index bf402393baa..15c2213cdb2 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py
@@ -126,7 +126,10 @@ def make_upsilon():
@register_line_builder(all_lines)
@configurable
def jpsi_to_mu_mu_detached_line(
- name="Hlt2QEE_JpsiToMuMu_Detached", prescale=1, persistreco=False, stream='qee',
+ name="Hlt2QEE_JpsiToMuMu_Detached",
+ prescale=1,
+ persistreco=False,
+ stream="qee",
):
"""Jpsi (Detached) decay to two muons line"""
jpsi = make_jpsi(min_ownpvdls=3.0)
@@ -143,7 +146,7 @@ def jpsi_to_mu_mu_detached_line(
@register_line_builder(all_lines)
@configurable
def jpsi_to_mu_mu_prompt_line(
- name="Hlt2QEE_JpsiToMuMu_Prompt", prescale=0.1, persistreco=False, stream='qeelow'
+ name="Hlt2QEE_JpsiToMuMu_Prompt", prescale=0.1, persistreco=False, stream="qeelow"
):
"""Jpsi (Prompt) decay to two muons line"""
jpsi = make_jpsi(max_ownpvdls=3.0)
@@ -160,7 +163,7 @@ def jpsi_to_mu_mu_prompt_line(
@register_line_builder(all_lines)
@configurable
def upsilon_to_mu_mu_line(
- name="Hlt2QEE_Upsilon1SToMuMu", prescale=1, persistreco=False, stream='qeelow'
+ name="Hlt2QEE_Upsilon1SToMuMu", prescale=1, persistreco=False, stream="qeelow"
):
"""Upsilon(1S) decay to two muons line"""
u1s = make_upsilon()
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
index 3d9d5f97a2a..a19669e7a3f 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
@@ -49,7 +49,7 @@ from RecoConf.standard_particles import (
all_lines = {}
# Setting the default stream the lines will be sent to
-qee_stream = 'qeelow'
+qee_stream = "qeelow"
#########################
### template builders ###
@@ -407,21 +407,39 @@ line_args = {
"ProtonToLambda0Kp_DDl": LineConf("L0Kp", "DDl", 1.0, [True, False], qee_stream),
"ProtonToLambda0Kp_DDd": LineConf("L0Kp", "DDd", 1.0, [True, True], qee_stream),
# L0Ks
- "NeutronToLambda0KS_LLLL": LineConf("L0Ks", "LLLL", 1.0, [False, False], qee_stream),
+ "NeutronToLambda0KS_LLLL": LineConf(
+ "L0Ks", "LLLL", 1.0, [False, False], qee_stream
+ ),
"NeutronToLambda0KS_LLDD": LineConf("L0Ks", "LLDD", 1.0, [False, True], qee_stream),
"NeutronToLambda0KS_DDLL": LineConf("L0Ks", "DDLL", 1.0, [True, False], qee_stream),
"NeutronToLambda0KS_DDDD": LineConf("L0Ks", "DDDD", 1.0, [True, True], qee_stream),
# L0L0
- "NucleonToLambda0Lambda0_LLLL": LineConf("L0L0", "LLLL", 1.0, [False, False], qee_stream),
- "NucleonToLambda0Lambda0_LLDD": LineConf("L0L0", "LLDD", 1.0, [False, True], qee_stream),
- "NucleonToLambda0Lambda0_DDDD": LineConf("L0L0", "DDDD", 1.0, [True, True], qee_stream),
+ "NucleonToLambda0Lambda0_LLLL": LineConf(
+ "L0L0", "LLLL", 1.0, [False, False], qee_stream
+ ),
+ "NucleonToLambda0Lambda0_LLDD": LineConf(
+ "L0L0", "LLDD", 1.0, [False, True], qee_stream
+ ),
+ "NucleonToLambda0Lambda0_DDDD": LineConf(
+ "L0L0", "DDDD", 1.0, [True, True], qee_stream
+ ),
# KpKp
- "NucleonToKpKpPim_ll": LineConf("KpKpPim", "ll", 0.25, [False, False, False], qee_stream),
- "NucleonToKpKpPim_dd": LineConf("KpKpPim", "dd", 0.5, [True, True, True], 'qee'), # This line fires more than 10 MB/s
+ "NucleonToKpKpPim_ll": LineConf(
+ "KpKpPim", "ll", 0.25, [False, False, False], qee_stream
+ ),
+ "NucleonToKpKpPim_dd": LineConf(
+ "KpKpPim", "dd", 0.5, [True, True, True], "qee"
+ ), # This line fires more than 10 MB/s
# KsKp
- "NucleonToKS0KpPim_LLl": LineConf("KsKpPim", "LLl", 1.0, [False, False, False], qee_stream),
- "NucleonToKS0KpPim_DDl": LineConf("KsKpPim", "DDl", 1.0, [True, False, False], qee_stream),
- "NucleonToKS0KpPim_DDd": LineConf("KsKpPim", "DDd", 1.0, [True, True, True], 'qee'), # This line fires more than 10 MB/s
+ "NucleonToKS0KpPim_LLl": LineConf(
+ "KsKpPim", "LLl", 1.0, [False, False, False], qee_stream
+ ),
+ "NucleonToKS0KpPim_DDl": LineConf(
+ "KsKpPim", "DDl", 1.0, [True, False, False], qee_stream
+ ),
+ "NucleonToKS0KpPim_DDd": LineConf(
+ "KsKpPim", "DDd", 1.0, [True, True, True], "qee"
+ ), # This line fires more than 10 MB/s
# KsKs
"NucleonToKSKS_LLLL": LineConf("KsKs", "LLLL", 0.01, [False, False], qee_stream),
"NucleonToKSKS_LLDD": LineConf("KsKscc", "LLDD", 0.01, [False, True], qee_stream),
@@ -475,8 +493,9 @@ for sfx, line_config in line_args.items():
@register_line_builder(all_lines)
def sexaquark_line(
- name=f"Hlt2QEE_Sexaquark{sfx}", prescale=line_config.prescale,
- turbostream = line_config.turbostream # Needed to pick the correct stream for each line
+ name=f"Hlt2QEE_Sexaquark{sfx}",
+ prescale=line_config.prescale,
+ turbostream=line_config.turbostream, # Needed to pick the correct stream for each line
):
sexaquarks = make_sexaquark(
name=f"qee_make_S_to_{line_config.process}_{line_config.stream}"
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/wz_boson_rare_decays.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/wz_boson_rare_decays.py
index b53d6b38d6f..093cddfa478 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/wz_boson_rare_decays.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/wz_boson_rare_decays.py
@@ -38,10 +38,11 @@ from Hlt2Conf.standard_jets import make_jets
all_lines = {}
# Setting the default stream the lines will be sent to
-qee_stream = 'qeelow'
+qee_stream = "qeelow"
_default_monitoring_variables = ("pt", "eta", "n_candidates", "ipchi2", "vchi2")
+
@configurable
def make_EW_pions(pvs, p_min=1 * GeV, min_pt=1 * GeV, p_pidk_max=5.0, mipchi2_min=0):
code = F.require_all(
@@ -686,7 +687,9 @@ def make_WZRareDecay_DiMuonMeson_cand(pvs, decay_type="JPsiDsp"):
@register_line_builder(all_lines)
@configurable
-def Dimuon_PhiDsp_line(name="Hlt2QEE_WZRareJPsiPhiDsp", prescale=1, persistreco=False, stream=qee_stream):
+def Dimuon_PhiDsp_line(
+ name="Hlt2QEE_WZRareJPsiPhiDsp", prescale=1, persistreco=False, stream=qee_stream
+):
"""W+ -> Jpsi phi(1020) Ds+ line"""
pvs = make_pvs()
@@ -769,8 +772,8 @@ for decay_type in [
stream=qee_stream,
):
# Change the stream for 'Hlt2QEE_WZRareJetGamma' because it has a BW higher than 10 MB/s
- if decay_type == 'JetGamma' and line_suffix == '':
- stream='qee'
+ if decay_type == "JetGamma" and line_suffix == "":
+ stream = "qee"
f"""{decay_type} ({photon_type} photons) line"""
--
GitLab
From 0b615bcf70dbb0751efe310184825c553467b0bb Mon Sep 17 00:00:00 2001
From: Pasquale Andreola <paandr@farm-gpu2.physik.uzh.ch>
Date: Thu, 27 Mar 2025 12:56:32 +0100
Subject: [PATCH 03/19] Fixing conflicts and rebasing
---
.../python/Hlt2Conf/lines/qee/ttrack_llps.py | 26 ++++++-------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
index a6163490a6a..b8e56b760c6 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
@@ -45,7 +45,7 @@ turbo_lines = {}
full_lines = {}
# Setting the default stream the lines will be sent to
-qee_stream = "qeelow"
+qee_stream = 'qeelow'
########################
### Dark Higgs modes ###
@@ -54,9 +54,7 @@ qee_stream = "qeelow"
@register_line_builder(turbo_lines)
@configurable
-def qee_BtoKH_KK_exclTT(
- name="Hlt2QEE_BtoKH_KK_exclTT", prescale=0.008, stream=qee_stream
-):
+def qee_BtoKH_KK_exclTT(name="Hlt2QEE_BtoKH_KK_exclTT", prescale=0.008, stream=qee_stream):
pvs = make_pvs()
filtered_long_kaons = qee_filtered_long_kaons()
dikaon = make_XtoTT_kaons(pvs)
@@ -76,9 +74,7 @@ def qee_BtoKH_KK_exclTT(
@register_line_builder(turbo_lines)
@configurable
-def qee_BtoKstar0H_KK_exclTT(
- name="Hlt2QEE_BtoKstar0H_KK_exclTT", prescale=0.01, stream=qee_stream
-):
+def qee_BtoKstar0H_KK_exclTT(name="Hlt2QEE_BtoKstar0H_KK_exclTT", prescale=0.01, stream=qee_stream):
pvs = make_pvs()
long_kstars = make_qee_detached_kstar0s()
dikaon = make_XtoTT_kaons(pvs)
@@ -170,9 +166,7 @@ def qee_HtoMuMu_samesignDD(name="Hlt2QEE_HtoMuMu_samesignDDFull", prescale=0.1):
### HNL Exclusive Lines
@register_line_builder(turbo_lines)
@configurable
-def qee_BtoMuN_PiMu_exclTT(
- name="Hlt2QEE_BtoMuN_PiMu_exclTT", prescale=1.0, stream=qee_stream
-):
+def qee_BtoMuN_PiMu_exclTT(name="Hlt2QEE_BtoMuN_PiMu_exclTT", prescale=1.0, stream=qee_stream):
pvs = make_pvs()
long_muons = make_qee_detached_muons()
hnl = make_XtoTT_pimu(pvs)
@@ -192,9 +186,7 @@ def qee_BtoMuN_PiMu_exclTT(
@register_line_builder(turbo_lines)
@configurable
-def qee_BctoMuN_PiMu_exclTT(
- name="Hlt2QEE_BctoMuN_PiMu_exclTT", prescale=1.0, stream=qee_stream
-):
+def qee_BctoMuN_PiMu_exclTT(name="Hlt2QEE_BctoMuN_PiMu_exclTT", prescale=1.0, stream=qee_stream):
pvs = make_pvs()
long_muons = make_qee_detached_muons()
hnl = make_XtoTT_pimu(pvs)
@@ -248,11 +240,9 @@ def qee_NtoPiMu_inclTT(name="Hlt2QEE_N_PiMu_inclTT", prescale=1, stream=qee_stre
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoPiMu_SS_inclTT(
- name="Hlt2QEE_N_PiMu_SS_inclTT", prescale=0.1, stream=qee_stream
-):
- """A line to select the [N -> pi+ mu+]CC (i.e. same sign; SS) decay as a background control selection
- for the [B -> X mu (N -> pi mu)] decay"""
+def qee_NtoMuMuNu_inclTT(name="Hlt2QEE_N_MuMuNu_inclTT", prescale=1, stream=qee_stream):
+ """A line to select the [N -> mu+ mu- nu_mu]CC decay for an inclusive selection
+ for the [B -> X mu (N -> mu mu nu)] decay"""
pvs = make_pvs()
--
GitLab
From 496822fb07a5f71203b534eff4f8ce6b1908dc28 Mon Sep 17 00:00:00 2001
From: Gitlab CI <noreply@cern.ch>
Date: Wed, 26 Mar 2025 14:27:51 +0000
Subject: [PATCH 04/19] Fixing additional conflict
---
.../python/Hlt2Conf/lines/qee/ttrack_llps.py | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
index b8e56b760c6..2fab1eaa8bd 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
@@ -45,7 +45,7 @@ turbo_lines = {}
full_lines = {}
# Setting the default stream the lines will be sent to
-qee_stream = 'qeelow'
+qee_stream = "qeelow"
########################
### Dark Higgs modes ###
@@ -54,7 +54,9 @@ qee_stream = 'qeelow'
@register_line_builder(turbo_lines)
@configurable
-def qee_BtoKH_KK_exclTT(name="Hlt2QEE_BtoKH_KK_exclTT", prescale=0.008, stream=qee_stream):
+def qee_BtoKH_KK_exclTT(
+ name="Hlt2QEE_BtoKH_KK_exclTT", prescale=0.008, stream=qee_stream
+):
pvs = make_pvs()
filtered_long_kaons = qee_filtered_long_kaons()
dikaon = make_XtoTT_kaons(pvs)
@@ -74,7 +76,9 @@ def qee_BtoKH_KK_exclTT(name="Hlt2QEE_BtoKH_KK_exclTT", prescale=0.008, stream=q
@register_line_builder(turbo_lines)
@configurable
-def qee_BtoKstar0H_KK_exclTT(name="Hlt2QEE_BtoKstar0H_KK_exclTT", prescale=0.01, stream=qee_stream):
+def qee_BtoKstar0H_KK_exclTT(
+ name="Hlt2QEE_BtoKstar0H_KK_exclTT", prescale=0.01, stream=qee_stream
+):
pvs = make_pvs()
long_kstars = make_qee_detached_kstar0s()
dikaon = make_XtoTT_kaons(pvs)
@@ -166,7 +170,9 @@ def qee_HtoMuMu_samesignDD(name="Hlt2QEE_HtoMuMu_samesignDDFull", prescale=0.1):
### HNL Exclusive Lines
@register_line_builder(turbo_lines)
@configurable
-def qee_BtoMuN_PiMu_exclTT(name="Hlt2QEE_BtoMuN_PiMu_exclTT", prescale=1.0, stream=qee_stream):
+def qee_BtoMuN_PiMu_exclTT(
+ name="Hlt2QEE_BtoMuN_PiMu_exclTT", prescale=1.0, stream=qee_stream
+):
pvs = make_pvs()
long_muons = make_qee_detached_muons()
hnl = make_XtoTT_pimu(pvs)
@@ -186,7 +192,9 @@ def qee_BtoMuN_PiMu_exclTT(name="Hlt2QEE_BtoMuN_PiMu_exclTT", prescale=1.0, stre
@register_line_builder(turbo_lines)
@configurable
-def qee_BctoMuN_PiMu_exclTT(name="Hlt2QEE_BctoMuN_PiMu_exclTT", prescale=1.0, stream=qee_stream):
+def qee_BctoMuN_PiMu_exclTT(
+ name="Hlt2QEE_BctoMuN_PiMu_exclTT", prescale=1.0, stream=qee_stream
+):
pvs = make_pvs()
long_muons = make_qee_detached_muons()
hnl = make_XtoTT_pimu(pvs)
--
GitLab
From e854782579e897e3187f56ba6a4a14dde4ece616 Mon Sep 17 00:00:00 2001
From: Gitlab CI <noreply@cern.ch>
Date: Thu, 27 Mar 2025 13:56:48 +0000
Subject: [PATCH 05/19] pre-commit fixes
patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/53439609
---
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
index 2fab1eaa8bd..91cbe0c185d 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
@@ -307,13 +307,15 @@ def qee_NtoEMuNu_inclTT(name="Hlt2QEE_N_EMuNu_inclTT", prescale=1, stream=qee_st
prescale=prescale,
raw_banks=DETECTORS,
extra_outputs=[("ISMUON_long_muons", long_muons)],
- stream=stream
+ stream=stream,
)
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoEMuNu_SS_inclTT(name="Hlt2QEE_N_EMuNu_SS_inclTT", prescale=0.1, stream=qee_stream):
+def qee_NtoEMuNu_SS_inclTT(
+ name="Hlt2QEE_N_EMuNu_SS_inclTT", prescale=0.1, stream=qee_stream
+):
"""A line to select the [N -> e+ mu+ nu_mu]CC (i.e. same sign; SS) decay as a background control
selection for the [B -> X mu (N -> e mu nu)] decay"""
@@ -379,7 +381,9 @@ def qee_NtoMuMuNu_inclTT(name="Hlt2QEE_N_MuMuNu_inclTT", prescale=1, stream=qee_
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoMuMuNu_SS_inclTT(name="Hlt2QEE_N_MuMuNu_SS_inclTT", prescale=0.1, stream=qee_stream):
+def qee_NtoMuMuNu_SS_inclTT(
+ name="Hlt2QEE_N_MuMuNu_SS_inclTT", prescale=0.1, stream=qee_stream
+):
"""A line to select the [N -> mu+ mu+ nu_mu]CC (i.e. same sign; SS) decay as a background control
for the [B -> X mu (N -> mu mu nu)] decay"""
--
GitLab
From 8fd16cda018de75b70c251a711d4d5d66e11e7f5 Mon Sep 17 00:00:00 2001
From: Pasquale Andreola <pasquale.andreola@cern.ch>
Date: Thu, 27 Mar 2025 14:07:59 +0000
Subject: [PATCH 06/19] Fixing the qee_NtoPiMu_SS_inclTT line
---
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
index 91cbe0c185d..8ef84b47b9b 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
@@ -248,9 +248,9 @@ def qee_NtoPiMu_inclTT(name="Hlt2QEE_N_PiMu_inclTT", prescale=1, stream=qee_stre
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoMuMuNu_inclTT(name="Hlt2QEE_N_MuMuNu_inclTT", prescale=1, stream=qee_stream):
- """A line to select the [N -> mu+ mu- nu_mu]CC decay for an inclusive selection
- for the [B -> X mu (N -> mu mu nu)] decay"""
+def qee_NtoPiMu_SS_inclTT(name="Hlt2QEE_N_PiMu_SS_inclTT", prescale=0.1, stream=qee_stream):
+ """A line to select the [N -> pi+ mu+]CC (i.e. same sign; SS) decay as a background control selection
+ for the [B -> X mu (N -> pi mu)] decay"""
pvs = make_pvs()
--
GitLab
From 2923959cffae761b55a82f5d00d5abc01a090742 Mon Sep 17 00:00:00 2001
From: Gitlab CI <noreply@cern.ch>
Date: Thu, 27 Mar 2025 14:09:08 +0000
Subject: [PATCH 07/19] pre-commit fixes
patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/53441309
---
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
index 8ef84b47b9b..dd668c269e8 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
@@ -248,7 +248,9 @@ def qee_NtoPiMu_inclTT(name="Hlt2QEE_N_PiMu_inclTT", prescale=1, stream=qee_stre
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoPiMu_SS_inclTT(name="Hlt2QEE_N_PiMu_SS_inclTT", prescale=0.1, stream=qee_stream):
+def qee_NtoPiMu_SS_inclTT(
+ name="Hlt2QEE_N_PiMu_SS_inclTT", prescale=0.1, stream=qee_stream
+):
"""A line to select the [N -> pi+ mu+]CC (i.e. same sign; SS) decay as a background control selection
for the [B -> X mu (N -> pi mu)] decay"""
--
GitLab
From 88522daae262641a3d00a68cbb686020378b75cf Mon Sep 17 00:00:00 2001
From: Pasquale Andreola <paandr@farm-gpu2.physik.uzh.ch>
Date: Fri, 28 Mar 2025 14:43:08 +0100
Subject: [PATCH 08/19] Reverting old lines to the original state
---
.../lines/qee/b_to_majolep_majo_to_leplep.py | 20 +------
.../lines/qee/b_to_majolep_majo_to_leppi.py | 57 ++++---------------
.../python/Hlt2Conf/lines/qee/busca.py | 5 +-
.../python/Hlt2Conf/lines/qee/dimuon_no_ip.py | 16 +-----
.../python/Hlt2Conf/lines/qee/diphoton.py | 9 +--
.../python/Hlt2Conf/lines/qee/quarkonia.py | 12 +---
.../python/Hlt2Conf/lines/qee/sexaquark.py | 19 ++++---
.../python/Hlt2Conf/lines/qee/ttrack_llps.py | 21 ++-----
.../lines/qee/wz_boson_rare_decays.py | 17 +-----
9 files changed, 37 insertions(+), 139 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leplep.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leplep.py
index be9b0310fbe..322294c6ac5 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leplep.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leplep.py
@@ -169,9 +169,7 @@ def build_cut_on_track(cutDict, pvs, corrm=False):
return buildFromList(listOfFunctors)
-def builder_BToMajoL_line(
- name, bachelorName, children, stream, cutDict=None, prescale=1
-):
+def builder_BToMajoL_line(name, bachelorName, children, cutDict=None, prescale=1):
if cutDict is None:
cutDict = {}
@@ -252,7 +250,6 @@ def builder_BToMajoL_line(
algs=hnl_prefilter(require_GEC=True) + [b2LN] + mons,
prescale=prescale,
monitoring_variables=_HNL_DEFAULT_MONITORING_VARIABLES,
- stream=stream,
)
@@ -261,20 +258,8 @@ for recoMode in ["LL", "DD"]:
for children in [("mu", "mu"), ("mu", "e"), ("e", "mu"), ("e", "e")]:
name = f"Hlt2QEE_BpToMajo{bachelor.capitalize()}_MajoTo{children[0].capitalize()}{children[1].capitalize()}_{recoMode}_Tight"
- # Sending the Hlt2QEE_BpToMajoE_MajoToEE_LL_Tight line to the 'qee' stream and the others to the 'qeelow' stream
- qee_stream = "qeelow"
- if (
- bachelor == "e"
- and children[0] == "e"
- and children[1] == "e"
- and recoMode == "LL"
- ):
- qee_stream = "qee"
-
@register_line_builder(all_lines)
- def make_line(
- name=name, bachelor=bachelor, children=children, stream=qee_stream
- ):
+ def make_line(name=name, bachelor=bachelor, children=children):
return builder_BToMajoL_line(
name,
bachelor,
@@ -287,5 +272,4 @@ for recoMode in ["LL", "DD"]:
"FDCHI2MIN": 3000,
},
},
- stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
index af8fbb86cf6..c1707a360df 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
@@ -69,15 +69,12 @@ from Hlt2Conf.lines.qee.qee_builders import (
all_lines = {}
_HNL_MONITORING_VARIABLES = ("pt", "eta", "vchi2", "ipchi2", "n_candidates")
-# Sending the 'Hlt2QEE_BpToMajoMu_MajoTo{lepton}{pion}' lines to the 'qee_low' stream
+# Sending the 'Hlt2QEE_BpToMajo{lepton}_MajoTo{lepton}{pion}' lines to the 'qee_low' stream
qee_stream = "qeelow"
-
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_LL_Tight_line(
- name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Tight",
- prescale=1,
- stream=qee_stream,
+ name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Tight", prescale=1
):
pvs = make_pvs
@@ -123,15 +120,12 @@ def BpToMajoMu_MajoToEPi_LL_Tight_line(
algs=hnl_prefilter() + [majoranas2piE, b2MuN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
- stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoE_MajoToMuPi_LL_Tight_line(
- name="Hlt2QEE_BpToMajoE_MajoToMuPi_LL_Tight",
- prescale=1,
- stream=qee_stream,
+ name="Hlt2QEE_BpToMajoE_MajoToMuPi_LL_Tight", prescale=1
):
pvs = make_pvs
@@ -174,7 +168,6 @@ def BpToMajoE_MajoToMuPi_LL_Tight_line(
algs=hnl_prefilter() + [majoranas2piMu, b2EN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
- stream=stream,
)
@@ -285,9 +278,7 @@ def BpToMajoE_MajoToEPi_LL_Tight_line(
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_DD_Tight_line(
- name="Hlt2QEE_BpToMajoMu_MajoToEPi_DD_Tight",
- prescale=1,
- stream=qee_stream,
+ name="Hlt2QEE_BpToMajoMu_MajoToEPi_DD_Tight", prescale=1
):
pvs = make_pvs
@@ -336,15 +327,12 @@ def BpToMajoMu_MajoToEPi_DD_Tight_line(
algs=hnl_prefilter() + [majoranas2piE, b2MuN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
- stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoE_MajoToMuPi_DD_Tight_line(
- name="Hlt2QEE_BpToMajoE_MajoToMuPi_DD_Tight",
- prescale=1,
- stream=qee_stream,
+ name="Hlt2QEE_BpToMajoE_MajoToMuPi_DD_Tight", prescale=1
):
pvs = make_pvs
@@ -394,15 +382,12 @@ def BpToMajoE_MajoToMuPi_DD_Tight_line(
algs=hnl_prefilter() + [majoranas2piMu, b2EN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
- stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_LL_Loose_line(
- name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Loose",
- prescale=1,
- stream=qee_stream,
+ name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Loose", prescale=1
):
pvs = make_pvs
@@ -448,15 +433,12 @@ def BpToMajoMu_MajoToEPi_LL_Loose_line(
algs=hnl_prefilter() + [majoranas2piE, b2MuN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
- stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoE_MajoToMuPi_LL_Loose_line(
- name="Hlt2QEE_BpToMajoE_MajoToMuPi_LL_Loose",
- prescale=1,
- stream=qee_stream,
+ name="Hlt2QEE_BpToMajoE_MajoToMuPi_LL_Loose", prescale=1
):
pvs = make_pvs
@@ -499,15 +481,12 @@ def BpToMajoE_MajoToMuPi_LL_Loose_line(
algs=hnl_prefilter() + [majoranas2piMu, b2EN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
- stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_DD_Loose_line(
- name="Hlt2QEE_BpToMajoMu_MajoToEPi_DD_Loose",
- prescale=1,
- stream=qee_stream,
+ name="Hlt2QEE_BpToMajoMu_MajoToEPi_DD_Loose", prescale=1
):
pvs = make_pvs
@@ -556,15 +535,12 @@ def BpToMajoMu_MajoToEPi_DD_Loose_line(
algs=hnl_prefilter() + [majoranas2piE, b2MuN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
- stream=stream,
)
@register_line_builder(all_lines)
def BpToMajoE_MajoToMuPi_DD_Loose_line(
- name="Hlt2QEE_BpToMajoE_MajoToMuPi_DD_Loose",
- prescale=1,
- stream=qee_stream,
+ name="Hlt2QEE_BpToMajoE_MajoToMuPi_DD_Loose", prescale=1
):
pvs = make_pvs
@@ -614,16 +590,11 @@ def BpToMajoE_MajoToMuPi_DD_Loose_line(
algs=hnl_prefilter() + [majoranas2piMu, b2EN],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
- stream=stream,
)
@register_line_builder(all_lines)
-def BuToKs0Pi_Ks0ToPiPi_LL_line(
- name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_LL",
- prescale=1,
- stream=qee_stream,
-):
+def BuToKs0Pi_Ks0ToPiPi_LL_line(name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_LL", prescale=1):
pvs = make_pvs
b_pions = make_majorana_lepton(
@@ -653,16 +624,11 @@ def BuToKs0Pi_Ks0ToPiPi_LL_line(
algs=hnl_prefilter() + [Ks2pipi, b2Ks0Pi],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
- stream=stream,
)
@register_line_builder(all_lines)
-def BuToKs0Pi_Ks0ToPiPi_DD_line(
- name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_DD",
- prescale=1,
- stream=qee_stream,
-):
+def BuToKs0Pi_Ks0ToPiPi_DD_line(name="Hlt2QEE_BuToKs0Pi_Ks0ToPiPi_DD", prescale=1):
pvs = make_pvs
long_pions = make_majorana_lepton(
@@ -691,5 +657,4 @@ def BuToKs0Pi_Ks0ToPiPi_DD_line(
algs=hnl_prefilter() + [Ks2pipi, b2Ks0Pi],
prescale=prescale,
monitoring_variables=_HNL_MONITORING_VARIABLES,
- stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
index e71e68d13da..ee67d5c7c3e 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
@@ -69,9 +69,7 @@ def make_DownstreamBuScaInclusive2H_DD(
@register_line_builder(turbo_lines)
@configurable
def DownstreamBuScaInclusive2H_DD(
- name="Hlt2QEE_DownstreamBuScaInclusive2H_DD",
- prescale=1.0,
- stream=qee_stream,
+ name="Hlt2QEE_DownstreamBuScaInclusive2H_DD", prescale=1.0
):
# We actually doesn't require any PID cuts, so it's inclusive
algs = (
@@ -85,7 +83,6 @@ def DownstreamBuScaInclusive2H_DD(
hlt1_filter_code=["Hlt1DownstreamBuSca.*Decision"],
prescale=prescale,
monitoring_variables=("pt", "eta", "m", "vchi2", "ipchi2", "n_candidates"),
- stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
index 700f3e3a213..70f5afe3527 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
@@ -27,9 +27,6 @@ from RecoConf.standard_particles import make_ismuon_long_muon
turbo_lines = {}
full_lines = {}
-# Setting the default stream the lines will be sent to
-qee_stream = "qeelow"
-
def filter_muons(particles, pvs, min_ipchi2, pid_mu, p_min=5 * GeV):
cut = require_all(
@@ -101,18 +98,13 @@ def dimuonnoip_line(
@register_line_builder(turbo_lines)
-def displaceddimuon_line(
- name="Hlt2QEE_DisplacedDiMuon",
- prescale=1,
- stream="qee", # Hlt2QEE_DisplacedDiMuon line is above 10 MB/s thus it must go to 'qee' stream
-):
+def displaceddimuon_line(name="Hlt2QEE_DisplacedDiMuon", prescale=1):
pvs = make_pvs()
dimuonnoip = make_dimuons(pvs, min_ipchi2=16, ownpvvdchi2_min=30)
return Hlt2Line(
name=name,
algs=upfront_reconstruction() + [require_pvs(pvs), dimuonnoip],
prescale=prescale,
- stream=stream,
)
@@ -130,11 +122,8 @@ def dimuonnoip_massrange1_ss_line(
stream=stream,
)
-
@register_line_builder(turbo_lines)
-def displaceddimuon_ss_line(
- name="Hlt2QEE_DisplacedDiMuon_ss", prescale=0.1, stream=qee_stream
-):
+def displaceddimuon_ss_line(name="Hlt2QEE_DisplacedDiMuon_ss", prescale=0.1):
pvs = make_pvs()
dimuonnoip = make_dimuons(
pvs, min_ipchi2=16, ownpvvdchi2_min=30, opposite_sign=False
@@ -143,7 +132,6 @@ def displaceddimuon_ss_line(
name=name,
algs=upfront_reconstruction() + [require_pvs(pvs), dimuonnoip],
prescale=prescale,
- stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/diphoton.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/diphoton.py
index 83af64c2e85..f4224666111 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/diphoton.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/diphoton.py
@@ -30,9 +30,6 @@ from Hlt2Conf.lines.qee.qee_builders import parent_isolation_output
all_lines = {}
-# Setting the default stream the lines will be sent to
-qee_stream = "qeelow"
-
@configurable
def filter_qee_photons(
@@ -96,10 +93,7 @@ def make_diphoton(
@register_line_builder(all_lines)
def Hlt2_ALPsToGammaGamma(
- name="Hlt2QEE_ALPsToGammaGamma",
- prescale=1,
- persistreco=False,
- stream=qee_stream,
+ name="Hlt2QEE_ALPsToGammaGamma", prescale=1, persistreco=False
):
"""
Register B2GammaGamma/ALPs2GammaGamma line
@@ -115,5 +109,4 @@ def Hlt2_ALPsToGammaGamma(
prescale=prescale,
extra_outputs=parent_isolation_output("B_s0", diphotons),
monitoring_variables=("m", "pt", "eta", "n_candidates"),
- stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py
index 15c2213cdb2..48fb0e2a6a6 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py
@@ -126,10 +126,7 @@ def make_upsilon():
@register_line_builder(all_lines)
@configurable
def jpsi_to_mu_mu_detached_line(
- name="Hlt2QEE_JpsiToMuMu_Detached",
- prescale=1,
- persistreco=False,
- stream="qee",
+ name="Hlt2QEE_JpsiToMuMu_Detached", prescale=1, persistreco=False
):
"""Jpsi (Detached) decay to two muons line"""
jpsi = make_jpsi(min_ownpvdls=3.0)
@@ -139,14 +136,13 @@ def jpsi_to_mu_mu_detached_line(
prescale=prescale,
persistreco=persistreco,
monitoring_variables=("m", "pt", "eta", "n_candidates"),
- stream=stream,
)
@register_line_builder(all_lines)
@configurable
def jpsi_to_mu_mu_prompt_line(
- name="Hlt2QEE_JpsiToMuMu_Prompt", prescale=0.1, persistreco=False, stream="qeelow"
+ name="Hlt2QEE_JpsiToMuMu_Prompt", prescale=0.1, persistreco=False
):
"""Jpsi (Prompt) decay to two muons line"""
jpsi = make_jpsi(max_ownpvdls=3.0)
@@ -156,14 +152,13 @@ def jpsi_to_mu_mu_prompt_line(
prescale=prescale,
persistreco=persistreco,
monitoring_variables=("m", "pt", "eta", "n_candidates"),
- stream=stream,
)
@register_line_builder(all_lines)
@configurable
def upsilon_to_mu_mu_line(
- name="Hlt2QEE_Upsilon1SToMuMu", prescale=1, persistreco=False, stream="qeelow"
+ name="Hlt2QEE_Upsilon1SToMuMu", prescale=1, persistreco=False
):
"""Upsilon(1S) decay to two muons line"""
u1s = make_upsilon()
@@ -173,5 +168,4 @@ def upsilon_to_mu_mu_line(
prescale=prescale,
persistreco=persistreco,
monitoring_variables=("m", "pt", "eta", "n_candidates"),
- stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
index a19669e7a3f..fff1c9fe9c2 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
@@ -403,16 +403,16 @@ LineConf = namedtuple(
)
line_args = {
# L0Kp
- "ProtonToLambda0Kp_LLl": LineConf("L0Kp", "LLl", 1.0, [False, False], qee_stream),
- "ProtonToLambda0Kp_DDl": LineConf("L0Kp", "DDl", 1.0, [True, False], qee_stream),
- "ProtonToLambda0Kp_DDd": LineConf("L0Kp", "DDd", 1.0, [True, True], qee_stream),
+ "ProtonToLambda0Kp_LLl": LineConf("L0Kp", "LLl", 1.0, [False, False], ""),
+ "ProtonToLambda0Kp_DDl": LineConf("L0Kp", "DDl", 1.0, [True, False], ""),
+ "ProtonToLambda0Kp_DDd": LineConf("L0Kp", "DDd", 1.0, [True, True], ""),
# L0Ks
"NeutronToLambda0KS_LLLL": LineConf(
- "L0Ks", "LLLL", 1.0, [False, False], qee_stream
+ "L0Ks", "LLLL", 1.0, [False, False], ""
),
- "NeutronToLambda0KS_LLDD": LineConf("L0Ks", "LLDD", 1.0, [False, True], qee_stream),
- "NeutronToLambda0KS_DDLL": LineConf("L0Ks", "DDLL", 1.0, [True, False], qee_stream),
- "NeutronToLambda0KS_DDDD": LineConf("L0Ks", "DDDD", 1.0, [True, True], qee_stream),
+ "NeutronToLambda0KS_LLDD": LineConf("L0Ks", "LLDD", 1.0, [False, True], ""),
+ "NeutronToLambda0KS_DDLL": LineConf("L0Ks", "DDLL", 1.0, [True, False], ""),
+ "NeutronToLambda0KS_DDDD": LineConf("L0Ks", "DDDD", 1.0, [True, True], ""),
# L0L0
"NucleonToLambda0Lambda0_LLLL": LineConf(
"L0L0", "LLLL", 1.0, [False, False], qee_stream
@@ -516,6 +516,11 @@ for sfx, line_config in line_args.items():
sexaquarks, pions = filter_npions(
sexaquarks, pions, stream.long_pions, stream.down_pions
)
+
+ # If the stream does not have a stream, it reverts to the default one, which is None
+ if turbostream == "":
+ turbostream = None
+
return Hlt2Line(
name=name,
algs=[require_pvs(make_pvs())] + [sexaquarks],
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
index dd668c269e8..59446e5ca47 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
@@ -54,9 +54,7 @@ qee_stream = "qeelow"
@register_line_builder(turbo_lines)
@configurable
-def qee_BtoKH_KK_exclTT(
- name="Hlt2QEE_BtoKH_KK_exclTT", prescale=0.008, stream=qee_stream
-):
+def qee_BtoKH_KK_exclTT(name="Hlt2QEE_BtoKH_KK_exclTT", prescale=0.008):
pvs = make_pvs()
filtered_long_kaons = qee_filtered_long_kaons()
dikaon = make_XtoTT_kaons(pvs)
@@ -70,15 +68,12 @@ def qee_BtoKH_KK_exclTT(
algs=upfront_reconstruction()
+ [require_pvs(pvs), qee_set_max_pvs(pvs), b_candidate],
prescale=prescale,
- stream=stream,
)
@register_line_builder(turbo_lines)
@configurable
-def qee_BtoKstar0H_KK_exclTT(
- name="Hlt2QEE_BtoKstar0H_KK_exclTT", prescale=0.01, stream=qee_stream
-):
+def qee_BtoKstar0H_KK_exclTT(name="Hlt2QEE_BtoKstar0H_KK_exclTT", prescale=0.01):
pvs = make_pvs()
long_kstars = make_qee_detached_kstar0s()
dikaon = make_XtoTT_kaons(pvs)
@@ -92,10 +87,8 @@ def qee_BtoKstar0H_KK_exclTT(
algs=upfront_reconstruction()
+ [require_pvs(pvs), qee_set_max_pvs(pvs), b_candidate],
prescale=prescale,
- stream=stream,
)
-
@register_line_builder(full_lines)
@configurable
def qee_HtoMuMu_TT(name="Hlt2QEE_HtoMuMu_TTFull", prescale=1.0):
@@ -170,9 +163,7 @@ def qee_HtoMuMu_samesignDD(name="Hlt2QEE_HtoMuMu_samesignDDFull", prescale=0.1):
### HNL Exclusive Lines
@register_line_builder(turbo_lines)
@configurable
-def qee_BtoMuN_PiMu_exclTT(
- name="Hlt2QEE_BtoMuN_PiMu_exclTT", prescale=1.0, stream=qee_stream
-):
+def qee_BtoMuN_PiMu_exclTT(name="Hlt2QEE_BtoMuN_PiMu_exclTT", prescale=1.0):
pvs = make_pvs()
long_muons = make_qee_detached_muons()
hnl = make_XtoTT_pimu(pvs)
@@ -186,15 +177,12 @@ def qee_BtoMuN_PiMu_exclTT(
algs=upfront_reconstruction()
+ [require_pvs(pvs), qee_set_max_pvs(pvs), b_candidate],
prescale=prescale,
- stream=stream,
)
@register_line_builder(turbo_lines)
@configurable
-def qee_BctoMuN_PiMu_exclTT(
- name="Hlt2QEE_BctoMuN_PiMu_exclTT", prescale=1.0, stream=qee_stream
-):
+def qee_BctoMuN_PiMu_exclTT(name="Hlt2QEE_BctoMuN_PiMu_exclTT", prescale=1.0):
pvs = make_pvs()
long_muons = make_qee_detached_muons()
hnl = make_XtoTT_pimu(pvs)
@@ -211,7 +199,6 @@ def qee_BctoMuN_PiMu_exclTT(
algs=upfront_reconstruction()
+ [require_pvs(pvs), qee_set_max_pvs(pvs), b_candidate],
prescale=prescale,
- stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/wz_boson_rare_decays.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/wz_boson_rare_decays.py
index 093cddfa478..70f3e2b75a5 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/wz_boson_rare_decays.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/wz_boson_rare_decays.py
@@ -36,10 +36,6 @@ from Hlt2Conf.lines.qee.qee_monitors import qee_monitors1d
from Hlt2Conf.standard_jets import make_jets
all_lines = {}
-
-# Setting the default stream the lines will be sent to
-qee_stream = "qeelow"
-
_default_monitoring_variables = ("pt", "eta", "n_candidates", "ipchi2", "vchi2")
@@ -687,9 +683,7 @@ def make_WZRareDecay_DiMuonMeson_cand(pvs, decay_type="JPsiDsp"):
@register_line_builder(all_lines)
@configurable
-def Dimuon_PhiDsp_line(
- name="Hlt2QEE_WZRareJPsiPhiDsp", prescale=1, persistreco=False, stream=qee_stream
-):
+def Dimuon_PhiDsp_line(name="Hlt2QEE_WZRareJPsiPhiDsp", prescale=1, persistreco=False):
"""W+ -> Jpsi phi(1020) Ds+ line"""
pvs = make_pvs()
@@ -707,7 +701,6 @@ def Dimuon_PhiDsp_line(
calo_digits=True,
calo_clusters=True,
monitoring_variables=_default_monitoring_variables,
- stream=stream,
)
@@ -720,7 +713,6 @@ for decay_type in ["JPsiDsp", "DiMuonDsp", "DiMuonPion"]:
decay_type=f"{decay_type}",
prescale=1,
persistreco=False,
- stream=qee_stream,
):
f"""{decay_type} line"""
@@ -739,7 +731,6 @@ for decay_type in ["JPsiDsp", "DiMuonDsp", "DiMuonPion"]:
persistreco=persistreco,
calo_digits=True,
monitoring_variables=_default_monitoring_variables,
- stream=stream,
)
@@ -769,12 +760,7 @@ for decay_type in [
photon_type=f"{photon_type}",
prescale=1,
persistreco=False,
- stream=qee_stream,
):
- # Change the stream for 'Hlt2QEE_WZRareJetGamma' because it has a BW higher than 10 MB/s
- if decay_type == "JetGamma" and line_suffix == "":
- stream = "qee"
-
f"""{decay_type} ({photon_type} photons) line"""
pvs = make_pvs()
@@ -794,5 +780,4 @@ for decay_type in [
persistreco=persistreco,
calo_digits=True,
monitoring_variables=_default_monitoring_variables,
- stream=stream,
)
--
GitLab
From 4277a3727169becffad9f33d92b287b975f032ab Mon Sep 17 00:00:00 2001
From: Gitlab CI <noreply@cern.ch>
Date: Fri, 28 Mar 2025 13:44:07 +0000
Subject: [PATCH 09/19] pre-commit fixes
patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/53552085
---
.../python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py | 1 +
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py | 1 +
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py | 6 ++----
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
index c1707a360df..4e1d3ef03a7 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
@@ -72,6 +72,7 @@ _HNL_MONITORING_VARIABLES = ("pt", "eta", "vchi2", "ipchi2", "n_candidates")
# Sending the 'Hlt2QEE_BpToMajo{lepton}_MajoTo{lepton}{pion}' lines to the 'qee_low' stream
qee_stream = "qeelow"
+
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_LL_Tight_line(
name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Tight", prescale=1
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
index 70f5afe3527..0d00b266095 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
@@ -122,6 +122,7 @@ def dimuonnoip_massrange1_ss_line(
stream=stream,
)
+
@register_line_builder(turbo_lines)
def displaceddimuon_ss_line(name="Hlt2QEE_DisplacedDiMuon_ss", prescale=0.1):
pvs = make_pvs()
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
index fff1c9fe9c2..7ded2b227c5 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
@@ -407,9 +407,7 @@ line_args = {
"ProtonToLambda0Kp_DDl": LineConf("L0Kp", "DDl", 1.0, [True, False], ""),
"ProtonToLambda0Kp_DDd": LineConf("L0Kp", "DDd", 1.0, [True, True], ""),
# L0Ks
- "NeutronToLambda0KS_LLLL": LineConf(
- "L0Ks", "LLLL", 1.0, [False, False], ""
- ),
+ "NeutronToLambda0KS_LLLL": LineConf("L0Ks", "LLLL", 1.0, [False, False], ""),
"NeutronToLambda0KS_LLDD": LineConf("L0Ks", "LLDD", 1.0, [False, True], ""),
"NeutronToLambda0KS_DDLL": LineConf("L0Ks", "DDLL", 1.0, [True, False], ""),
"NeutronToLambda0KS_DDDD": LineConf("L0Ks", "DDDD", 1.0, [True, True], ""),
@@ -520,7 +518,7 @@ for sfx, line_config in line_args.items():
# If the stream does not have a stream, it reverts to the default one, which is None
if turbostream == "":
turbostream = None
-
+
return Hlt2Line(
name=name,
algs=[require_pvs(make_pvs())] + [sexaquarks],
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
index 59446e5ca47..c251d661b7c 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
@@ -89,6 +89,7 @@ def qee_BtoKstar0H_KK_exclTT(name="Hlt2QEE_BtoKstar0H_KK_exclTT", prescale=0.01)
prescale=prescale,
)
+
@register_line_builder(full_lines)
@configurable
def qee_HtoMuMu_TT(name="Hlt2QEE_HtoMuMu_TTFull", prescale=1.0):
--
GitLab
From 1ad691cdcfef179944dc3bf84e94df67710249eb Mon Sep 17 00:00:00 2001
From: Pasquale Andreola <paandr@farm-gpu2.physik.uzh.ch>
Date: Fri, 28 Mar 2025 14:48:03 +0100
Subject: [PATCH 10/19] Fixing undefined qee_stream
---
.../python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py | 2 +-
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py | 2 +-
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
index 4e1d3ef03a7..8712593ea45 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
@@ -69,7 +69,7 @@ from Hlt2Conf.lines.qee.qee_builders import (
all_lines = {}
_HNL_MONITORING_VARIABLES = ("pt", "eta", "vchi2", "ipchi2", "n_candidates")
-# Sending the 'Hlt2QEE_BpToMajo{lepton}_MajoTo{lepton}{pion}' lines to the 'qee_low' stream
+# Sending the 'Hlt2QEE_BpToMajo{lepton}_MajoTo{lepton}{pion}' lines to the 'qeelow' stream
qee_stream = "qeelow"
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
index ee67d5c7c3e..4afceb0ee51 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
@@ -26,7 +26,7 @@ from RecoConf.standard_particles import make_down_pions
turbo_lines = {}
-# Sending the 'Hlt2QEE_DownstreamBuScaInclusive2H_DD{,_ss}' lines to the 'qee_low' stream
+# Sending the 'Hlt2QEE_DownstreamBuScaInclusive2H_DD{,_ss}' lines to the 'qeelow' stream
qee_stream = "qeelow"
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
index 0d00b266095..515b7b2af36 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
@@ -110,7 +110,7 @@ def displaceddimuon_line(name="Hlt2QEE_DisplacedDiMuon", prescale=1):
@register_line_builder(turbo_lines)
def dimuonnoip_massrange1_ss_line(
- name="Hlt2QEE_DiMuonNoIP_ss", prescale=0.1, stream=qee_stream
+ name="Hlt2QEE_DiMuonNoIP_ss", prescale=0.1, stream="qeelow"
):
pvs = make_pvs()
dimuonnoip = make_dimuons(pvs, opposite_sign=False)
--
GitLab
From d714863f485d23b7211064381e6fb6abe5673363 Mon Sep 17 00:00:00 2001
From: Gitlab CI <noreply@cern.ch>
Date: Fri, 28 Mar 2025 16:34:56 +0000
Subject: [PATCH 11/19] pre-commit fixes
patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/53571137
---
.../python/Hlt2Conf/lines/qee/dielectron_persist_photons.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
index 3e02359c06f..2313aea2388 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
@@ -38,7 +38,8 @@ comb_mass_limits = (5.0 * MeV, 700.0 * MeV)
_default_monitoring_variables = ("pt", "eta", "n_candidates", "ipchi2", "vchi2")
# Setting the default stream the lines will be sent to
-qee_stream = 'qeelow'
+qee_stream = "qeelow"
+
@configurable
def photon_filter(
--
GitLab
From 477e4cd99469b58158d6a6195d18e0343e5daab2 Mon Sep 17 00:00:00 2001
From: Pasquale Andreola <paandr@farm-gpu2.physik.uzh.ch>
Date: Mon, 31 Mar 2025 11:33:19 +0200
Subject: [PATCH 12/19] Excluding drellyan lines that did not change the names
---
.../python/Hlt2Conf/lines/qee/drellyan.py | 13 ------
.../lines/qee/drellyan_pp_ref_2024.py | 13 ------
.../lines/qee/qee_stream_argument.json | 45 +++++++++++++++++++
3 files changed, 45 insertions(+), 26 deletions(-)
create mode 100644 Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_stream_argument.json
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py
index 4ba5a9a3b97..696bd6670b1 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py
@@ -46,9 +46,6 @@ mass_ranges = [
# fifth argument: underlying event on/off
# sixth argument: use softer muons
-# Setting the default stream the lines will be sent to
-qee_stream = "qeelow"
-
@configurable
def filter_muons(
@@ -161,16 +158,7 @@ for is_ss in [True, False]:
prescale=prescale,
save_underlying_event=mass_range[4],
min_pidmu=min_pidmu,
- stream=qee_stream,
):
- # Hlt2QEE_DiMuon_DrellYan_VLowMass_OS_Prompt and Hlt2QEE_DiMuon_DrellYan_LowMass_OS_Prompt have an higher bandwidth than 10 MB/s
- if (
- mass_range[2] in ["VLowMass", "LowMass"]
- and not is_ss
- and not displaced
- ):
- stream = "qee"
-
pvs = make_pvs()
muon_min_p = 6 * GeV
@@ -200,5 +188,4 @@ for is_ss in [True, False]:
raw_banks=detectors_to_save,
persistreco=False,
prescale=prescale,
- stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan_pp_ref_2024.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan_pp_ref_2024.py
index 967403f0306..5033f855cd5 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan_pp_ref_2024.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan_pp_ref_2024.py
@@ -38,9 +38,6 @@ from RecoConf.standard_particles import make_ismuon_long_muon
all_lines = {}
-# Setting the default stream the lines will be sent to
-qee_stream = "qeelow"
-
### Line configuration
mass_ranges = [
[1.5 * GeV, 2.9 * GeV, "LowestMass", 0.2, True, True],
@@ -167,16 +164,7 @@ for is_ss in [True, False]:
prescale=prescale,
persist_reco=mass_range[4],
min_pidmu=min_pidmu,
- stream=qee_stream,
):
- # Hlt2QEE_DiMuon_DrellYan_VLowMass_OS_Prompt and Hlt2QEE_DiMuon_DrellYan_LowMass_OS_Prompt have an higher bandwidth than 10 MB/s
- if (
- mass_range[2] in ["VLowMass", "LowMass"]
- and not is_ss
- and not displaced
- ):
- stream = "qee"
-
pvs = make_pvs()
if use_soft_muons:
@@ -204,5 +192,4 @@ for is_ss in [True, False]:
algs=upfront_reconstruction() + [require_pvs(pvs), dimuons],
persistreco=persist_reco,
prescale=prescale,
- stream=stream,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_stream_argument.json b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_stream_argument.json
new file mode 100644
index 00000000000..53f534432f9
--- /dev/null
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_stream_argument.json
@@ -0,0 +1,45 @@
+{
+ "qee": [
+ "Hlt2QEE_DiMuonNoIP",
+ "Hlt2QEE_MDS_BDT_nHits_Turbo",
+ "Hlt2QEE_SexaquarkNucleonToKS0KpPim_DDd",
+ "Hlt2QEE_SexaquarkNucleonToKpKpPim_dd"
+ ],
+ "qeelow": [
+ "Hlt2QEE_BpToMajoE_MajoToEPi_LL_Tight",
+ "Hlt2QEE_BpToMajoMu_MajoToMuPi_LL_Tight",
+ "Hlt2QEE_DiElectronNoIPNorm_PersistPhotons",
+ "Hlt2QEE_DiElectronNoIPNorm_PersistPhotonsSS",
+ "Hlt2QEE_DiElectronNoIP_PersistPhotons",
+ "Hlt2QEE_DiElectronNoIP_PersistPhotonsSS",
+ "Hlt2QEE_DiMuonNoIP_ss",
+ "Hlt2QEE_DiMuon_DrellYan_LowMass_OS_Displaced",
+ "Hlt2QEE_DiMuon_DrellYan_LowMass_OS_Prompt",
+ "Hlt2QEE_DiMuon_DrellYan_LowMass_SS_Displaced",
+ "Hlt2QEE_DiMuon_DrellYan_LowMass_SS_Prompt",
+ "Hlt2QEE_DiMuon_DrellYan_Nominal_OS_Displaced",
+ "Hlt2QEE_DiMuon_DrellYan_Nominal_OS_Prompt",
+ "Hlt2QEE_DiMuon_DrellYan_Nominal_SS_Displaced",
+ "Hlt2QEE_DiMuon_DrellYan_Nominal_SS_Prompt",
+ "Hlt2QEE_DiMuon_DrellYan_VLowMass_OS_Displaced",
+ "Hlt2QEE_DiMuon_DrellYan_VLowMass_OS_Prompt",
+ "Hlt2QEE_DiMuon_DrellYan_VLowMass_SS_Displaced",
+ "Hlt2QEE_DiMuon_DrellYan_VLowMass_SS_Prompt",
+ "Hlt2QEE_DownstreamBuScaInclusive2H_DD_same_sign",
+ "Hlt2QEE_N_EMuNu_SS_inclTT",
+ "Hlt2QEE_N_EMuNu_inclTT",
+ "Hlt2QEE_N_MuMuNu_SS_inclTT",
+ "Hlt2QEE_N_MuMuNu_inclTT",
+ "Hlt2QEE_N_PiMu_SS_inclTT",
+ "Hlt2QEE_N_PiMu_inclTT",
+ "Hlt2QEE_SexaquarkNucleonToKS0KpPim_DDl",
+ "Hlt2QEE_SexaquarkNucleonToKS0KpPim_LLl",
+ "Hlt2QEE_SexaquarkNucleonToKSKS_DDDD",
+ "Hlt2QEE_SexaquarkNucleonToKSKS_LLDD",
+ "Hlt2QEE_SexaquarkNucleonToKSKS_LLLL",
+ "Hlt2QEE_SexaquarkNucleonToKpKpPim_ll",
+ "Hlt2QEE_SexaquarkNucleonToLambda0Lambda0_DDDD",
+ "Hlt2QEE_SexaquarkNucleonToLambda0Lambda0_LLDD",
+ "Hlt2QEE_SexaquarkNucleonToLambda0Lambda0_LLLL"
+ ]
+}
\ No newline at end of file
--
GitLab
From d20310203b18e2bc5ee29ab1fc20899417e214bd Mon Sep 17 00:00:00 2001
From: Pasquale Andreola <paandr@farm-gpu2.physik.uzh.ch>
Date: Mon, 31 Mar 2025 11:34:16 +0200
Subject: [PATCH 13/19] Excluding drellyan lines that did not change the names
---
.../lines/qee/qee_stream_argument.json | 45 -------------------
1 file changed, 45 deletions(-)
delete mode 100644 Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_stream_argument.json
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_stream_argument.json b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_stream_argument.json
deleted file mode 100644
index 53f534432f9..00000000000
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_stream_argument.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "qee": [
- "Hlt2QEE_DiMuonNoIP",
- "Hlt2QEE_MDS_BDT_nHits_Turbo",
- "Hlt2QEE_SexaquarkNucleonToKS0KpPim_DDd",
- "Hlt2QEE_SexaquarkNucleonToKpKpPim_dd"
- ],
- "qeelow": [
- "Hlt2QEE_BpToMajoE_MajoToEPi_LL_Tight",
- "Hlt2QEE_BpToMajoMu_MajoToMuPi_LL_Tight",
- "Hlt2QEE_DiElectronNoIPNorm_PersistPhotons",
- "Hlt2QEE_DiElectronNoIPNorm_PersistPhotonsSS",
- "Hlt2QEE_DiElectronNoIP_PersistPhotons",
- "Hlt2QEE_DiElectronNoIP_PersistPhotonsSS",
- "Hlt2QEE_DiMuonNoIP_ss",
- "Hlt2QEE_DiMuon_DrellYan_LowMass_OS_Displaced",
- "Hlt2QEE_DiMuon_DrellYan_LowMass_OS_Prompt",
- "Hlt2QEE_DiMuon_DrellYan_LowMass_SS_Displaced",
- "Hlt2QEE_DiMuon_DrellYan_LowMass_SS_Prompt",
- "Hlt2QEE_DiMuon_DrellYan_Nominal_OS_Displaced",
- "Hlt2QEE_DiMuon_DrellYan_Nominal_OS_Prompt",
- "Hlt2QEE_DiMuon_DrellYan_Nominal_SS_Displaced",
- "Hlt2QEE_DiMuon_DrellYan_Nominal_SS_Prompt",
- "Hlt2QEE_DiMuon_DrellYan_VLowMass_OS_Displaced",
- "Hlt2QEE_DiMuon_DrellYan_VLowMass_OS_Prompt",
- "Hlt2QEE_DiMuon_DrellYan_VLowMass_SS_Displaced",
- "Hlt2QEE_DiMuon_DrellYan_VLowMass_SS_Prompt",
- "Hlt2QEE_DownstreamBuScaInclusive2H_DD_same_sign",
- "Hlt2QEE_N_EMuNu_SS_inclTT",
- "Hlt2QEE_N_EMuNu_inclTT",
- "Hlt2QEE_N_MuMuNu_SS_inclTT",
- "Hlt2QEE_N_MuMuNu_inclTT",
- "Hlt2QEE_N_PiMu_SS_inclTT",
- "Hlt2QEE_N_PiMu_inclTT",
- "Hlt2QEE_SexaquarkNucleonToKS0KpPim_DDl",
- "Hlt2QEE_SexaquarkNucleonToKS0KpPim_LLl",
- "Hlt2QEE_SexaquarkNucleonToKSKS_DDDD",
- "Hlt2QEE_SexaquarkNucleonToKSKS_LLDD",
- "Hlt2QEE_SexaquarkNucleonToKSKS_LLLL",
- "Hlt2QEE_SexaquarkNucleonToKpKpPim_ll",
- "Hlt2QEE_SexaquarkNucleonToLambda0Lambda0_DDDD",
- "Hlt2QEE_SexaquarkNucleonToLambda0Lambda0_LLDD",
- "Hlt2QEE_SexaquarkNucleonToLambda0Lambda0_LLLL"
- ]
-}
\ No newline at end of file
--
GitLab
From 7b3014d7db1a3f7f17c9c8547d7901ef26a26154 Mon Sep 17 00:00:00 2001
From: Pasquale Andreola <paandr@farm-gpu2.physik.uzh.ch>
Date: Fri, 4 Apr 2025 11:04:21 +0200
Subject: [PATCH 14/19] Defining the stream split in hlt2_qee.py
---
.../lines/qee/b_to_majolep_majo_to_leppi.py | 10 +++----
.../python/Hlt2Conf/lines/qee/busca.py | 7 ++---
.../lines/qee/dielectron_persist_photons.py | 11 +++-----
.../python/Hlt2Conf/lines/qee/dimuon_no_ip.py | 5 ++--
.../python/Hlt2Conf/lines/qee/hlt2_qee.py | 5 ++++
.../lines/qee/muon_detector_showers.py | 9 ++-----
.../python/Hlt2Conf/lines/qee/sexaquark.py | 26 +++++++++----------
.../python/Hlt2Conf/lines/qee/ttrack_llps.py | 16 +++++-------
8 files changed, 39 insertions(+), 50 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
index 8712593ea45..16b3ed453c9 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
@@ -66,13 +66,11 @@ from Hlt2Conf.lines.qee.qee_builders import (
make_majorana_lepton,
)
+from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
+
all_lines = {}
_HNL_MONITORING_VARIABLES = ("pt", "eta", "vchi2", "ipchi2", "n_candidates")
-# Sending the 'Hlt2QEE_BpToMajo{lepton}_MajoTo{lepton}{pion}' lines to the 'qeelow' stream
-qee_stream = "qeelow"
-
-
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_LL_Tight_line(
name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Tight", prescale=1
@@ -176,7 +174,7 @@ def BpToMajoE_MajoToMuPi_LL_Tight_line(
def BpToMajoMu_MajoToMuPi_LL_Tight_line(
name="Hlt2QEE_BpToMajoMu_MajoToMuPi_LL_Tight",
prescale=1,
- stream=qee_stream,
+ stream=qee_streamsplit.low,
):
pvs = make_pvs
@@ -227,7 +225,7 @@ def BpToMajoMu_MajoToMuPi_LL_Tight_line(
def BpToMajoE_MajoToEPi_LL_Tight_line(
name="Hlt2QEE_BpToMajoE_MajoToEPi_LL_Tight",
prescale=1,
- stream=qee_stream,
+ stream=qee_streamsplit.low,
):
pvs = make_pvs
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
index 4afceb0ee51..f4885640c12 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
@@ -23,13 +23,10 @@ from RecoConf.event_filters import require_pvs
from RecoConf.reconstruction_objects import make_pvs as _make_pvs
from RecoConf.reconstruction_objects import upfront_reconstruction
from RecoConf.standard_particles import make_down_pions
+from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
turbo_lines = {}
-# Sending the 'Hlt2QEE_DownstreamBuScaInclusive2H_DD{,_ss}' lines to the 'qeelow' stream
-qee_stream = "qeelow"
-
-
@configurable
def make_DownstreamBuScaInclusive2H_DD(
descriptors="KS0 -> pi+ pi-",
@@ -91,7 +88,7 @@ def DownstreamBuScaInclusive2H_DD(
def DownstreamBuScaInclusive2H_DD_same_sign(
name="Hlt2QEE_DownstreamBuScaInclusive2H_DD_same_sign",
prescale=1.0,
- stream=qee_stream,
+ stream=qee_streamsplit,
):
# We actually doesn't require any PID cuts, so it's inclusive
algs = (
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
index 2313aea2388..69e2b612e3e 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
@@ -29,7 +29,8 @@ from RecoConf.standard_particles import (
make_long_electrons_no_brem,
make_photons,
)
-
+from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
+
full_lines = {}
turbo_lines = {}
@@ -37,10 +38,6 @@ comb_mass_limits = (5.0 * MeV, 700.0 * MeV)
# NOTE: No dielectron mass monitors allowed (custom or default) to avoid potential unblinding.
_default_monitoring_variables = ("pt", "eta", "n_candidates", "ipchi2", "vchi2")
-# Setting the default stream the lines will be sent to
-qee_stream = "qeelow"
-
-
@configurable
def photon_filter(
name="inputphotons_{hash}",
@@ -101,7 +98,7 @@ for kind in "", "Norm":
persistreco=False,
e_minpt=e_pt_cut, # HLT1 cuts on the PT
make_pvs=make_pvs,
- stream=qee_stream,
+ stream=qee_streamsplit.low,
):
"""Aiming for prompt pi0/eta -> gamma e+ e- decays. Label the dielectron
as J/psi(1S) [during brem-recovery-reconstruction of dielectron pair] and
@@ -189,7 +186,7 @@ for kind in "", "Norm":
persistreco=False,
e_minpt=e_pt_cut,
make_pvs=make_pvs,
- stream=qee_stream,
+ stream=qee_streamsplit.low,
):
"""Aiming to normalize prompt pi0/eta -> gamma e+ e+ or gamma e- e- decays. Label
the doubly-charged dielectron as J/psi(1S) and save photons if Pi0/eta in
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
index 515b7b2af36..ebdfabb2f4a 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
@@ -23,6 +23,7 @@ from RecoConf.algorithms_thor import ParticleCombiner, ParticleFilter
from RecoConf.event_filters import require_pvs
from RecoConf.reconstruction_objects import make_pvs, upfront_reconstruction
from RecoConf.standard_particles import make_ismuon_long_muon
+from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
turbo_lines = {}
full_lines = {}
@@ -84,7 +85,7 @@ def make_dimuons(
def dimuonnoip_line(
name="Hlt2QEE_DiMuonNoIP",
prescale=1,
- stream="qee", # Hlt2QEE_DiMuonNoIP line is well above 10 MB/s thus it must go to 'qee' stream
+ stream=qee_streamsplit.high,
):
pvs = make_pvs()
dimuonnoip = make_dimuons(pvs)
@@ -110,7 +111,7 @@ def displaceddimuon_line(name="Hlt2QEE_DisplacedDiMuon", prescale=1):
@register_line_builder(turbo_lines)
def dimuonnoip_massrange1_ss_line(
- name="Hlt2QEE_DiMuonNoIP_ss", prescale=0.1, stream="qeelow"
+ name="Hlt2QEE_DiMuonNoIP_ss", prescale=0.1, stream=qee_streamsplit.low
):
pvs = make_pvs()
dimuonnoip = make_dimuons(pvs, opposite_sign=False)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/hlt2_qee.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/hlt2_qee.py
index 69806181654..1fe70d13f4a 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/hlt2_qee.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/hlt2_qee.py
@@ -31,6 +31,7 @@ from Hlt2Conf.lines.qee import (
ttrack_llps,
wz_boson_rare_decays,
)
+from collections import namedtuple
full_lines = {}
full_lines.update(single_high_pt_muon.all_lines)
@@ -56,3 +57,7 @@ turbo_lines.update(ttrack_llps.turbo_lines)
turbo_lines.update(muon_detector_showers.turbo_lines)
turbo_lines.update(sexaquark.all_lines)
turbo_lines.update(busca.turbo_lines)
+
+# Defining the stream splits for QEE
+QEEStreamSplit = namedtuple("QEEStreamSplit", ["low", "high"])
+qee_streamsplit = QEEStreamSplit(low="qeelow", high="qee")
\ No newline at end of file
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
index 3c6b478d601..107bb2dd083 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
@@ -22,16 +22,11 @@ from PyConf.control_flow import CompositeNode, NodeLogic
from RecoConf.muonid import make_muon_hits
from RecoConf.standard_particles import make_long_muons
from SelAlgorithms import monitoring
+from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
full_lines = {}
turbo_lines = {}
-# Setting the default stream the lines will be sent to
-qee_stream = (
- "qee" # The 'Hlt2QEE_MDS_BDT_nHits_Turbo' line has an higher bandwidth than 10 MB/s
-)
-
-
def mds_BDT_Monitoring(mva, prescale=0.1, line_type="full"):
prescaler = DeterministicPrescaler(
name=f"Monitor_MDS_MVAPrescaler_{line_type.capitalize()}",
@@ -70,7 +65,7 @@ def mds_BDT_nHits_line_turbo(
MVACut=0.995,
prescale=1.0,
persistreco=False,
- stream=qee_stream,
+ stream=qee_streamsplit.high,
):
muon_hits = make_muon_hits()
inputs = {
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
index 7ded2b227c5..7091eddddd2 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
@@ -45,12 +45,10 @@ from RecoConf.standard_particles import (
make_long_protons_for_V0,
masses,
)
+from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
all_lines = {}
-# Setting the default stream the lines will be sent to
-qee_stream = "qeelow"
-
#########################
### template builders ###
#########################
@@ -413,35 +411,35 @@ line_args = {
"NeutronToLambda0KS_DDDD": LineConf("L0Ks", "DDDD", 1.0, [True, True], ""),
# L0L0
"NucleonToLambda0Lambda0_LLLL": LineConf(
- "L0L0", "LLLL", 1.0, [False, False], qee_stream
+ "L0L0", "LLLL", 1.0, [False, False], qee_streamsplit.low
),
"NucleonToLambda0Lambda0_LLDD": LineConf(
- "L0L0", "LLDD", 1.0, [False, True], qee_stream
+ "L0L0", "LLDD", 1.0, [False, True], qee_streamsplit.low
),
"NucleonToLambda0Lambda0_DDDD": LineConf(
- "L0L0", "DDDD", 1.0, [True, True], qee_stream
+ "L0L0", "DDDD", 1.0, [True, True], qee_streamsplit.low
),
# KpKp
"NucleonToKpKpPim_ll": LineConf(
- "KpKpPim", "ll", 0.25, [False, False, False], qee_stream
+ "KpKpPim", "ll", 0.25, [False, False, False], qee_streamsplit.low
),
"NucleonToKpKpPim_dd": LineConf(
- "KpKpPim", "dd", 0.5, [True, True, True], "qee"
+ "KpKpPim", "dd", 0.5, [True, True, True], qee_streamsplit.high
), # This line fires more than 10 MB/s
# KsKp
"NucleonToKS0KpPim_LLl": LineConf(
- "KsKpPim", "LLl", 1.0, [False, False, False], qee_stream
+ "KsKpPim", "LLl", 1.0, [False, False, False], qee_streamsplit.low
),
"NucleonToKS0KpPim_DDl": LineConf(
- "KsKpPim", "DDl", 1.0, [True, False, False], qee_stream
+ "KsKpPim", "DDl", 1.0, [True, False, False], qee_streamsplit.low
),
"NucleonToKS0KpPim_DDd": LineConf(
- "KsKpPim", "DDd", 1.0, [True, True, True], "qee"
+ "KsKpPim", "DDd", 1.0, [True, True, True], qee_streamsplit.high
), # This line fires more than 10 MB/s
# KsKs
- "NucleonToKSKS_LLLL": LineConf("KsKs", "LLLL", 0.01, [False, False], qee_stream),
- "NucleonToKSKS_LLDD": LineConf("KsKscc", "LLDD", 0.01, [False, True], qee_stream),
- "NucleonToKSKS_DDDD": LineConf("KsKs", "DDDD", 0.01, [True, True], qee_stream),
+ "NucleonToKSKS_LLLL": LineConf("KsKs", "LLLL", 0.01, [False, False], qee_streamsplit.low),
+ "NucleonToKSKS_LLDD": LineConf("KsKscc", "LLDD", 0.01, [False, True], qee_streamsplit.low),
+ "NucleonToKSKS_DDDD": LineConf("KsKs", "DDDD", 0.01, [True, True], qee_streamsplit.low),
}
ProcessConf = namedtuple(
"ProcessConf",
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
index c251d661b7c..d7b76be2b96 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
@@ -40,13 +40,11 @@ from Hlt2Conf.lines.qee.qee_builders import (
qee_filtered_long_kaons,
qee_set_max_pvs,
)
+from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
turbo_lines = {}
full_lines = {}
-# Setting the default stream the lines will be sent to
-qee_stream = "qeelow"
-
########################
### Dark Higgs modes ###
########################
@@ -206,7 +204,7 @@ def qee_BctoMuN_PiMu_exclTT(name="Hlt2QEE_BctoMuN_PiMu_exclTT", prescale=1.0):
## HNL Inclusive Lines
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoPiMu_inclTT(name="Hlt2QEE_N_PiMu_inclTT", prescale=1, stream=qee_stream):
+def qee_NtoPiMu_inclTT(name="Hlt2QEE_N_PiMu_inclTT", prescale=1, stream=qee_streamsplit.low):
"""A line to select the [N -> pi+ mu-]CC decay for an inclusive selection
for the [B -> X mu (N -> pi mu)] decay"""
@@ -237,7 +235,7 @@ def qee_NtoPiMu_inclTT(name="Hlt2QEE_N_PiMu_inclTT", prescale=1, stream=qee_stre
@register_line_builder(turbo_lines)
@configurable
def qee_NtoPiMu_SS_inclTT(
- name="Hlt2QEE_N_PiMu_SS_inclTT", prescale=0.1, stream=qee_stream
+ name="Hlt2QEE_N_PiMu_SS_inclTT", prescale=0.1, stream=qee_streamsplit.low
):
"""A line to select the [N -> pi+ mu+]CC (i.e. same sign; SS) decay as a background control selection
for the [B -> X mu (N -> pi mu)] decay"""
@@ -268,7 +266,7 @@ def qee_NtoPiMu_SS_inclTT(
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoEMuNu_inclTT(name="Hlt2QEE_N_EMuNu_inclTT", prescale=1, stream=qee_stream):
+def qee_NtoEMuNu_inclTT(name="Hlt2QEE_N_EMuNu_inclTT", prescale=1, stream=qee_streamsplit.low):
"""A line to select the [N -> e+ mu- nu_mu]CC decay for an inclusive selection
for the [B -> X mu (N -> e mu nu)] decay"""
@@ -304,7 +302,7 @@ def qee_NtoEMuNu_inclTT(name="Hlt2QEE_N_EMuNu_inclTT", prescale=1, stream=qee_st
@register_line_builder(turbo_lines)
@configurable
def qee_NtoEMuNu_SS_inclTT(
- name="Hlt2QEE_N_EMuNu_SS_inclTT", prescale=0.1, stream=qee_stream
+ name="Hlt2QEE_N_EMuNu_SS_inclTT", prescale=0.1, stream=qee_streamsplit.low
):
"""A line to select the [N -> e+ mu+ nu_mu]CC (i.e. same sign; SS) decay as a background control
selection for the [B -> X mu (N -> e mu nu)] decay"""
@@ -340,7 +338,7 @@ def qee_NtoEMuNu_SS_inclTT(
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoMuMuNu_inclTT(name="Hlt2QEE_N_MuMuNu_inclTT", prescale=1, stream=qee_stream):
+def qee_NtoMuMuNu_inclTT(name="Hlt2QEE_N_MuMuNu_inclTT", prescale=1, stream=qee_streamsplit.low):
"""A line to select the [N -> mu+ mu- nu_mu]CC decay for an inclusive selection
for the [B -> X mu (N -> mu mu nu)] decay"""
@@ -372,7 +370,7 @@ def qee_NtoMuMuNu_inclTT(name="Hlt2QEE_N_MuMuNu_inclTT", prescale=1, stream=qee_
@register_line_builder(turbo_lines)
@configurable
def qee_NtoMuMuNu_SS_inclTT(
- name="Hlt2QEE_N_MuMuNu_SS_inclTT", prescale=0.1, stream=qee_stream
+ name="Hlt2QEE_N_MuMuNu_SS_inclTT", prescale=0.1, stream=qee_streamsplit.low
):
"""A line to select the [N -> mu+ mu+ nu_mu]CC (i.e. same sign; SS) decay as a background control
for the [B -> X mu (N -> mu mu nu)] decay"""
--
GitLab
From 63432b194ca189c67247341e3a3c8fab5990b8f2 Mon Sep 17 00:00:00 2001
From: Gitlab CI <noreply@cern.ch>
Date: Fri, 4 Apr 2025 09:05:18 +0000
Subject: [PATCH 15/19] pre-commit fixes
patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/54168290
---
.../lines/qee/b_to_majolep_majo_to_leppi.py | 4 ++--
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py | 2 ++
.../lines/qee/dielectron_persist_photons.py | 4 +++-
.../python/Hlt2Conf/lines/qee/dimuon_no_ip.py | 1 +
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/hlt2_qee.py | 5 +++--
.../Hlt2Conf/lines/qee/muon_detector_showers.py | 2 ++
.../python/Hlt2Conf/lines/qee/sexaquark.py | 13 ++++++++++---
.../python/Hlt2Conf/lines/qee/ttrack_llps.py | 14 ++++++++++----
8 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
index 16b3ed453c9..ef9f995ee3e 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
@@ -58,6 +58,7 @@ from RecoConf.standard_particles import (
make_long_pions,
)
+from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
from Hlt2Conf.lines.qee.qee_builders import (
filter_neutral_hadrons,
hnl_prefilter,
@@ -66,11 +67,10 @@ from Hlt2Conf.lines.qee.qee_builders import (
make_majorana_lepton,
)
-from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
-
all_lines = {}
_HNL_MONITORING_VARIABLES = ("pt", "eta", "vchi2", "ipchi2", "n_candidates")
+
@register_line_builder(all_lines)
def BpToMajoMu_MajoToEPi_LL_Tight_line(
name="Hlt2QEE_BpToMajoMu_MajoToEPi_LL_Tight", prescale=1
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
index f4885640c12..4607ba1c493 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
@@ -23,10 +23,12 @@ from RecoConf.event_filters import require_pvs
from RecoConf.reconstruction_objects import make_pvs as _make_pvs
from RecoConf.reconstruction_objects import upfront_reconstruction
from RecoConf.standard_particles import make_down_pions
+
from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
turbo_lines = {}
+
@configurable
def make_DownstreamBuScaInclusive2H_DD(
descriptors="KS0 -> pi+ pi-",
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
index 69e2b612e3e..c4d4239eefe 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
@@ -29,8 +29,9 @@ from RecoConf.standard_particles import (
make_long_electrons_no_brem,
make_photons,
)
+
from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
-
+
full_lines = {}
turbo_lines = {}
@@ -38,6 +39,7 @@ comb_mass_limits = (5.0 * MeV, 700.0 * MeV)
# NOTE: No dielectron mass monitors allowed (custom or default) to avoid potential unblinding.
_default_monitoring_variables = ("pt", "eta", "n_candidates", "ipchi2", "vchi2")
+
@configurable
def photon_filter(
name="inputphotons_{hash}",
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
index ebdfabb2f4a..e86ff6fb6f0 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
@@ -23,6 +23,7 @@ from RecoConf.algorithms_thor import ParticleCombiner, ParticleFilter
from RecoConf.event_filters import require_pvs
from RecoConf.reconstruction_objects import make_pvs, upfront_reconstruction
from RecoConf.standard_particles import make_ismuon_long_muon
+
from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
turbo_lines = {}
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/hlt2_qee.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/hlt2_qee.py
index 1fe70d13f4a..9f206fae766 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/hlt2_qee.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/hlt2_qee.py
@@ -12,6 +12,8 @@
Registration of all the QEE HLT2 lines.
"""
+from collections import namedtuple
+
from Hlt2Conf.lines.qee import (
b_to_majolep_majo_to_leplep,
b_to_majolep_majo_to_leppi,
@@ -31,7 +33,6 @@ from Hlt2Conf.lines.qee import (
ttrack_llps,
wz_boson_rare_decays,
)
-from collections import namedtuple
full_lines = {}
full_lines.update(single_high_pt_muon.all_lines)
@@ -60,4 +61,4 @@ turbo_lines.update(busca.turbo_lines)
# Defining the stream splits for QEE
QEEStreamSplit = namedtuple("QEEStreamSplit", ["low", "high"])
-qee_streamsplit = QEEStreamSplit(low="qeelow", high="qee")
\ No newline at end of file
+qee_streamsplit = QEEStreamSplit(low="qeelow", high="qee")
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
index 107bb2dd083..dfc56bd59a3 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
@@ -22,11 +22,13 @@ from PyConf.control_flow import CompositeNode, NodeLogic
from RecoConf.muonid import make_muon_hits
from RecoConf.standard_particles import make_long_muons
from SelAlgorithms import monitoring
+
from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
full_lines = {}
turbo_lines = {}
+
def mds_BDT_Monitoring(mva, prescale=0.1, line_type="full"):
prescaler = DeterministicPrescaler(
name=f"Monitor_MDS_MVAPrescaler_{line_type.capitalize()}",
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
index 7091eddddd2..0056d035554 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
@@ -45,6 +45,7 @@ from RecoConf.standard_particles import (
make_long_protons_for_V0,
masses,
)
+
from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
all_lines = {}
@@ -437,9 +438,15 @@ line_args = {
"KsKpPim", "DDd", 1.0, [True, True, True], qee_streamsplit.high
), # This line fires more than 10 MB/s
# KsKs
- "NucleonToKSKS_LLLL": LineConf("KsKs", "LLLL", 0.01, [False, False], qee_streamsplit.low),
- "NucleonToKSKS_LLDD": LineConf("KsKscc", "LLDD", 0.01, [False, True], qee_streamsplit.low),
- "NucleonToKSKS_DDDD": LineConf("KsKs", "DDDD", 0.01, [True, True], qee_streamsplit.low),
+ "NucleonToKSKS_LLLL": LineConf(
+ "KsKs", "LLLL", 0.01, [False, False], qee_streamsplit.low
+ ),
+ "NucleonToKSKS_LLDD": LineConf(
+ "KsKscc", "LLDD", 0.01, [False, True], qee_streamsplit.low
+ ),
+ "NucleonToKSKS_DDDD": LineConf(
+ "KsKs", "DDDD", 0.01, [True, True], qee_streamsplit.low
+ ),
}
ProcessConf = namedtuple(
"ProcessConf",
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
index d7b76be2b96..3e10b67bb21 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
@@ -24,6 +24,7 @@ from RecoConf.standard_particles import (
make_ismuon_long_muon,
)
+from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
from Hlt2Conf.lines.qee.qee_builders import (
make_qee_detached_kstar0s,
make_qee_detached_muons,
@@ -40,7 +41,6 @@ from Hlt2Conf.lines.qee.qee_builders import (
qee_filtered_long_kaons,
qee_set_max_pvs,
)
-from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
turbo_lines = {}
full_lines = {}
@@ -204,7 +204,9 @@ def qee_BctoMuN_PiMu_exclTT(name="Hlt2QEE_BctoMuN_PiMu_exclTT", prescale=1.0):
## HNL Inclusive Lines
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoPiMu_inclTT(name="Hlt2QEE_N_PiMu_inclTT", prescale=1, stream=qee_streamsplit.low):
+def qee_NtoPiMu_inclTT(
+ name="Hlt2QEE_N_PiMu_inclTT", prescale=1, stream=qee_streamsplit.low
+):
"""A line to select the [N -> pi+ mu-]CC decay for an inclusive selection
for the [B -> X mu (N -> pi mu)] decay"""
@@ -266,7 +268,9 @@ def qee_NtoPiMu_SS_inclTT(
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoEMuNu_inclTT(name="Hlt2QEE_N_EMuNu_inclTT", prescale=1, stream=qee_streamsplit.low):
+def qee_NtoEMuNu_inclTT(
+ name="Hlt2QEE_N_EMuNu_inclTT", prescale=1, stream=qee_streamsplit.low
+):
"""A line to select the [N -> e+ mu- nu_mu]CC decay for an inclusive selection
for the [B -> X mu (N -> e mu nu)] decay"""
@@ -338,7 +342,9 @@ def qee_NtoEMuNu_SS_inclTT(
@register_line_builder(turbo_lines)
@configurable
-def qee_NtoMuMuNu_inclTT(name="Hlt2QEE_N_MuMuNu_inclTT", prescale=1, stream=qee_streamsplit.low):
+def qee_NtoMuMuNu_inclTT(
+ name="Hlt2QEE_N_MuMuNu_inclTT", prescale=1, stream=qee_streamsplit.low
+):
"""A line to select the [N -> mu+ mu- nu_mu]CC decay for an inclusive selection
for the [B -> X mu (N -> mu mu nu)] decay"""
--
GitLab
From a4c9f8833c4ba2611f02a99a062683368942d5a9 Mon Sep 17 00:00:00 2001
From: Pasquale Andreola <paandr@farm-gpu2.physik.uzh.ch>
Date: Sat, 5 Apr 2025 16:35:08 +0200
Subject: [PATCH 16/19] Changing qee_streamsplit to qee_stream_split
---
.../lines/qee/b_to_majolep_majo_to_leppi.py | 6 ++---
.../python/Hlt2Conf/lines/qee/busca.py | 4 ++--
.../lines/qee/dielectron_persist_photons.py | 6 ++---
.../python/Hlt2Conf/lines/qee/dimuon_no_ip.py | 6 ++---
.../python/Hlt2Conf/lines/qee/hlt2_qee.py | 2 +-
.../lines/qee/muon_detector_showers.py | 4 ++--
.../python/Hlt2Conf/lines/qee/sexaquark.py | 24 +++++++++----------
.../python/Hlt2Conf/lines/qee/ttrack_llps.py | 14 +++++------
8 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
index ef9f995ee3e..928c9cf01e2 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leppi.py
@@ -58,7 +58,7 @@ from RecoConf.standard_particles import (
make_long_pions,
)
-from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
+from Hlt2Conf.lines.qee.hlt2_qee import qee_stream_split
from Hlt2Conf.lines.qee.qee_builders import (
filter_neutral_hadrons,
hnl_prefilter,
@@ -174,7 +174,7 @@ def BpToMajoE_MajoToMuPi_LL_Tight_line(
def BpToMajoMu_MajoToMuPi_LL_Tight_line(
name="Hlt2QEE_BpToMajoMu_MajoToMuPi_LL_Tight",
prescale=1,
- stream=qee_streamsplit.low,
+ stream=qee_stream_split.low,
):
pvs = make_pvs
@@ -225,7 +225,7 @@ def BpToMajoMu_MajoToMuPi_LL_Tight_line(
def BpToMajoE_MajoToEPi_LL_Tight_line(
name="Hlt2QEE_BpToMajoE_MajoToEPi_LL_Tight",
prescale=1,
- stream=qee_streamsplit.low,
+ stream=qee_stream_split.low,
):
pvs = make_pvs
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
index 4607ba1c493..1fb3ed3adef 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
@@ -24,7 +24,7 @@ from RecoConf.reconstruction_objects import make_pvs as _make_pvs
from RecoConf.reconstruction_objects import upfront_reconstruction
from RecoConf.standard_particles import make_down_pions
-from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
+from Hlt2Conf.lines.qee.hlt2_qee import qee_stream_split
turbo_lines = {}
@@ -90,7 +90,7 @@ def DownstreamBuScaInclusive2H_DD(
def DownstreamBuScaInclusive2H_DD_same_sign(
name="Hlt2QEE_DownstreamBuScaInclusive2H_DD_same_sign",
prescale=1.0,
- stream=qee_streamsplit,
+ stream=qee_stream_split,
):
# We actually doesn't require any PID cuts, so it's inclusive
algs = (
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
index c4d4239eefe..6e076064c4d 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
@@ -30,7 +30,7 @@ from RecoConf.standard_particles import (
make_photons,
)
-from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
+from Hlt2Conf.lines.qee.hlt2_qee import qee_stream_split
full_lines = {}
turbo_lines = {}
@@ -100,7 +100,7 @@ for kind in "", "Norm":
persistreco=False,
e_minpt=e_pt_cut, # HLT1 cuts on the PT
make_pvs=make_pvs,
- stream=qee_streamsplit.low,
+ stream=qee_stream_split.low,
):
"""Aiming for prompt pi0/eta -> gamma e+ e- decays. Label the dielectron
as J/psi(1S) [during brem-recovery-reconstruction of dielectron pair] and
@@ -188,7 +188,7 @@ for kind in "", "Norm":
persistreco=False,
e_minpt=e_pt_cut,
make_pvs=make_pvs,
- stream=qee_streamsplit.low,
+ stream=qee_stream_split.low,
):
"""Aiming to normalize prompt pi0/eta -> gamma e+ e+ or gamma e- e- decays. Label
the doubly-charged dielectron as J/psi(1S) and save photons if Pi0/eta in
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
index e86ff6fb6f0..204e5b166c9 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py
@@ -24,7 +24,7 @@ from RecoConf.event_filters import require_pvs
from RecoConf.reconstruction_objects import make_pvs, upfront_reconstruction
from RecoConf.standard_particles import make_ismuon_long_muon
-from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
+from Hlt2Conf.lines.qee.hlt2_qee import qee_stream_split
turbo_lines = {}
full_lines = {}
@@ -86,7 +86,7 @@ def make_dimuons(
def dimuonnoip_line(
name="Hlt2QEE_DiMuonNoIP",
prescale=1,
- stream=qee_streamsplit.high,
+ stream=qee_stream_split.high,
):
pvs = make_pvs()
dimuonnoip = make_dimuons(pvs)
@@ -112,7 +112,7 @@ def displaceddimuon_line(name="Hlt2QEE_DisplacedDiMuon", prescale=1):
@register_line_builder(turbo_lines)
def dimuonnoip_massrange1_ss_line(
- name="Hlt2QEE_DiMuonNoIP_ss", prescale=0.1, stream=qee_streamsplit.low
+ name="Hlt2QEE_DiMuonNoIP_ss", prescale=0.1, stream=qee_stream_split.low
):
pvs = make_pvs()
dimuonnoip = make_dimuons(pvs, opposite_sign=False)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/hlt2_qee.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/hlt2_qee.py
index 9f206fae766..ae2bff44ecc 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/hlt2_qee.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/hlt2_qee.py
@@ -61,4 +61,4 @@ turbo_lines.update(busca.turbo_lines)
# Defining the stream splits for QEE
QEEStreamSplit = namedtuple("QEEStreamSplit", ["low", "high"])
-qee_streamsplit = QEEStreamSplit(low="qeelow", high="qee")
+qee_stream_split = QEEStreamSplit(low="qeelow", high="qee")
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
index dfc56bd59a3..5f95a999a2a 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/muon_detector_showers.py
@@ -23,7 +23,7 @@ from RecoConf.muonid import make_muon_hits
from RecoConf.standard_particles import make_long_muons
from SelAlgorithms import monitoring
-from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
+from Hlt2Conf.lines.qee.hlt2_qee import qee_stream_split
full_lines = {}
turbo_lines = {}
@@ -67,7 +67,7 @@ def mds_BDT_nHits_line_turbo(
MVACut=0.995,
prescale=1.0,
persistreco=False,
- stream=qee_streamsplit.high,
+ stream=qee_stream_split.high,
):
muon_hits = make_muon_hits()
inputs = {
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
index 0056d035554..d9206e20ead 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
@@ -46,7 +46,7 @@ from RecoConf.standard_particles import (
masses,
)
-from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
+from Hlt2Conf.lines.qee.hlt2_qee import qee_stream_split
all_lines = {}
@@ -412,40 +412,40 @@ line_args = {
"NeutronToLambda0KS_DDDD": LineConf("L0Ks", "DDDD", 1.0, [True, True], ""),
# L0L0
"NucleonToLambda0Lambda0_LLLL": LineConf(
- "L0L0", "LLLL", 1.0, [False, False], qee_streamsplit.low
+ "L0L0", "LLLL", 1.0, [False, False], qee_stream_split.low
),
"NucleonToLambda0Lambda0_LLDD": LineConf(
- "L0L0", "LLDD", 1.0, [False, True], qee_streamsplit.low
+ "L0L0", "LLDD", 1.0, [False, True], qee_stream_split.low
),
"NucleonToLambda0Lambda0_DDDD": LineConf(
- "L0L0", "DDDD", 1.0, [True, True], qee_streamsplit.low
+ "L0L0", "DDDD", 1.0, [True, True], qee_stream_split.low
),
# KpKp
"NucleonToKpKpPim_ll": LineConf(
- "KpKpPim", "ll", 0.25, [False, False, False], qee_streamsplit.low
+ "KpKpPim", "ll", 0.25, [False, False, False], qee_stream_split.low
),
"NucleonToKpKpPim_dd": LineConf(
- "KpKpPim", "dd", 0.5, [True, True, True], qee_streamsplit.high
+ "KpKpPim", "dd", 0.5, [True, True, True], qee_stream_split.high
), # This line fires more than 10 MB/s
# KsKp
"NucleonToKS0KpPim_LLl": LineConf(
- "KsKpPim", "LLl", 1.0, [False, False, False], qee_streamsplit.low
+ "KsKpPim", "LLl", 1.0, [False, False, False], qee_stream_split.low
),
"NucleonToKS0KpPim_DDl": LineConf(
- "KsKpPim", "DDl", 1.0, [True, False, False], qee_streamsplit.low
+ "KsKpPim", "DDl", 1.0, [True, False, False], qee_stream_split.low
),
"NucleonToKS0KpPim_DDd": LineConf(
- "KsKpPim", "DDd", 1.0, [True, True, True], qee_streamsplit.high
+ "KsKpPim", "DDd", 1.0, [True, True, True], qee_stream_split.high
), # This line fires more than 10 MB/s
# KsKs
"NucleonToKSKS_LLLL": LineConf(
- "KsKs", "LLLL", 0.01, [False, False], qee_streamsplit.low
+ "KsKs", "LLLL", 0.01, [False, False], qee_stream_split.low
),
"NucleonToKSKS_LLDD": LineConf(
- "KsKscc", "LLDD", 0.01, [False, True], qee_streamsplit.low
+ "KsKscc", "LLDD", 0.01, [False, True], qee_stream_split.low
),
"NucleonToKSKS_DDDD": LineConf(
- "KsKs", "DDDD", 0.01, [True, True], qee_streamsplit.low
+ "KsKs", "DDDD", 0.01, [True, True], qee_stream_split.low
),
}
ProcessConf = namedtuple(
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
index 3e10b67bb21..185f5667cf7 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
@@ -24,7 +24,7 @@ from RecoConf.standard_particles import (
make_ismuon_long_muon,
)
-from Hlt2Conf.lines.qee.hlt2_qee import qee_streamsplit
+from Hlt2Conf.lines.qee.hlt2_qee import qee_stream_split
from Hlt2Conf.lines.qee.qee_builders import (
make_qee_detached_kstar0s,
make_qee_detached_muons,
@@ -205,7 +205,7 @@ def qee_BctoMuN_PiMu_exclTT(name="Hlt2QEE_BctoMuN_PiMu_exclTT", prescale=1.0):
@register_line_builder(turbo_lines)
@configurable
def qee_NtoPiMu_inclTT(
- name="Hlt2QEE_N_PiMu_inclTT", prescale=1, stream=qee_streamsplit.low
+ name="Hlt2QEE_N_PiMu_inclTT", prescale=1, stream=qee_stream_split.low
):
"""A line to select the [N -> pi+ mu-]CC decay for an inclusive selection
for the [B -> X mu (N -> pi mu)] decay"""
@@ -237,7 +237,7 @@ def qee_NtoPiMu_inclTT(
@register_line_builder(turbo_lines)
@configurable
def qee_NtoPiMu_SS_inclTT(
- name="Hlt2QEE_N_PiMu_SS_inclTT", prescale=0.1, stream=qee_streamsplit.low
+ name="Hlt2QEE_N_PiMu_SS_inclTT", prescale=0.1, stream=qee_stream_split.low
):
"""A line to select the [N -> pi+ mu+]CC (i.e. same sign; SS) decay as a background control selection
for the [B -> X mu (N -> pi mu)] decay"""
@@ -269,7 +269,7 @@ def qee_NtoPiMu_SS_inclTT(
@register_line_builder(turbo_lines)
@configurable
def qee_NtoEMuNu_inclTT(
- name="Hlt2QEE_N_EMuNu_inclTT", prescale=1, stream=qee_streamsplit.low
+ name="Hlt2QEE_N_EMuNu_inclTT", prescale=1, stream=qee_stream_split.low
):
"""A line to select the [N -> e+ mu- nu_mu]CC decay for an inclusive selection
for the [B -> X mu (N -> e mu nu)] decay"""
@@ -306,7 +306,7 @@ def qee_NtoEMuNu_inclTT(
@register_line_builder(turbo_lines)
@configurable
def qee_NtoEMuNu_SS_inclTT(
- name="Hlt2QEE_N_EMuNu_SS_inclTT", prescale=0.1, stream=qee_streamsplit.low
+ name="Hlt2QEE_N_EMuNu_SS_inclTT", prescale=0.1, stream=qee_stream_split.low
):
"""A line to select the [N -> e+ mu+ nu_mu]CC (i.e. same sign; SS) decay as a background control
selection for the [B -> X mu (N -> e mu nu)] decay"""
@@ -343,7 +343,7 @@ def qee_NtoEMuNu_SS_inclTT(
@register_line_builder(turbo_lines)
@configurable
def qee_NtoMuMuNu_inclTT(
- name="Hlt2QEE_N_MuMuNu_inclTT", prescale=1, stream=qee_streamsplit.low
+ name="Hlt2QEE_N_MuMuNu_inclTT", prescale=1, stream=qee_stream_split.low
):
"""A line to select the [N -> mu+ mu- nu_mu]CC decay for an inclusive selection
for the [B -> X mu (N -> mu mu nu)] decay"""
@@ -376,7 +376,7 @@ def qee_NtoMuMuNu_inclTT(
@register_line_builder(turbo_lines)
@configurable
def qee_NtoMuMuNu_SS_inclTT(
- name="Hlt2QEE_N_MuMuNu_SS_inclTT", prescale=0.1, stream=qee_streamsplit.low
+ name="Hlt2QEE_N_MuMuNu_SS_inclTT", prescale=0.1, stream=qee_stream_split.low
):
"""A line to select the [N -> mu+ mu+ nu_mu]CC (i.e. same sign; SS) decay as a background control
for the [B -> X mu (N -> mu mu nu)] decay"""
--
GitLab
From aa7c9022d03118adfc9e0df4ded16709dd11527a Mon Sep 17 00:00:00 2001
From: Pasquale Andreola <paandr@farm-gpu2.physik.uzh.ch>
Date: Sat, 5 Apr 2025 16:40:10 +0200
Subject: [PATCH 17/19] Stream split fix for busca line
---
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
index 1fb3ed3adef..31fdee3b10c 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
@@ -90,7 +90,7 @@ def DownstreamBuScaInclusive2H_DD(
def DownstreamBuScaInclusive2H_DD_same_sign(
name="Hlt2QEE_DownstreamBuScaInclusive2H_DD_same_sign",
prescale=1.0,
- stream=qee_stream_split,
+ stream=qee_stream_split.low,
):
# We actually doesn't require any PID cuts, so it's inclusive
algs = (
--
GitLab
From 8f4d6a343c9336153f6f0f6d08cb9214206b152d Mon Sep 17 00:00:00 2001
From: Pasquale Andreola <paandr@farm-gpu2.physik.uzh.ch>
Date: Tue, 8 Apr 2025 16:16:58 +0200
Subject: [PATCH 18/19] Sending Hlt2QEE_DiElectronNoIP{kind}_PersistPhotons{}
lines to qee stream split
---
.../python/Hlt2Conf/lines/qee/dielectron_persist_photons.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
index 6e076064c4d..302b3491332 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dielectron_persist_photons.py
@@ -100,7 +100,7 @@ for kind in "", "Norm":
persistreco=False,
e_minpt=e_pt_cut, # HLT1 cuts on the PT
make_pvs=make_pvs,
- stream=qee_stream_split.low,
+ stream=qee_stream_split.high,
):
"""Aiming for prompt pi0/eta -> gamma e+ e- decays. Label the dielectron
as J/psi(1S) [during brem-recovery-reconstruction of dielectron pair] and
@@ -188,7 +188,7 @@ for kind in "", "Norm":
persistreco=False,
e_minpt=e_pt_cut,
make_pvs=make_pvs,
- stream=qee_stream_split.low,
+ stream=qee_stream_split.high,
):
"""Aiming to normalize prompt pi0/eta -> gamma e+ e+ or gamma e- e- decays. Label
the doubly-charged dielectron as J/psi(1S) and save photons if Pi0/eta in
--
GitLab
From a04c5b56216eba659297b3da950c9f2f3df767ba Mon Sep 17 00:00:00 2001
From: Pasquale Andreola <pasquale.andreola@cern.ch>
Date: Tue, 8 Apr 2025 14:46:57 +0000
Subject: [PATCH 19/19] Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Ross John Hunter <ross.john.hunter@cern.ch>
---
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
index d9206e20ead..7d823b8ba97 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/sexaquark.py
@@ -520,7 +520,7 @@ for sfx, line_config in line_args.items():
sexaquarks, pions, stream.long_pions, stream.down_pions
)
- # If the stream does not have a stream, it reverts to the default one, which is None
+ # If the line does not specify a stream, use "None" so we default to the 2024 stream choice for this line.
if turbostream == "":
turbostream = None
--
GitLab