From 82d0f0258d5c470b9c8954440d3f94300ebc11f0 Mon Sep 17 00:00:00 2001
From: Murilo Santana Rangel <murilo.rangel@cern.ch>
Date: Thu, 13 Mar 2025 15:15:54 +0100
Subject: [PATCH 1/4] Replacing BPV functors by OWNPV version in standard_jets
---
Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py
index dc3bf5882b0..f68c02f88a1 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py
@@ -59,7 +59,7 @@ def make_topo_v0s(particles, pvs, bpvltime_min=0.0 * picosecond):
displacement cut.
"""
## TODO: Eliminate this step if it remains redundant
- code = F.require_all(F.BPVLTIME(pvs) > bpvltime_min)
+ code = F.require_all(F.OWNPVLTIME > bpvltime_min)
return ParticleFilter(particles, F.FILTER(code))
@@ -122,18 +122,18 @@ def make_topo_2body(
"""
Make generic Topo 2-body candidates used as tagging input to jet builder.
"""
- pvs = make_pvs()
+ pOWNPVLTIMEvs = make_pvs()
combination_code = F.require_all(
F.PT > apt_min,
F.MASS() < am_max,
F.MAXSDOCACHI2CUT(adocachi2_max),
- F.SUM(F.IS_ABS_ID("K+") & (F.BPVIPCHI2(pvs) < ipchi2_max_an))
+ F.SUM(F.IS_ABS_ID("K+") & (F.OWNPVIPCHI2 < ipchi2_max_an))
< an_ipchi2_max_an,
)
vertex_code = F.require_all(
F.CHI2DOF() < adocachi2_max,
- F.BPVFDCHI2(pvs) > bpvvdchi2_min,
- Fmath.in_range(bpveta_min, F.BPVETA(pvs), bpveta_max),
+ F.OWNPVFDCHI2 > bpvvdchi2_min,
+ Fmath.in_range(bpveta_min, F.OWNPVETA, bpveta_max),
)
inputs = prepare_topo_particles(pvs)
@@ -176,7 +176,7 @@ def make_topo_2body_with_svtag(
F.PT > apt_min,
F.MASS() < am_max,
F.MAXSDOCACHI2CUT(adocachi2_max),
- F.SUM(F.IS_ABS_ID("K+") & (F.BPVIPCHI2(pvs) < ipchi2_max_an))
+ F.SUM(F.IS_ABS_ID("K+") & (F.OWNPVIPCHI2 < ipchi2_max_an))
< an_ipchi2_max_an,
)
vertex_code = F.require_all(
@@ -184,8 +184,8 @@ def make_topo_2body_with_svtag(
F.MINTREE(F.IS_ABS_ID("K+"), F.MINIPCHI2(pvs)) > prod_ipchi2_min,
F.MINTREE(F.ALL, F.PT) > prod_pt_min,
F.CHI2DOF() < adocachi2_max,
- Fmath.in_range(bpveta_min, F.BPVETA(pvs), bpveta_max),
- F.BPVFDCHI2(pvs) > bpvvdchi2_min,
+ Fmath.in_range(bpveta_min, F.OWNPVETA, bpveta_max),
+ F.OWNPVFDCHI2 > bpvvdchi2_min,
)
inputs = prepare_topo_particles(pvs)
--
GitLab
From b7a0d93956b6b65a6997fe5236aa44878f57dd8a Mon Sep 17 00:00:00 2001
From: Gitlab CI <noreply@cern.ch>
Date: Thu, 13 Mar 2025 16:00:03 +0000
Subject: [PATCH 2/4] pre-commit fixes
patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/52704384
---
Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py
index f68c02f88a1..1372ee4de96 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py
@@ -127,8 +127,7 @@ def make_topo_2body(
F.PT > apt_min,
F.MASS() < am_max,
F.MAXSDOCACHI2CUT(adocachi2_max),
- F.SUM(F.IS_ABS_ID("K+") & (F.OWNPVIPCHI2 < ipchi2_max_an))
- < an_ipchi2_max_an,
+ F.SUM(F.IS_ABS_ID("K+") & (F.OWNPVIPCHI2 < ipchi2_max_an)) < an_ipchi2_max_an,
)
vertex_code = F.require_all(
F.CHI2DOF() < adocachi2_max,
@@ -176,8 +175,7 @@ def make_topo_2body_with_svtag(
F.PT > apt_min,
F.MASS() < am_max,
F.MAXSDOCACHI2CUT(adocachi2_max),
- F.SUM(F.IS_ABS_ID("K+") & (F.OWNPVIPCHI2 < ipchi2_max_an))
- < an_ipchi2_max_an,
+ F.SUM(F.IS_ABS_ID("K+") & (F.OWNPVIPCHI2 < ipchi2_max_an)) < an_ipchi2_max_an,
)
vertex_code = F.require_all(
F.MINTREE(F.IS_ABS_ID("K+"), F.GHOSTPROB()) < prod_ghostprob_max,
--
GitLab
From b979425b4fc477f0c75269d2247692f084670881 Mon Sep 17 00:00:00 2001
From: Murilo Santana Rangel <murilo.rangel@cern.ch>
Date: Fri, 14 Mar 2025 19:01:51 +0100
Subject: [PATCH 3/4] split pt and filter jets
---
Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py | 29 ++++++++++++-------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py
index 1372ee4de96..c012076a273 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py
@@ -59,7 +59,7 @@ def make_topo_v0s(particles, pvs, bpvltime_min=0.0 * picosecond):
displacement cut.
"""
## TODO: Eliminate this step if it remains redundant
- code = F.require_all(F.OWNPVLTIME > bpvltime_min)
+ code = F.require_all(F.BPVLTIME(pvs) > bpvltime_min)
return ParticleFilter(particles, F.FILTER(code))
@@ -122,17 +122,18 @@ def make_topo_2body(
"""
Make generic Topo 2-body candidates used as tagging input to jet builder.
"""
- pOWNPVLTIMEvs = make_pvs()
+ pvs = make_pvs()
combination_code = F.require_all(
F.PT > apt_min,
F.MASS() < am_max,
F.MAXSDOCACHI2CUT(adocachi2_max),
- F.SUM(F.IS_ABS_ID("K+") & (F.OWNPVIPCHI2 < ipchi2_max_an)) < an_ipchi2_max_an,
+ F.SUM(F.IS_ABS_ID("K+") & (F.BPVIPCHI2(pvs) < ipchi2_max_an))
+ < an_ipchi2_max_an,
)
vertex_code = F.require_all(
F.CHI2DOF() < adocachi2_max,
- F.OWNPVFDCHI2 > bpvvdchi2_min,
- Fmath.in_range(bpveta_min, F.OWNPVETA, bpveta_max),
+ F.BPVFDCHI2(pvs) > bpvvdchi2_min,
+ Fmath.in_range(bpveta_min, F.BPVETA(pvs), bpveta_max),
)
inputs = prepare_topo_particles(pvs)
@@ -175,15 +176,16 @@ def make_topo_2body_with_svtag(
F.PT > apt_min,
F.MASS() < am_max,
F.MAXSDOCACHI2CUT(adocachi2_max),
- F.SUM(F.IS_ABS_ID("K+") & (F.OWNPVIPCHI2 < ipchi2_max_an)) < an_ipchi2_max_an,
+ F.SUM(F.IS_ABS_ID("K+") & (F.BPVIPCHI2(pvs) < ipchi2_max_an))
+ < an_ipchi2_max_an,
)
vertex_code = F.require_all(
F.MINTREE(F.IS_ABS_ID("K+"), F.GHOSTPROB()) < prod_ghostprob_max,
F.MINTREE(F.IS_ABS_ID("K+"), F.MINIPCHI2(pvs)) > prod_ipchi2_min,
F.MINTREE(F.ALL, F.PT) > prod_pt_min,
F.CHI2DOF() < adocachi2_max,
- Fmath.in_range(bpveta_min, F.OWNPVETA, bpveta_max),
- F.OWNPVFDCHI2 > bpvvdchi2_min,
+ Fmath.in_range(bpveta_min, F.BPVETA(pvs), bpveta_max),
+ F.BPVFDCHI2(pvs) > bpvvdchi2_min,
)
inputs = prepare_topo_particles(pvs)
@@ -317,9 +319,8 @@ def make_trackjets(
code = F.require_all(F.IS_ABS_ID("CELLjet"), F.PT > pt_min)
return ParticleFilter(jets, F.FILTER(code), name=name)
-
@configurable
-def make_jets(name="SimpleJets_{hash}", pt_min=10 * GeV, JetsByVtx=True, tags=None):
+def get_seljets(JetsByVtx=True, tags=None, name="GetSelJets_{hash}"):
pflow = make_particleflow()
jets = build_jets(pflow, JetsByVtx, name="JetBuilder" + name)
@@ -328,10 +329,16 @@ def make_jets(name="SimpleJets_{hash}", pt_min=10 * GeV, JetsByVtx=True, tags=No
jets = taggedjets
code = F.require_all(
- F.IS_ABS_ID("CELLjet"), F.PT > pt_min, F.NINGENERATION(F.CHARGE != 0, 1) > 0
+ F.IS_ABS_ID("CELLjet"), F.NINGENERATION(F.CHARGE != 0, 1) > 0
)
return ParticleFilter(jets, F.FILTER(code), name=name)
+@configurable
+def make_jets(name="SimpleJets_{hash}", pt_min=10 * GeV, JetsByVtx=True, tags=None):
+ jets = get_seljets(JetsByVtx, tags, name="GetSelJets" + name)
+
+ code = F.require_all(F.PT > pt_min)
+ return ParticleFilter(jets, F.FILTER(code), name=name)
@configurable
def make_dijets(
--
GitLab
From a8ac0c791e17adfd7f6baac32512def11f0538a0 Mon Sep 17 00:00:00 2001
From: Gitlab CI <noreply@cern.ch>
Date: Fri, 14 Mar 2025 18:16:23 +0000
Subject: [PATCH 4/4] pre-commit fixes
patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/52765172
---
Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py
index c012076a273..bc6e422684b 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_jets.py
@@ -319,6 +319,7 @@ def make_trackjets(
code = F.require_all(F.IS_ABS_ID("CELLjet"), F.PT > pt_min)
return ParticleFilter(jets, F.FILTER(code), name=name)
+
@configurable
def get_seljets(JetsByVtx=True, tags=None, name="GetSelJets_{hash}"):
pflow = make_particleflow()
@@ -328,11 +329,10 @@ def get_seljets(JetsByVtx=True, tags=None, name="GetSelJets_{hash}"):
taggedjets = tag_jets(jets, tags, useflightdirection=True, name="Tags" + name)
jets = taggedjets
- code = F.require_all(
- F.IS_ABS_ID("CELLjet"), F.NINGENERATION(F.CHARGE != 0, 1) > 0
- )
+ code = F.require_all(F.IS_ABS_ID("CELLjet"), F.NINGENERATION(F.CHARGE != 0, 1) > 0)
return ParticleFilter(jets, F.FILTER(code), name=name)
+
@configurable
def make_jets(name="SimpleJets_{hash}", pt_min=10 * GeV, JetsByVtx=True, tags=None):
jets = get_seljets(JetsByVtx, tags, name="GetSelJets" + name)
@@ -340,6 +340,7 @@ def make_jets(name="SimpleJets_{hash}", pt_min=10 * GeV, JetsByVtx=True, tags=No
code = F.require_all(F.PT > pt_min)
return ParticleFilter(jets, F.FILTER(code), name=name)
+
@configurable
def make_dijets(
tagpair=(None, None), min_dijet_mass=0 * GeV, prod_pt_min=10 * GeV, min_dphi=0.0
--
GitLab