From 3086f323570d2bf2c881ea92cc05ead6cc086a39 Mon Sep 17 00:00:00 2001
From: Ross Hunter <ross.john.hunter@cern.ch>
Date: Fri, 7 Mar 2025 08:46:28 +0000
Subject: [PATCH 1/5] Remove unused args & cleanup
---
.../python/Hlt2Conf/lines/qee/b_to_majolep_majo_to_leplep.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 2db34009a48..53691ba8885 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
@@ -170,7 +170,7 @@ def build_cut_on_track(cutDict, pvs, corrm=False):
def builder_BToMajoL_line(
- name, bachelorName, children, cutDict=None, prescale=1, persistreco=True
+ name, bachelorName, children, cutDict=None, prescale=1
):
if cutDict is None:
cutDict = {}
@@ -274,4 +274,5 @@ for recoMode in ["LL", "DD"]:
"FDCHI2MIN": 3000,
},
},
+ prescale=1,
)
--
GitLab
From 4ec27d80f82308a60c2d1a19877df0f3ca2d3db6 Mon Sep 17 00:00:00 2001
From: Ross Hunter <ross.john.hunter@cern.ch>
Date: Fri, 7 Mar 2025 09:00:35 +0000
Subject: [PATCH 2/5] Unused pvs args in ttrack_llps
---
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py | 1 -
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py | 6 ------
2 files changed, 7 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py
index 145dbe5ca87..7ec04b3ead6 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py
@@ -837,7 +837,6 @@ def qee_BtoLX_TT(
long_particles,
ttrack_particles,
decay_descriptor,
- pvs,
vertex_z_max=1000.0,
mass_min=2200.0,
mass_max=8300.0,
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
index 66ee855019a..d4cac2be913 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ttrack_llps.py
@@ -64,7 +64,6 @@ def qee_BtoKH_KK_exclTT(name="Hlt2QEE_BtoKH_KK_exclTT", prescale=0.008):
long_particles=filtered_long_kaons,
ttrack_particles=dikaon,
decay_descriptor="[B+ -> K+ KS0]cc",
- pvs=pvs,
)
return Hlt2Line(
name=name,
@@ -84,7 +83,6 @@ def qee_BtoKstar0H_KK_exclTT(name="Hlt2QEE_BtoKstar0H_KK_exclTT", prescale=0.01)
long_particles=long_kstars,
ttrack_particles=dikaon,
decay_descriptor="[B0 -> K*(892)0 KS0]cc",
- pvs=pvs,
)
return Hlt2Line(
name=name,
@@ -104,7 +102,6 @@ def qee_BtoKH_MuMu_exclTT(name="Hlt2QEE_BtoKH_MuMu_exclTT", prescale=1.0):
long_particles=filtered_long_kaons,
ttrack_particles=dimuon,
decay_descriptor="[B+ -> K+ KS0]cc",
- pvs=pvs,
)
return Hlt2Line(
name=name,
@@ -124,7 +121,6 @@ def qee_BtoKstar0H_MuMu_exclTT(name="Hlt2QEE_BtoKstar0H_MuMu_exclTT", prescale=1
long_particles=long_kstars,
ttrack_particles=dimuon,
decay_descriptor="[B0 -> K*(892)0 KS0]cc",
- pvs=pvs,
)
return Hlt2Line(
name=name,
@@ -165,7 +161,6 @@ def qee_BtoMuN_PiMu_exclTT(name="Hlt2QEE_BtoMuN_PiMu_exclTT", prescale=1.0):
long_particles=long_muons,
ttrack_particles=hnl,
decay_descriptor="[B+ -> mu+ KS0]cc",
- pvs=pvs,
)
return Hlt2Line(
name=name,
@@ -186,7 +181,6 @@ def qee_BctoMuN_PiMu_exclTT(name="Hlt2QEE_BctoMuN_PiMu_exclTT", prescale=1.0):
long_particles=long_muons,
ttrack_particles=hnl,
decay_descriptor="[B_c+ -> mu+ KS0]cc",
- pvs=pvs,
mass_min=5200.0,
mass_max=7300.0,
)
--
GitLab
From 86e3c92d207ef79e5bea6d6adfd0d6aadbe97696 Mon Sep 17 00:00:00 2001
From: Ross Hunter <ross.john.hunter@cern.ch>
Date: Fri, 7 Mar 2025 09:02:31 +0000
Subject: [PATCH 3/5] Remove unused pvs args;
---
.../lines/qee/b_to_majolep_majo_to_leplep.py | 5 +----
.../python/Hlt2Conf/lines/qee/busca.py | 1 -
.../python/Hlt2Conf/lines/qee/quarkonia.py | 22 +++++++------------
.../lines/qee/wz_boson_rare_decays.py | 9 ++++----
4 files changed, 13 insertions(+), 24 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 53691ba8885..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, cutDict=None, prescale=1
-):
+def builder_BToMajoL_line(name, bachelorName, children, cutDict=None, prescale=1):
if cutDict is None:
cutDict = {}
@@ -274,5 +272,4 @@ for recoMode in ["LL", "DD"]:
"FDCHI2MIN": 3000,
},
},
- prescale=1,
)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
index 05d593087b3..f604750a687 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/busca.py
@@ -31,7 +31,6 @@ turbo_lines = {}
def make_DownstreamBuScaInclusive2H_DD(
descriptors="KS0 -> pi+ pi-",
name="make_DownstreamBuScaInclusive2H_DD_{hash}",
- make_pvs=_make_pvs,
minP=1400 * MeV,
minPT=175 * MeV,
minZ=500 * mm,
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py
index d98e7248b13..48fb0e2a6a6 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/quarkonia.py
@@ -53,7 +53,6 @@ def make_muons(
def make_dimuon(
- pvs,
name="qee_quarkonia_dimuon_{hash}",
DecayDescriptor="J/psi(1S) -> mu+ mu-",
min_pt_muon=0.0 * GeV,
@@ -91,9 +90,8 @@ def make_dimuon(
@configurable
-def make_jpsi(pvs, min_ownpvdls=None, max_ownpvdls=None):
+def make_jpsi(min_ownpvdls=None, max_ownpvdls=None):
return make_dimuon(
- pvs=pvs,
name="qee_jpsi_{hash}",
DecayDescriptor="J/psi(1S) -> mu+ mu-",
min_pt_muon=MIN_PT_MUON,
@@ -109,9 +107,8 @@ def make_jpsi(pvs, min_ownpvdls=None, max_ownpvdls=None):
@configurable
-def make_upsilon(pvs):
+def make_upsilon():
return make_dimuon(
- pvs=pvs,
name="qee_upsilon_{hash}",
DecayDescriptor="Upsilon(1S) -> mu+ mu-",
min_pt_muon=MIN_PT_MUON,
@@ -132,11 +129,10 @@ def jpsi_to_mu_mu_detached_line(
name="Hlt2QEE_JpsiToMuMu_Detached", prescale=1, persistreco=False
):
"""Jpsi (Detached) decay to two muons line"""
- pvs = make_pvs()
- jpsi = make_jpsi(pvs=pvs, min_ownpvdls=3.0)
+ jpsi = make_jpsi(min_ownpvdls=3.0)
return Hlt2Line(
name=name,
- algs=upfront_reconstruction() + [require_pvs(pvs), jpsi],
+ algs=upfront_reconstruction() + [require_pvs(make_pvs()), jpsi],
prescale=prescale,
persistreco=persistreco,
monitoring_variables=("m", "pt", "eta", "n_candidates"),
@@ -149,11 +145,10 @@ def jpsi_to_mu_mu_prompt_line(
name="Hlt2QEE_JpsiToMuMu_Prompt", prescale=0.1, persistreco=False
):
"""Jpsi (Prompt) decay to two muons line"""
- pvs = make_pvs()
- jpsi = make_jpsi(pvs=pvs, max_ownpvdls=3.0)
+ jpsi = make_jpsi(max_ownpvdls=3.0)
return Hlt2Line(
name=name,
- algs=upfront_reconstruction() + [require_pvs(pvs), jpsi],
+ algs=upfront_reconstruction() + [require_pvs(make_pvs()), jpsi],
prescale=prescale,
persistreco=persistreco,
monitoring_variables=("m", "pt", "eta", "n_candidates"),
@@ -166,11 +161,10 @@ def upsilon_to_mu_mu_line(
name="Hlt2QEE_Upsilon1SToMuMu", prescale=1, persistreco=False
):
"""Upsilon(1S) decay to two muons line"""
- pvs = make_pvs()
- u1s = make_upsilon(pvs=pvs)
+ u1s = make_upsilon()
return Hlt2Line(
name=name,
- algs=upfront_reconstruction() + [require_pvs(pvs), u1s],
+ algs=upfront_reconstruction() + [require_pvs(make_pvs()), u1s],
prescale=prescale,
persistreco=persistreco,
monitoring_variables=("m", "pt", "eta", "n_candidates"),
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 64d73ac86d3..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
@@ -71,7 +71,6 @@ def make_EW_protons(pvs, p_min=1 * GeV, min_pt=1 * GeV, p_pidp_min=-5, mipchi2_m
@configurable
def make_EW_detached_Jpsi(
- pvs,
name="EW_Detached_Jpsi_{hash}",
minIPChi2_muon=4,
ownpvdls_min=9.0,
@@ -365,7 +364,7 @@ def make_EW_B0ToJPsiKst(
ownpvfdchi2_min=10.0,
lifetime=0.2 * picosecond,
):
- jpsi = make_EW_detached_Jpsi(pvs, minIPChi2_muon=mipchi2_min)
+ jpsi = make_EW_detached_Jpsi(minIPChi2_muon=mipchi2_min)
kst = make_EW_KstToKPi(pvs, mipchi2_min=mipchi2_min)
combination_code = F.require_all(in_range(comb_m_min, F.MASS, comb_m_max))
@@ -398,7 +397,7 @@ def make_EW_BsToJPsiPhi(
ownpvfdchi2_min=10.0,
lifetime=0.2 * picosecond,
):
- jpsi = make_EW_detached_Jpsi(pvs, minIPChi2_muon=mipchi2_min)
+ jpsi = make_EW_detached_Jpsi(minIPChi2_muon=mipchi2_min)
phi = make_EW_PhiToKK(pvs, mipchi2_min=mipchi2_min)
combination_code = F.require_all(in_range(comb_m_min, F.MASS, comb_m_max))
@@ -431,7 +430,7 @@ def make_EW_BpToJPsiK(
ownpvfdchi2_min=10.0,
lifetime=0.2 * picosecond,
):
- jpsi = make_EW_detached_Jpsi(pvs, minIPChi2_muon=mipchi2_min)
+ jpsi = make_EW_detached_Jpsi(minIPChi2_muon=mipchi2_min)
kaons = make_EW_kaons(pvs, mipchi2_min=mipchi2_min)
combination_code = F.require_all(in_range(comb_m_min, F.MASS, comb_m_max))
@@ -464,7 +463,7 @@ def make_EW_BcToJPsiPi(
ownpvfdchi2_min=10.0,
lifetime=0.1 * picosecond,
):
- jpsi = make_EW_detached_Jpsi(pvs, minIPChi2_muon=mipchi2_min)
+ jpsi = make_EW_detached_Jpsi(minIPChi2_muon=mipchi2_min)
pions = make_EW_pions(pvs, mipchi2_min=mipchi2_min)
combination_code = F.require_all(in_range(comb_m_min, F.MASS, comb_m_max))
--
GitLab
From 6e90c17b651b0ece5c894c2fd7ca24d3e544d94a Mon Sep 17 00:00:00 2001
From: Ross Hunter <ross.john.hunter@cern.ch>
Date: Thu, 20 Mar 2025 14:39:48 +0000
Subject: [PATCH 4/5] Remove unused args in make_filter_tracks
---
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py
index 7ec04b3ead6..9ca952869f6 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py
@@ -47,8 +47,6 @@ def make_filter_tracks(
name="qee_has_rich_long_pions",
pt_min=0.25 * GeV,
p_min=2.0 * GeV,
- trchi2dof_max=3, # TBC with Reco
- trghostprob_max=0.4, # TBC with Reco
mipchi2dvprimary_min=None,
pid=None,
additionalCuts=None,
--
GitLab
From 29c0b77f80db469891e805b6d7667ad0ae5a23a1 Mon Sep 17 00:00:00 2001
From: Ross Hunter <ross.john.hunter@cern.ch>
Date: Thu, 20 Mar 2025 15:14:27 +0000
Subject: [PATCH 5/5] Remove unused imports in spruce_qee
---
Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/spruce_qee.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/spruce_qee.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/spruce_qee.py
index bf22a07928c..1fed01bde53 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/spruce_qee.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/spruce_qee.py
@@ -109,10 +109,8 @@ from Hlt2Conf.lines.qee.single_high_pt_electron import (
)
from Hlt2Conf.lines.qee.single_high_pt_muon import (
make_isolated_muons,
- single_muon_highpt_iso_line,
single_muon_highpt_line,
single_muon_highpt_nomuid_line,
- single_muon_highpt_prescale_line,
)
from Hlt2Conf.lines.qee.single_high_pt_muon import threshold_map as muon_thresholds
from Hlt2Conf.lines.qee.top_muon_elec import (
--
GitLab