From 1f6d809010f9b22afd8fb8fc5d6fe6f284a531d7 Mon Sep 17 00:00:00 2001
From: yucx <yucx@farm212..>
Date: Tue, 2 Jul 2024 14:25:18 +0800
Subject: [PATCH 01/11] Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/_2024

---
 .../bandq/builders/b_to_jpsiX_NoMuonID.py     | 147 ++++++++++++------
 1 file changed, 100 insertions(+), 47 deletions(-)

diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
index a4b86ec9842..a3cb2078572 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
@@ -34,7 +34,7 @@ from Hlt2Conf.lines.bandq.builders.charged_hadrons import make_detached_kaons, m
 def make_NoMuonID_muons(
         make_particles=make_long_muons,
         name="bandq_NoMuonID_muons_{hash}",
-        pt_min=300. * MeV,
+        pt_min=500. * MeV,  #?OK
         p_min=4 * GeV,
         p_max=200. * GeV,
         eta_min=2.,
@@ -55,7 +55,29 @@ def make_NoMuonID_muons(
 
     return ParticleFilter(make_particles(), name=name, Cut=F.FILTER(code))
 
+@configurable
+def make_NoMuonID_NoRICHID_muons(
+        make_particles=make_long_muons,
+        name="bandq_NoMuonID_muons_{hash}",
+        pt_min=500. * MeV,  #?OK
+        p_min=4 * GeV,
+        p_max=200. * GeV,
+        eta_min=2.,
+        eta_max=5.,
+        mipchi2dvprimary_min=9,
+        pid=None):
+        ):
+
+    pvs = make_pvs()
 
+    code = require_all(F.PT > pt_min, in_range(p_min, F.P, p_max),
+                       in_range(eta_min, F.ETA, eta_max),
+                       F.MINIPCHI2(pvs) > mipchi2dvprimary_min)
+
+    if (pid is not None):
+        code &= pid
+
+    return ParticleFilter(make_particles(), name=name, Cut=F.FILTER(code))
 @configurable
 def make_detached_kaons_forB2JpsiX_NoMuonID(
         make_particles=make_detached_kaons,
@@ -132,10 +154,11 @@ def make_detachedKPi_forB2JpsiX_NoMuonID(
 def make_detachedKst_forB2JpsiX_NoMuonID(
         KPi_comb=make_detachedKPi_forB2JpsiX_NoMuonID,
         name="bandq_detachedKst_forB2JpsiX_NoMuonID_{hash}",
-        m_min=800. * MeV,
-        m_max=1000. * MeV):
+        m_min=700. * MeV,
+        m_max=1100. * MeV,
+        PT_min=600. * MeV):
 
-    code = in_range(m_min, F.MASS, m_max)
+    code = F.require_all(in_range(m_min, F.MASS, m_max), F.PT > PT_min)
 
     return ParticleFilter(KPi_comb(), name=name, Cut=F.FILTER(code))
 
@@ -169,9 +192,10 @@ def make_detachedKK_forB2JpsiX_NoMuonID(
 def make_detachedPhi_forB2JpsiX_NoMuonID(
         KK_comb=make_detachedKK_forB2JpsiX_NoMuonID,
         name="bandq_detachedPhi_forB2JpsiX_NoMuonID_{hash}",
-        m_max=1300. * MeV):
+        m_max=1100. * MeV,
+        PT_min=400. * MeV):
 
-    code = (F.MASS < m_max)
+    code = F.require_all(F.MASS < m_max, F.PT > PT_min)
 
     return ParticleFilter(KK_comb(), name=name, Cut=F.FILTER(code))
 
@@ -180,13 +204,13 @@ def make_detachedPhi_forB2JpsiX_NoMuonID(
 def make_Jpsi_NoMuonID(muons=make_NoMuonID_muons,
                        name="bandq_Jpsi_NoMuonID_{hash}",
                        descriptor='J/psi(1S) -> mu+ mu-',
-                       am_min=2996. * MeV,
-                       am_max=3196. * MeV,
+                       am_min=2936. * MeV,
+                       am_max=3256. * MeV,
                        apt_min=600 * MeV,
                        maxdocachi2=20.,
-                       m_min=3036. * MeV,
-                       m_max=3156. * MeV,
-                       pt_min=1000 * MeV,
+                       m_min=2946. * MeV,
+                       m_max=3246. * MeV,
+                       pt_min=1200 * MeV,
                        bpvdls_min=3):
 
     pvs = make_pvs()
@@ -208,18 +232,26 @@ def make_Jpsi_NoMuonID(muons=make_NoMuonID_muons,
 
 
 @configurable
-def make_Bp2JpsiKp_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
-                            kaons=make_detached_kaons_forB2JpsiX_NoMuonID,
-                            name="bandq_Bp2JpsiKp_NoMuonID_{hash}",
-                            descriptor='[B+ -> J/psi(1S) K+]cc',
-                            am_min=5190. * MeV,
-                            am_max=5370. * MeV,
-                            apt_min=1200 * MeV,
-                            m_min=5200. * MeV,
-                            m_max=5360. * MeV,
-                            pt_min=1400 * MeV,
-                            vtx_chi2pdof_max=16,
-                            bpvltime_min=0.2 * picosecond):
+def make_Bp2JpsiKp_NoMuonID(
+        Jpsi=make_Jpsi_NoMuonID,
+        kaons=make_detached_kaons_forB2JpsiX_NoMuonID,
+        name="bandq_Bp2JpsiKp_NoMuonID_{hash}",
+        descriptor='[B+ -> J/psi(1S) K+]cc',
+        #  am_min=5280. * MeV,
+        #  am_max=5460. * MeV,?OK
+        am_min=4940. * MeV,
+        am_max=5460. * MeV,
+        apt_min=1200 * MeV,
+        #  m_min=5290. * MeV,
+        #  m_max=5450. * MeV,
+        m_min=4950. * MeV,
+        m_max=5450. * MeV,
+        pt_min=1400 * MeV,
+        vtx_chi2pdof_max=16,
+        delta_m_min=2050 * MeV,  #?OK
+        delta_m_max=2310 * MeV,
+        bpv_dira_min=0.9999,
+        bpvltime_min=0.19 * picosecond):
 
     pvs = make_pvs()
 
@@ -229,6 +261,8 @@ def make_Bp2JpsiKp_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
     vertex_code = F.require_all(
         in_range(m_min, F.MASS, m_max), F.CHI2DOF < vtx_chi2pdof_max,
         (F.PT > pt_min),
+        F.BPVDIRA(pvs) > bpv_dira_min,
+        in_range(delta_m_min, F.MASS - F.CHILD(1, F.MASS), delta_m_max),
         F.BPVLTIME(pvs) > bpvltime_min)
 
     return ParticleCombiner(
@@ -240,18 +274,26 @@ def make_Bp2JpsiKp_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
 
 
 @configurable
-def make_Bz2JpsiKpPim_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
-                               KPi_comb=make_detachedKPi_forB2JpsiX_NoMuonID,
-                               name="bandq_Bz2JpsiKpPim_NoMuonID_{hash}",
-                               descriptor='[B0 -> K*(892)0 J/psi(1S)]cc',
-                               am_min=5190. * MeV,
-                               am_max=5370. * MeV,
-                               apt_min=1200 * MeV,
-                               m_min=5200. * MeV,
-                               m_max=5360. * MeV,
-                               pt_min=1400 * MeV,
-                               vtx_chi2pdof_max=16,
-                               bpvltime_min=0.2 * picosecond):
+def make_Bz2JpsiKpPim_NoMuonID(
+        Jpsi=make_Jpsi_NoMuonID,
+        KPi_comb=make_detachedKst_forB2JpsiX_NoMuonID,
+        name="bandq_Bz2JpsiKpPim_NoMuonID_{hash}",
+        descriptor='[B0 -> K*(892)0 J/psi(1S)]cc',
+        #  am_min=5280. * MeV,
+        #  am_max=5460. * MeV,?OK
+        am_min=4940. * MeV,
+        am_max=5460. * MeV,
+        apt_min=1200 * MeV,
+        #  m_min=5290. * MeV,
+        #  m_max=5450. * MeV,
+        m_min=4950. * MeV,
+        m_max=5450. * MeV,
+        pt_min=1400 * MeV,
+        vtx_chi2pdof_max=16,
+        delta_m_min=2050 * MeV,  #?OK
+        delta_m_max=2310 * MeV,
+        bpv_dira_min=0.9997,
+        bpvltime_min=0.19 * picosecond):
 
     pvs = make_pvs()
 
@@ -261,6 +303,8 @@ def make_Bz2JpsiKpPim_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
     vertex_code = F.require_all(
         in_range(m_min, F.MASS, m_max), F.CHI2DOF < vtx_chi2pdof_max,
         (F.PT > pt_min),
+        in_range(delta_m_min, F.MASS - F.CHILD(2, F.MASS), delta_m_max),
+        F.BPVDIRA(pvs) > bpv_dira_min,
         F.BPVLTIME(pvs) > bpvltime_min)
 
     return ParticleCombiner(
@@ -304,18 +348,24 @@ def make_Bz2JpsiKst_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
 
 
 @configurable
-def make_Bs2JpsiKpKm_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
-                              KK_comb=make_detachedKK_forB2JpsiX_NoMuonID,
-                              name="bandq_Bs2JpsiKpKm_NoMuonID_{hash}",
-                              descriptor='B_s0 -> phi(1020) J/psi(1S) ',
-                              am_min=5280. * MeV,
-                              am_max=5460. * MeV,
-                              apt_min=1200 * MeV,
-                              m_min=5290. * MeV,
-                              m_max=5450. * MeV,
-                              pt_min=1400 * MeV,
-                              vtx_chi2pdof_max=16,
-                              bpvltime_min=0.2 * picosecond):
+def make_Bs2JpsiKpKm_NoMuonID(
+        Jpsi=make_Jpsi_NoMuonID,
+        KK_comb=make_detachedPhi_forB2JpsiX_NoMuonID,
+        name="bandq_Bs2JpsiKpKm_NoMuonID_{hash}",
+        descriptor='B_s0 -> phi(1020) J/psi(1S) ',
+        am_min=5100. * MeV,
+        am_max=5640. * MeV,
+        apt_min=1200 * MeV,
+        #  m_min=5290. * MeV,
+        #  m_max=5450. * MeV,
+        m_min=5120. * MeV,
+        m_max=5620. * MeV,
+        pt_min=1400 * MeV,
+        vtx_chi2pdof_max=16,
+        delta_m_min=2150 * MeV,  #?OK
+        delta_m_max=2400 * MeV,
+        bpv_dira_min=0.9997,
+        bpvltime_min=0.19 * picosecond):
 
     pvs = make_pvs()
 
@@ -324,7 +374,9 @@ def make_Bs2JpsiKpKm_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
 
     vertex_code = F.require_all(
         in_range(m_min, F.MASS, m_max), F.CHI2DOF < vtx_chi2pdof_max,
+        in_range(delta_m_min, F.MASS - F.CHILD(2, F.MASS), delta_m_max),
         (F.PT > pt_min),
+        F.BPVDIRA(pvs) > bpv_dira_min,
         F.BPVLTIME(pvs) > bpvltime_min)
 
     return ParticleCombiner(
@@ -365,3 +417,4 @@ def make_Bs2JpsiPhi_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
         DecayDescriptor=descriptor,
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
+
-- 
GitLab


From 5c24d874e4838ae00d8ce99bd4c786a48126d1f7 Mon Sep 17 00:00:00 2001
From: yucx <yucx@farm212..>
Date: Tue, 2 Jul 2024 14:41:33 +0800
Subject: [PATCH 02/11] Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/_fixbugs

---
 .../python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
index a3cb2078572..4219a763296 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
@@ -66,7 +66,6 @@ def make_NoMuonID_NoRICHID_muons(
         eta_max=5.,
         mipchi2dvprimary_min=9,
         pid=None):
-        ):
 
     pvs = make_pvs()
 
-- 
GitLab


From 2c135d3ae8ac464bc3d61e05aae5bc4bbe8e37fd Mon Sep 17 00:00:00 2001
From: yucx <yucx@farm212..>
Date: Thu, 4 Jul 2024 15:37:21 +0800
Subject: [PATCH 03/11] update_on_NoMuonLines

---
 .../bandq/builders/b_to_jpsiX_NoMuonID.py     | 292 ++++++++++++++++--
 .../python/Hlt2Conf/lines/bandq/hlt2_bandq.py | 103 ++++--
 2 files changed, 350 insertions(+), 45 deletions(-)

diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
index 4219a763296..7ab03d0e0e0 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
@@ -153,11 +153,11 @@ def make_detachedKPi_forB2JpsiX_NoMuonID(
 def make_detachedKst_forB2JpsiX_NoMuonID(
         KPi_comb=make_detachedKPi_forB2JpsiX_NoMuonID,
         name="bandq_detachedKst_forB2JpsiX_NoMuonID_{hash}",
-        m_min=700. * MeV,
+        # m_min=700. * MeV,
         m_max=1100. * MeV,
         PT_min=600. * MeV):
 
-    code = F.require_all(in_range(m_min, F.MASS, m_max), F.PT > PT_min)
+    code = F.require_all( F.MASS< m_max, F.PT > PT_min)
 
     return ParticleFilter(KPi_comb(), name=name, Cut=F.FILTER(code))
 
@@ -229,6 +229,67 @@ def make_Jpsi_NoMuonID(muons=make_NoMuonID_muons,
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
 
+@configurable
+def make_Jpsi_pTag_NoMuonID(muonp=make_NoMuonID_muons,
+                       muonm=make_NoMuonID_NoRICHID_muons,
+                       name="bandq_Jpsi_pTag_NoMuonID_{hash}",
+                       descriptor='J/psi(1S) -> mu+ mu-',
+                       am_min=2936. * MeV,
+                       am_max=3256. * MeV,
+                       apt_min=600 * MeV,
+                       maxdocachi2=20.,
+                       m_min=2946. * MeV,
+                       m_max=3246. * MeV,
+                       pt_min=1200 * MeV,
+                       bpvdls_min=3):
+
+    pvs = make_pvs()
+
+    combination_code = F.require_all(
+        in_range(am_min, F.MASS, am_max), F.MAXSDOCACHI2CUT(maxdocachi2),
+        (F.PT > apt_min))
+
+    vertex_code = F.require_all(
+        in_range(m_min, F.MASS, m_max), (F.PT > pt_min),
+        F.BPVDLS(pvs) > bpvdls_min)
+
+    return ParticleCombiner(
+        name=name,
+        Inputs=[muonp(), muonm()],
+        DecayDescriptor=descriptor,
+        CombinationCut=combination_code,
+        CompositeCut=vertex_code)
+
+@configurable
+def make_Jpsi_mTag_NoMuonID(muonm=make_NoMuonID_muons,
+                       muonp=make_NoMuonID_NoRICHID_muons,
+                       name="bandq_Jpsi_mTag_NoMuonID_{hash}",
+                       descriptor='J/psi(1S) -> mu+ mu-',
+                       am_min=2936. * MeV,
+                       am_max=3256. * MeV,
+                       apt_min=600 * MeV,
+                       maxdocachi2=20.,
+                       m_min=2946. * MeV,
+                       m_max=3246. * MeV,
+                       pt_min=1200 * MeV,
+                       bpvdls_min=3):
+
+    pvs = make_pvs()
+
+    combination_code = F.require_all(
+        in_range(am_min, F.MASS, am_max), F.MAXSDOCACHI2CUT(maxdocachi2),
+        (F.PT > apt_min))
+
+    vertex_code = F.require_all(
+        in_range(m_min, F.MASS, m_max), (F.PT > pt_min),
+        F.BPVDLS(pvs) > bpvdls_min)
+
+    return ParticleCombiner(
+        name=name,
+        Inputs=[muonp(), muonm()],
+        DecayDescriptor=descriptor,
+        CombinationCut=combination_code,
+        CompositeCut=vertex_code)
 
 @configurable
 def make_Bp2JpsiKp_NoMuonID(
@@ -272,6 +333,88 @@ def make_Bp2JpsiKp_NoMuonID(
         CompositeCut=vertex_code)
 
 
+@configurable
+def make_Bp2JpsiKp_pTag_NoMuonID(
+        Jpsi=make_Jpsi_pTag_NoMuonID,
+        kaons=make_detached_kaons_forB2JpsiX_NoMuonID,
+        name="bandq_Bp2JpsiKp_pTag_NoMuonID_{hash}",
+        descriptor='[B+ -> J/psi(1S) K+]cc',
+        #  am_min=5280. * MeV,
+        #  am_max=5460. * MeV,?OK
+        am_min=4740. * MeV,
+        am_max=5760. * MeV,
+        apt_min=1200 * MeV,
+        #  m_min=5290. * MeV,
+        #  m_max=5450. * MeV,
+        m_min=4750. * MeV,
+        m_max=5750. * MeV,
+        pt_min=1400 * MeV,
+        vtx_chi2pdof_max=16,
+        delta_m_min=2050 * MeV,  #?OK
+        delta_m_max=2310 * MeV,
+        bpv_dira_min=0.9995,
+        bpvltime_min=0.19 * picosecond):
+
+    pvs = make_pvs()
+
+    combination_code = F.require_all(
+        in_range(am_min, F.MASS, am_max), (F.PT > apt_min))
+
+    vertex_code = F.require_all(
+        in_range(m_min, F.MASS, m_max), F.CHI2DOF < vtx_chi2pdof_max,
+        (F.PT > pt_min),
+        F.BPVDIRA(pvs) > bpv_dira_min,
+        in_range(delta_m_min, F.MASS - F.CHILD(1, F.MASS), delta_m_max),
+        F.BPVLTIME(pvs) > bpvltime_min)
+
+    return ParticleCombiner(
+        name=name,
+        Inputs=[Jpsi(), kaons()],
+        DecayDescriptor=descriptor,
+        CombinationCut=combination_code,
+        CompositeCut=vertex_code)
+
+@configurable
+def make_Bp2JpsiKp_mTag_NoMuonID(
+        Jpsi=make_Jpsi_mTag_NoMuonID,
+        kaons=make_detached_kaons_forB2JpsiX_NoMuonID,
+        name="bandq_Bp2JpsiKp_mTag_NoMuonID_{hash}",
+        descriptor='[B+ -> J/psi(1S) K+]cc',
+        #  am_min=5280. * MeV,
+        #  am_max=5460. * MeV,?OK
+        am_min=4740. * MeV,
+        am_max=5760. * MeV,
+        apt_min=1200 * MeV,
+        #  m_min=5290. * MeV,
+        #  m_max=5450. * MeV,
+        m_min=4750. * MeV,
+        m_max=5750. * MeV,
+        pt_min=1400 * MeV,
+        vtx_chi2pdof_max=16,
+        delta_m_min=2050 * MeV,  #?OK
+        delta_m_max=2310 * MeV,
+        bpv_dira_min=0.9995,
+        bpvltime_min=0.19 * picosecond):
+
+    pvs = make_pvs()
+
+    combination_code = F.require_all(
+        in_range(am_min, F.MASS, am_max), (F.PT > apt_min))
+
+    vertex_code = F.require_all(
+        in_range(m_min, F.MASS, m_max), F.CHI2DOF < vtx_chi2pdof_max,
+        (F.PT > pt_min),
+        F.BPVDIRA(pvs) > bpv_dira_min,
+        in_range(delta_m_min, F.MASS - F.CHILD(1, F.MASS), delta_m_max),
+        F.BPVLTIME(pvs) > bpvltime_min)
+
+    return ParticleCombiner(
+        name=name,
+        Inputs=[Jpsi(), kaons()],
+        DecayDescriptor=descriptor,
+        CombinationCut=combination_code,
+        CompositeCut=vertex_code)
+
 @configurable
 def make_Bz2JpsiKpPim_NoMuonID(
         Jpsi=make_Jpsi_NoMuonID,
@@ -313,20 +456,68 @@ def make_Bz2JpsiKpPim_NoMuonID(
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
 
+@configurable
+def make_Bz2JpsiKpPim_pTag_NoMuonID(
+        Jpsi=make_Jpsi_pTag_NoMuonID,
+        KPi_comb=make_detachedKst_forB2JpsiX_NoMuonID,
+        name="bandq_Bz2JpsiKpPim_pTag_NoMuonID_{hash}",
+        descriptor='[B0 -> K*(892)0 J/psi(1S)]cc',
+        #  am_min=5280. * MeV,
+        #  am_max=5460. * MeV,?OK
+        am_min=4740. * MeV,
+        am_max=5760. * MeV,
+        apt_min=1200 * MeV,
+        #  m_min=5290. * MeV,
+        #  m_max=5450. * MeV,
+        m_min=4750. * MeV,
+        m_max=5750. * MeV,
+        pt_min=1400 * MeV,
+        vtx_chi2pdof_max=16,
+        delta_m_min=2050 * MeV,  #?OK
+        delta_m_max=2310 * MeV,
+        bpv_dira_min=0.9995,
+        bpvltime_min=0.19 * picosecond):
+
+    pvs = make_pvs()
+
+    combination_code = F.require_all(
+        in_range(am_min, F.MASS, am_max), (F.PT > apt_min))
+
+    vertex_code = F.require_all(
+        in_range(m_min, F.MASS, m_max), F.CHI2DOF < vtx_chi2pdof_max,
+        (F.PT > pt_min),
+        in_range(delta_m_min, F.MASS - F.CHILD(2, F.MASS), delta_m_max),
+        F.BPVDIRA(pvs) > bpv_dira_min,
+        F.BPVLTIME(pvs) > bpvltime_min)
+
+    return ParticleCombiner(
+        name=name,
+        Inputs=[KPi_comb(), Jpsi()],
+        DecayDescriptor=descriptor,
+        CombinationCut=combination_code,
+        CompositeCut=vertex_code)
 
 @configurable
-def make_Bz2JpsiKst_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
-                             KPi_comb=make_detachedKst_forB2JpsiX_NoMuonID,
-                             name="bandq_Bz2JpsiKst_NoMuonID_{hash}",
-                             descriptor='[B0 -> K*(892)0 J/psi(1S)]cc',
-                             am_min=5190. * MeV,
-                             am_max=5370. * MeV,
-                             apt_min=1200 * MeV,
-                             m_min=5200. * MeV,
-                             m_max=5360. * MeV,
-                             pt_min=1400 * MeV,
-                             vtx_chi2pdof_max=16,
-                             bpvltime_min=0.2 * picosecond):
+def make_Bz2JpsiKpPim_mTag_NoMuonID(
+        Jpsi=make_Jpsi_mTag_NoMuonID,
+        KPi_comb=make_detachedKst_forB2JpsiX_NoMuonID,
+        name="bandq_Bz2JpsiKpPim_mTag_NoMuonID_{hash}",
+        descriptor='[B0 -> K*(892)0 J/psi(1S)]cc',
+        #  am_min=5280. * MeV,
+        #  am_max=5460. * MeV,?OK
+        am_min=4740. * MeV,
+        am_max=5760. * MeV,
+        apt_min=1200 * MeV,
+        #  m_min=5290. * MeV,
+        #  m_max=5450. * MeV,
+        m_min=4750. * MeV,
+        m_max=5750. * MeV,
+        pt_min=1400 * MeV,
+        vtx_chi2pdof_max=16,
+        delta_m_min=2050 * MeV,  #?OK
+        delta_m_max=2310 * MeV,
+        bpv_dira_min=0.9995,
+        bpvltime_min=0.19 * picosecond):
 
     pvs = make_pvs()
 
@@ -336,6 +527,8 @@ def make_Bz2JpsiKst_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
     vertex_code = F.require_all(
         in_range(m_min, F.MASS, m_max), F.CHI2DOF < vtx_chi2pdof_max,
         (F.PT > pt_min),
+        in_range(delta_m_min, F.MASS - F.CHILD(2, F.MASS), delta_m_max),
+        F.BPVDIRA(pvs) > bpv_dira_min,
         F.BPVLTIME(pvs) > bpvltime_min)
 
     return ParticleCombiner(
@@ -385,20 +578,64 @@ def make_Bs2JpsiKpKm_NoMuonID(
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
 
+@configurable
+def make_Bs2JpsiKpKm_pTag_NoMuonID(
+        Jpsi=make_Jpsi_pTag_NoMuonID,
+        KK_comb=make_detachedPhi_forB2JpsiX_NoMuonID,
+        name="bandq_Bs2JpsiKpKm_pTag_NoMuonID_{hash}",
+        descriptor='B_s0 -> phi(1020) J/psi(1S) ',
+        am_min=4860. * MeV,
+        am_max=5880. * MeV,
+        apt_min=1200 * MeV,
+        #  m_min=5290. * MeV,
+        #  m_max=5450. * MeV,
+        m_min=4870. * MeV,
+        m_max=5870. * MeV,
+        pt_min=1400 * MeV,
+        vtx_chi2pdof_max=16,
+        delta_m_min=2150 * MeV,  #?OK
+        delta_m_max=2400 * MeV,
+        bpv_dira_min=0.9995,
+        bpvltime_min=0.19 * picosecond):
+
+    pvs = make_pvs()
+
+    combination_code = F.require_all(
+        in_range(am_min, F.MASS, am_max), (F.PT > apt_min))
+
+    vertex_code = F.require_all(
+        in_range(m_min, F.MASS, m_max), F.CHI2DOF < vtx_chi2pdof_max,
+        in_range(delta_m_min, F.MASS - F.CHILD(2, F.MASS), delta_m_max),
+        (F.PT > pt_min),
+        F.BPVDIRA(pvs) > bpv_dira_min,
+        F.BPVLTIME(pvs) > bpvltime_min)
+
+    return ParticleCombiner(
+        name=name,
+        Inputs=[KK_comb(), Jpsi()],
+        DecayDescriptor=descriptor,
+        CombinationCut=combination_code,
+        CompositeCut=vertex_code)
 
 @configurable
-def make_Bs2JpsiPhi_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
-                             KK_comb=make_detachedPhi_forB2JpsiX_NoMuonID,
-                             name="bandq_Bs2JpsiPhi_NoMuonID_{hash}",
-                             descriptor='B_s0 -> phi(1020) J/psi(1S)',
-                             am_min=5280. * MeV,
-                             am_max=5460. * MeV,
-                             apt_min=1200 * MeV,
-                             m_min=5290. * MeV,
-                             m_max=5450. * MeV,
-                             pt_min=1400 * MeV,
-                             vtx_chi2pdof_max=16,
-                             bpvltime_min=0.2 * picosecond):
+def make_Bs2JpsiKpKm_mTag_NoMuonID(
+        Jpsi=make_Jpsi_mTag_NoMuonID,
+        KK_comb=make_detachedPhi_forB2JpsiX_NoMuonID,
+        name="bandq_Bs2JpsiKpKm_mTag_NoMuonID_{hash}",
+        descriptor='B_s0 -> phi(1020) J/psi(1S) ',
+        am_min=4860. * MeV,
+        am_max=5880. * MeV,
+        apt_min=1200 * MeV,
+        #  m_min=5290. * MeV,
+        #  m_max=5450. * MeV,
+        m_min=4870. * MeV,
+        m_max=5870. * MeV,
+        pt_min=1400 * MeV,
+        vtx_chi2pdof_max=16,
+        delta_m_min=2150 * MeV,  #?OK
+        delta_m_max=2400 * MeV,
+        bpv_dira_min=0.9995,
+        bpvltime_min=0.19 * picosecond):
 
     pvs = make_pvs()
 
@@ -407,7 +644,9 @@ def make_Bs2JpsiPhi_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
 
     vertex_code = F.require_all(
         in_range(m_min, F.MASS, m_max), F.CHI2DOF < vtx_chi2pdof_max,
+        in_range(delta_m_min, F.MASS - F.CHILD(2, F.MASS), delta_m_max),
         (F.PT > pt_min),
+        F.BPVDIRA(pvs) > bpv_dira_min,
         F.BPVLTIME(pvs) > bpvltime_min)
 
     return ParticleCombiner(
@@ -417,3 +656,4 @@ def make_Bs2JpsiPhi_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
 
+
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
index 2c1a0f994a5..a351af0f021 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
@@ -982,14 +982,27 @@ def Jpsi2LmdLmd_TTTT_line(name='Hlt2BandQ_Jpsi2LmdLmd_TTTT',
         prescale=prescale,
         persistreco=persistreco)
 
+# back up line in case Bp2JpsiKp_pTag_NoMuonID_line is not acceptable during the datataking in July.
+# @register_line_builder(turbo_lines)
+# @configurable
+# def Bp2JpsiKp_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_NoMuonID',
+#                             prescale=1,
+#                             persistreco=False):
+#     """B+->Jpsi K+ without Muon-based PID cuts."""
+#     line_alg = b_to_jpsiX_NoMuonID.make_Bp2JpsiKp_NoMuonID()
+#     return Hlt2Line(
+#         name=name,
+#         algs=make_prefilters() + [line_alg],
+#         prescale=prescale,
+#         persistreco=persistreco)
 
 @register_line_builder(turbo_lines)
 @configurable
-def Bp2JpsiKp_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_NoMuonID',
+def Bp2JpsiKp_pTag_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_pTag_NoMuonID',
                             prescale=1,
                             persistreco=False):
     """B+->Jpsi K+ without Muon-based PID cuts."""
-    line_alg = b_to_jpsiX_NoMuonID.make_Bp2JpsiKp_NoMuonID()
+    line_alg = b_to_jpsiX_NoMuonID.make_Bp2JpsiKp_pTag_NoMuonID()
     return Hlt2Line(
         name=name,
         algs=make_prefilters() + [line_alg],
@@ -999,11 +1012,49 @@ def Bp2JpsiKp_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_NoMuonID',
 
 @register_line_builder(turbo_lines)
 @configurable
-def Bz2JpsiKpPim_NoMuonID_line(name='Hlt2BandQ_Bz2JpsiKpPim_NoMuonID',
+def Bp2JpsiKp_mTag_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_mTag_NoMuonID',
+                            prescale=1,
+                            persistreco=False):
+    """B+->Jpsi K+ without Muon-based PID cuts."""
+    line_alg = b_to_jpsiX_NoMuonID.make_Bp2JpsiKp_mTag_NoMuonID()
+    return Hlt2Line(
+        name=name,
+        algs=make_prefilters() + [line_alg],
+        prescale=prescale,
+        persistreco=persistreco)
+# back up line
+# @register_line_builder(turbo_lines)
+# @configurable
+# def Bz2JpsiKpPim_NoMuonID_line(name='Hlt2BandQ_Bz2JpsiKpPim_NoMuonID',
+#                                prescale=1,
+#                                persistreco=False):
+#     """B0->Jpsi K+ pi- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
+#     line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKpPim_NoMuonID()
+#     return Hlt2Line(
+#         name=name,
+#         algs=make_prefilters() + [line_alg],
+#         prescale=prescale,
+#         persistreco=persistreco)
+@register_line_builder(turbo_lines)
+@configurable
+def Bz2JpsiKpPim_pTag_NoMuonID_line(name='Hlt2BandQ_Bz2JpsiKpPim_pTag_NoMuonID',
+                               prescale=1,
+                               persistreco=False):
+    """B0->Jpsi K+ pi- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
+    line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKpPim_pTag_NoMuonID()
+    return Hlt2Line(
+        name=name,
+        algs=make_prefilters() + [line_alg],
+        prescale=prescale,
+        persistreco=persistreco)
+
+@register_line_builder(turbo_lines)
+@configurable
+def Bz2JpsiKpPim_mTag_NoMuonID_line(name='Hlt2BandQ_Bz2JpsiKpPim_mTag_NoMuonID',
                                prescale=1,
                                persistreco=False):
     """B0->Jpsi K+ pi- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
-    line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKpPim_NoMuonID()
+    line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKpPim_mTag_NoMuonID()
     return Hlt2Line(
         name=name,
         algs=make_prefilters() + [line_alg],
@@ -1011,28 +1062,41 @@ def Bz2JpsiKpPim_NoMuonID_line(name='Hlt2BandQ_Bz2JpsiKpPim_NoMuonID',
         persistreco=persistreco)
 
 
-#This is a back-up choice if the rate of Bz2JpsiKpPim_NoMuonID_line is found to be not acceptable during rate tuning in Feb.
-#@register_line_builder(turbo_lines)
-#@configurable
-#def Bz2JpsiKst_NoMuonID_line(name='Hlt2BandQ_Bz2JpsiKst_NoMuonID',
-#                             prescale=1,
-#                             persistreco=False):
-#    """B0->Jpsi K*0 without Muon-based PID cuts. Focus on the K*(892) region"""
-#    line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKst_NoMuonID()
-#    return Hlt2Line(
-#        name=name,
-#        algs=make_prefilters() + [line_alg],
-#        prescale=prescale,
-#        persistreco=persistreco)
+#This is a back-up choice if the rate of Bz2JpsiKpPim_NoMuonID_m/pTag_line is found to be not acceptable during rate tuning in July.
+# @register_line_builder(turbo_lines)
+# @configurable
+# def Bs2JpsiKpKm_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_NoMuonID',
+#                               prescale=1,
+#                               persistreco=False):
+#     """Bs0->Jpsi K+ K- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
+#     line_alg = b_to_jpsiX_NoMuonID.make_Bs2JpsiKpKm_NoMuonID()
+#     return Hlt2Line(
+#         name=name,
+#         algs=make_prefilters() + [line_alg],
+#         prescale=prescale,
+#         persistreco=persistreco)
+
+@register_line_builder(turbo_lines)
+@configurable
+def Bs2JpsiKpKm_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_pTag_NoMuonID',
+                              prescale=1,
+                              persistreco=False):
+    """Bs0->Jpsi K+ K- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
+    line_alg = b_to_jpsiX_NoMuonID.make_Bs2JpsiKpKm_pTag_NoMuonID()
+    return Hlt2Line(
+        name=name,
+        algs=make_prefilters() + [line_alg],
+        prescale=prescale,
+        persistreco=persistreco)
 
 
 @register_line_builder(turbo_lines)
 @configurable
-def Bs2JpsiKpKm_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_NoMuonID',
+def Bs2JpsiKpKm_mTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_mTag_NoMuonID',
                               prescale=1,
                               persistreco=False):
     """Bs0->Jpsi K+ K- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
-    line_alg = b_to_jpsiX_NoMuonID.make_Bs2JpsiKpKm_NoMuonID()
+    line_alg = b_to_jpsiX_NoMuonID.make_Bs2JpsiKpKm_mTag_NoMuonID()
     return Hlt2Line(
         name=name,
         algs=make_prefilters() + [line_alg],
@@ -1040,6 +1104,7 @@ def Bs2JpsiKpKm_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_NoMuonID',
         persistreco=persistreco)
 
 
+#This is a back-up choice if the rate of Bs2JpsiKpKm_NoMuonID_line is found to be not acceptable during rate tuning in Feb.
 #This is a back-up choice if the rate of Bs2JpsiKpKm_NoMuonID_line is found to be not acceptable during rate tuning in Feb.
 #@register_line_builder(turbo_lines)
 #@configurable
-- 
GitLab


From 87224d0b810fdb003cc8366049400cf011de04a5 Mon Sep 17 00:00:00 2001
From: Gitlab CI <noreply@cern.ch>
Date: Thu, 4 Jul 2024 07:42:14 +0000
Subject: [PATCH 04/11] Fixed formatting

patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/40805880
---
 .../bandq/builders/b_to_jpsiX_NoMuonID.py     | 60 +++++++++++--------
 .../python/Hlt2Conf/lines/bandq/hlt2_bandq.py | 34 ++++++-----
 2 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
index 7ab03d0e0e0..5a2188d321a 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
@@ -55,6 +55,7 @@ def make_NoMuonID_muons(
 
     return ParticleFilter(make_particles(), name=name, Cut=F.FILTER(code))
 
+
 @configurable
 def make_NoMuonID_NoRICHID_muons(
         make_particles=make_long_muons,
@@ -77,6 +78,8 @@ def make_NoMuonID_NoRICHID_muons(
         code &= pid
 
     return ParticleFilter(make_particles(), name=name, Cut=F.FILTER(code))
+
+
 @configurable
 def make_detached_kaons_forB2JpsiX_NoMuonID(
         make_particles=make_detached_kaons,
@@ -157,7 +160,7 @@ def make_detachedKst_forB2JpsiX_NoMuonID(
         m_max=1100. * MeV,
         PT_min=600. * MeV):
 
-    code = F.require_all( F.MASS< m_max, F.PT > PT_min)
+    code = F.require_all(F.MASS < m_max, F.PT > PT_min)
 
     return ParticleFilter(KPi_comb(), name=name, Cut=F.FILTER(code))
 
@@ -229,19 +232,20 @@ def make_Jpsi_NoMuonID(muons=make_NoMuonID_muons,
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
 
+
 @configurable
 def make_Jpsi_pTag_NoMuonID(muonp=make_NoMuonID_muons,
-                       muonm=make_NoMuonID_NoRICHID_muons,
-                       name="bandq_Jpsi_pTag_NoMuonID_{hash}",
-                       descriptor='J/psi(1S) -> mu+ mu-',
-                       am_min=2936. * MeV,
-                       am_max=3256. * MeV,
-                       apt_min=600 * MeV,
-                       maxdocachi2=20.,
-                       m_min=2946. * MeV,
-                       m_max=3246. * MeV,
-                       pt_min=1200 * MeV,
-                       bpvdls_min=3):
+                            muonm=make_NoMuonID_NoRICHID_muons,
+                            name="bandq_Jpsi_pTag_NoMuonID_{hash}",
+                            descriptor='J/psi(1S) -> mu+ mu-',
+                            am_min=2936. * MeV,
+                            am_max=3256. * MeV,
+                            apt_min=600 * MeV,
+                            maxdocachi2=20.,
+                            m_min=2946. * MeV,
+                            m_max=3246. * MeV,
+                            pt_min=1200 * MeV,
+                            bpvdls_min=3):
 
     pvs = make_pvs()
 
@@ -260,19 +264,20 @@ def make_Jpsi_pTag_NoMuonID(muonp=make_NoMuonID_muons,
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
 
+
 @configurable
 def make_Jpsi_mTag_NoMuonID(muonm=make_NoMuonID_muons,
-                       muonp=make_NoMuonID_NoRICHID_muons,
-                       name="bandq_Jpsi_mTag_NoMuonID_{hash}",
-                       descriptor='J/psi(1S) -> mu+ mu-',
-                       am_min=2936. * MeV,
-                       am_max=3256. * MeV,
-                       apt_min=600 * MeV,
-                       maxdocachi2=20.,
-                       m_min=2946. * MeV,
-                       m_max=3246. * MeV,
-                       pt_min=1200 * MeV,
-                       bpvdls_min=3):
+                            muonp=make_NoMuonID_NoRICHID_muons,
+                            name="bandq_Jpsi_mTag_NoMuonID_{hash}",
+                            descriptor='J/psi(1S) -> mu+ mu-',
+                            am_min=2936. * MeV,
+                            am_max=3256. * MeV,
+                            apt_min=600 * MeV,
+                            maxdocachi2=20.,
+                            m_min=2946. * MeV,
+                            m_max=3246. * MeV,
+                            pt_min=1200 * MeV,
+                            bpvdls_min=3):
 
     pvs = make_pvs()
 
@@ -291,6 +296,7 @@ def make_Jpsi_mTag_NoMuonID(muonm=make_NoMuonID_muons,
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
 
+
 @configurable
 def make_Bp2JpsiKp_NoMuonID(
         Jpsi=make_Jpsi_NoMuonID,
@@ -374,6 +380,7 @@ def make_Bp2JpsiKp_pTag_NoMuonID(
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
 
+
 @configurable
 def make_Bp2JpsiKp_mTag_NoMuonID(
         Jpsi=make_Jpsi_mTag_NoMuonID,
@@ -415,6 +422,7 @@ def make_Bp2JpsiKp_mTag_NoMuonID(
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
 
+
 @configurable
 def make_Bz2JpsiKpPim_NoMuonID(
         Jpsi=make_Jpsi_NoMuonID,
@@ -456,6 +464,7 @@ def make_Bz2JpsiKpPim_NoMuonID(
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
 
+
 @configurable
 def make_Bz2JpsiKpPim_pTag_NoMuonID(
         Jpsi=make_Jpsi_pTag_NoMuonID,
@@ -497,6 +506,7 @@ def make_Bz2JpsiKpPim_pTag_NoMuonID(
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
 
+
 @configurable
 def make_Bz2JpsiKpPim_mTag_NoMuonID(
         Jpsi=make_Jpsi_mTag_NoMuonID,
@@ -578,6 +588,7 @@ def make_Bs2JpsiKpKm_NoMuonID(
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
 
+
 @configurable
 def make_Bs2JpsiKpKm_pTag_NoMuonID(
         Jpsi=make_Jpsi_pTag_NoMuonID,
@@ -617,6 +628,7 @@ def make_Bs2JpsiKpKm_pTag_NoMuonID(
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
 
+
 @configurable
 def make_Bs2JpsiKpKm_mTag_NoMuonID(
         Jpsi=make_Jpsi_mTag_NoMuonID,
@@ -655,5 +667,3 @@ def make_Bs2JpsiKpKm_mTag_NoMuonID(
         DecayDescriptor=descriptor,
         CombinationCut=combination_code,
         CompositeCut=vertex_code)
-
-
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
index a351af0f021..1889aaeccd7 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
@@ -982,6 +982,7 @@ def Jpsi2LmdLmd_TTTT_line(name='Hlt2BandQ_Jpsi2LmdLmd_TTTT',
         prescale=prescale,
         persistreco=persistreco)
 
+
 # back up line in case Bp2JpsiKp_pTag_NoMuonID_line is not acceptable during the datataking in July.
 # @register_line_builder(turbo_lines)
 # @configurable
@@ -996,11 +997,12 @@ def Jpsi2LmdLmd_TTTT_line(name='Hlt2BandQ_Jpsi2LmdLmd_TTTT',
 #         prescale=prescale,
 #         persistreco=persistreco)
 
+
 @register_line_builder(turbo_lines)
 @configurable
 def Bp2JpsiKp_pTag_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_pTag_NoMuonID',
-                            prescale=1,
-                            persistreco=False):
+                                 prescale=1,
+                                 persistreco=False):
     """B+->Jpsi K+ without Muon-based PID cuts."""
     line_alg = b_to_jpsiX_NoMuonID.make_Bp2JpsiKp_pTag_NoMuonID()
     return Hlt2Line(
@@ -1013,8 +1015,8 @@ def Bp2JpsiKp_pTag_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_pTag_NoMuonID',
 @register_line_builder(turbo_lines)
 @configurable
 def Bp2JpsiKp_mTag_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_mTag_NoMuonID',
-                            prescale=1,
-                            persistreco=False):
+                                 prescale=1,
+                                 persistreco=False):
     """B+->Jpsi K+ without Muon-based PID cuts."""
     line_alg = b_to_jpsiX_NoMuonID.make_Bp2JpsiKp_mTag_NoMuonID()
     return Hlt2Line(
@@ -1022,6 +1024,8 @@ def Bp2JpsiKp_mTag_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_mTag_NoMuonID',
         algs=make_prefilters() + [line_alg],
         prescale=prescale,
         persistreco=persistreco)
+
+
 # back up line
 # @register_line_builder(turbo_lines)
 # @configurable
@@ -1037,9 +1041,9 @@ def Bp2JpsiKp_mTag_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_mTag_NoMuonID',
 #         persistreco=persistreco)
 @register_line_builder(turbo_lines)
 @configurable
-def Bz2JpsiKpPim_pTag_NoMuonID_line(name='Hlt2BandQ_Bz2JpsiKpPim_pTag_NoMuonID',
-                               prescale=1,
-                               persistreco=False):
+def Bz2JpsiKpPim_pTag_NoMuonID_line(
+        name='Hlt2BandQ_Bz2JpsiKpPim_pTag_NoMuonID', prescale=1,
+        persistreco=False):
     """B0->Jpsi K+ pi- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
     line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKpPim_pTag_NoMuonID()
     return Hlt2Line(
@@ -1048,11 +1052,12 @@ def Bz2JpsiKpPim_pTag_NoMuonID_line(name='Hlt2BandQ_Bz2JpsiKpPim_pTag_NoMuonID',
         prescale=prescale,
         persistreco=persistreco)
 
+
 @register_line_builder(turbo_lines)
 @configurable
-def Bz2JpsiKpPim_mTag_NoMuonID_line(name='Hlt2BandQ_Bz2JpsiKpPim_mTag_NoMuonID',
-                               prescale=1,
-                               persistreco=False):
+def Bz2JpsiKpPim_mTag_NoMuonID_line(
+        name='Hlt2BandQ_Bz2JpsiKpPim_mTag_NoMuonID', prescale=1,
+        persistreco=False):
     """B0->Jpsi K+ pi- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
     line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKpPim_mTag_NoMuonID()
     return Hlt2Line(
@@ -1076,11 +1081,12 @@ def Bz2JpsiKpPim_mTag_NoMuonID_line(name='Hlt2BandQ_Bz2JpsiKpPim_mTag_NoMuonID',
 #         prescale=prescale,
 #         persistreco=persistreco)
 
+
 @register_line_builder(turbo_lines)
 @configurable
 def Bs2JpsiKpKm_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_pTag_NoMuonID',
-                              prescale=1,
-                              persistreco=False):
+                                   prescale=1,
+                                   persistreco=False):
     """Bs0->Jpsi K+ K- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
     line_alg = b_to_jpsiX_NoMuonID.make_Bs2JpsiKpKm_pTag_NoMuonID()
     return Hlt2Line(
@@ -1093,8 +1099,8 @@ def Bs2JpsiKpKm_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_pTag_NoMuonID',
 @register_line_builder(turbo_lines)
 @configurable
 def Bs2JpsiKpKm_mTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_mTag_NoMuonID',
-                              prescale=1,
-                              persistreco=False):
+                                   prescale=1,
+                                   persistreco=False):
     """Bs0->Jpsi K+ K- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
     line_alg = b_to_jpsiX_NoMuonID.make_Bs2JpsiKpKm_mTag_NoMuonID()
     return Hlt2Line(
-- 
GitLab


From 1b984b2d0bbf0853d55ba37a906a75ab21a412e1 Mon Sep 17 00:00:00 2001
From: Chenxu Yu <chenxu.yu@cern.ch>
Date: Sun, 7 Jul 2024 08:24:40 +0200
Subject: [PATCH 05/11] Update file hlt2_bandq.py

---
 .../python/Hlt2Conf/lines/bandq/hlt2_bandq.py      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
index 1889aaeccd7..fdbb6f08085 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
@@ -99,7 +99,7 @@ def doubleCcbarToPpPmPrompt_line(name='Hlt2BandQ_doubleCcbarToPpPmPrompt',
 def DiMuonSameSignHighMass_line(name='Hlt2BandQ_DiMuonSameSignHighMassFull',
                                 prescale=0.2,
                                 persistreco=True):
-    line_alg = dimuon_lines.make_HighMass_samesign_dimuon()
+    line_alg = dimuon_lines.make_HighMass_samesign_dimuon()DiMuonSameSignInc_line
     return Hlt2Line(
         name=name,
         algs=make_prefilters() + [line_alg],
@@ -1041,8 +1041,8 @@ def Bp2JpsiKp_mTag_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_mTag_NoMuonID',
 #         persistreco=persistreco)
 @register_line_builder(turbo_lines)
 @configurable
-def Bz2JpsiKpPim_pTag_NoMuonID_line(
-        name='Hlt2BandQ_Bz2JpsiKpPim_pTag_NoMuonID', prescale=1,
+def Bz2JpsiKst_pTag_NoMuonID_line(
+        name='Hlt2BandQ_Bz2JpsiKst_pTag_NoMuonID', prescale=1,
         persistreco=False):
     """B0->Jpsi K+ pi- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
     line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKpPim_pTag_NoMuonID()
@@ -1055,8 +1055,8 @@ def Bz2JpsiKpPim_pTag_NoMuonID_line(
 
 @register_line_builder(turbo_lines)
 @configurable
-def Bz2JpsiKpPim_mTag_NoMuonID_line(
-        name='Hlt2BandQ_Bz2JpsiKpPim_mTag_NoMuonID', prescale=1,
+def Bz2JpsiKst_mTag_NoMuonID_line(
+        name='Hlt2BandQ_Bz2JpsiKst_mTag_NoMuonID', prescale=1,
         persistreco=False):
     """B0->Jpsi K+ pi- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
     line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKpPim_mTag_NoMuonID()
@@ -1084,7 +1084,7 @@ def Bz2JpsiKpPim_mTag_NoMuonID_line(
 
 @register_line_builder(turbo_lines)
 @configurable
-def Bs2JpsiKpKm_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_pTag_NoMuonID',
+def Bs2JpsiPhi_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiPhi_pTag_NoMuonID',
                                    prescale=1,
                                    persistreco=False):
     """Bs0->Jpsi K+ K- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
@@ -1098,7 +1098,7 @@ def Bs2JpsiKpKm_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_pTag_NoMuonID',
 
 @register_line_builder(turbo_lines)
 @configurable
-def Bs2JpsiKpKm_mTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_mTag_NoMuonID',
+def Bs2JpsiPhi_mTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiPhi_mTag_NoMuonID',
                                    prescale=1,
                                    persistreco=False):
     """Bs0->Jpsi K+ K- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
-- 
GitLab


From 51de68b33f277fb3e526670821ad2c60d3af5aa3 Mon Sep 17 00:00:00 2001
From: Chenxu Yu <chenxu.yu@cern.ch>
Date: Sun, 7 Jul 2024 08:28:40 +0200
Subject: [PATCH 06/11] Update file hlt2_bandq.py

---
 Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
index fdbb6f08085..96be69bfb6e 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
@@ -99,7 +99,7 @@ def doubleCcbarToPpPmPrompt_line(name='Hlt2BandQ_doubleCcbarToPpPmPrompt',
 def DiMuonSameSignHighMass_line(name='Hlt2BandQ_DiMuonSameSignHighMassFull',
                                 prescale=0.2,
                                 persistreco=True):
-    line_alg = dimuon_lines.make_HighMass_samesign_dimuon()DiMuonSameSignInc_line
+    line_alg = dimuon_lines.make_HighMass_samesign_dimuon()
     return Hlt2Line(
         name=name,
         algs=make_prefilters() + [line_alg],
-- 
GitLab


From 937c27bf9d5567948dfbc63f8a3af98bc0f333b1 Mon Sep 17 00:00:00 2001
From: Chenxu Yu <chenxu.yu@cern.ch>
Date: Sun, 7 Jul 2024 08:30:29 +0200
Subject: [PATCH 07/11] Update file hlt2_bandq.py

---
 .../python/Hlt2Conf/lines/bandq/hlt2_bandq.py        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
index 96be69bfb6e..1889aaeccd7 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
@@ -1041,8 +1041,8 @@ def Bp2JpsiKp_mTag_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_mTag_NoMuonID',
 #         persistreco=persistreco)
 @register_line_builder(turbo_lines)
 @configurable
-def Bz2JpsiKst_pTag_NoMuonID_line(
-        name='Hlt2BandQ_Bz2JpsiKst_pTag_NoMuonID', prescale=1,
+def Bz2JpsiKpPim_pTag_NoMuonID_line(
+        name='Hlt2BandQ_Bz2JpsiKpPim_pTag_NoMuonID', prescale=1,
         persistreco=False):
     """B0->Jpsi K+ pi- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
     line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKpPim_pTag_NoMuonID()
@@ -1055,8 +1055,8 @@ def Bz2JpsiKst_pTag_NoMuonID_line(
 
 @register_line_builder(turbo_lines)
 @configurable
-def Bz2JpsiKst_mTag_NoMuonID_line(
-        name='Hlt2BandQ_Bz2JpsiKst_mTag_NoMuonID', prescale=1,
+def Bz2JpsiKpPim_mTag_NoMuonID_line(
+        name='Hlt2BandQ_Bz2JpsiKpPim_mTag_NoMuonID', prescale=1,
         persistreco=False):
     """B0->Jpsi K+ pi- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
     line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKpPim_mTag_NoMuonID()
@@ -1084,7 +1084,7 @@ def Bz2JpsiKst_mTag_NoMuonID_line(
 
 @register_line_builder(turbo_lines)
 @configurable
-def Bs2JpsiPhi_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiPhi_pTag_NoMuonID',
+def Bs2JpsiKpKm_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_pTag_NoMuonID',
                                    prescale=1,
                                    persistreco=False):
     """Bs0->Jpsi K+ K- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
@@ -1098,7 +1098,7 @@ def Bs2JpsiPhi_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiPhi_pTag_NoMuonID',
 
 @register_line_builder(turbo_lines)
 @configurable
-def Bs2JpsiPhi_mTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiPhi_mTag_NoMuonID',
+def Bs2JpsiKpKm_mTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_mTag_NoMuonID',
                                    prescale=1,
                                    persistreco=False):
     """Bs0->Jpsi K+ K- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
-- 
GitLab


From 49a686daa086970e3e384c672092d881c9f665f4 Mon Sep 17 00:00:00 2001
From: yucx <yucx@farm212..>
Date: Wed, 10 Jul 2024 13:50:16 +0800
Subject: [PATCH 08/11] changename

---
 .../bandq/builders/b_to_jpsiX_NoMuonID.py     | 66 ++++++-------------
 .../python/Hlt2Conf/lines/bandq/hlt2_bandq.py | 20 +++---
 2 files changed, 29 insertions(+), 57 deletions(-)

diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
index 5a2188d321a..a2e7f032317 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
@@ -34,7 +34,7 @@ from Hlt2Conf.lines.bandq.builders.charged_hadrons import make_detached_kaons, m
 def make_NoMuonID_muons(
         make_particles=make_long_muons,
         name="bandq_NoMuonID_muons_{hash}",
-        pt_min=500. * MeV,  #?OK
+        pt_min=500. * MeV,  
         p_min=4 * GeV,
         p_max=200. * GeV,
         eta_min=2.,
@@ -60,7 +60,7 @@ def make_NoMuonID_muons(
 def make_NoMuonID_NoRICHID_muons(
         make_particles=make_long_muons,
         name="bandq_NoMuonID_muons_{hash}",
-        pt_min=500. * MeV,  #?OK
+        pt_min=500. * MeV,  
         p_min=4 * GeV,
         p_max=200. * GeV,
         eta_min=2.,
@@ -303,18 +303,14 @@ def make_Bp2JpsiKp_NoMuonID(
         kaons=make_detached_kaons_forB2JpsiX_NoMuonID,
         name="bandq_Bp2JpsiKp_NoMuonID_{hash}",
         descriptor='[B+ -> J/psi(1S) K+]cc',
-        #  am_min=5280. * MeV,
-        #  am_max=5460. * MeV,?OK
         am_min=4940. * MeV,
         am_max=5460. * MeV,
         apt_min=1200 * MeV,
-        #  m_min=5290. * MeV,
-        #  m_max=5450. * MeV,
         m_min=4950. * MeV,
         m_max=5450. * MeV,
         pt_min=1400 * MeV,
         vtx_chi2pdof_max=16,
-        delta_m_min=2050 * MeV,  #?OK
+        delta_m_min=2050 * MeV,  
         delta_m_max=2310 * MeV,
         bpv_dira_min=0.9999,
         bpvltime_min=0.19 * picosecond):
@@ -345,18 +341,14 @@ def make_Bp2JpsiKp_pTag_NoMuonID(
         kaons=make_detached_kaons_forB2JpsiX_NoMuonID,
         name="bandq_Bp2JpsiKp_pTag_NoMuonID_{hash}",
         descriptor='[B+ -> J/psi(1S) K+]cc',
-        #  am_min=5280. * MeV,
-        #  am_max=5460. * MeV,?OK
         am_min=4740. * MeV,
         am_max=5760. * MeV,
         apt_min=1200 * MeV,
-        #  m_min=5290. * MeV,
-        #  m_max=5450. * MeV,
         m_min=4750. * MeV,
         m_max=5750. * MeV,
         pt_min=1400 * MeV,
         vtx_chi2pdof_max=16,
-        delta_m_min=2050 * MeV,  #?OK
+        delta_m_min=2050 * MeV,  
         delta_m_max=2310 * MeV,
         bpv_dira_min=0.9995,
         bpvltime_min=0.19 * picosecond):
@@ -387,18 +379,14 @@ def make_Bp2JpsiKp_mTag_NoMuonID(
         kaons=make_detached_kaons_forB2JpsiX_NoMuonID,
         name="bandq_Bp2JpsiKp_mTag_NoMuonID_{hash}",
         descriptor='[B+ -> J/psi(1S) K+]cc',
-        #  am_min=5280. * MeV,
-        #  am_max=5460. * MeV,?OK
         am_min=4740. * MeV,
         am_max=5760. * MeV,
         apt_min=1200 * MeV,
-        #  m_min=5290. * MeV,
-        #  m_max=5450. * MeV,
         m_min=4750. * MeV,
         m_max=5750. * MeV,
         pt_min=1400 * MeV,
         vtx_chi2pdof_max=16,
-        delta_m_min=2050 * MeV,  #?OK
+        delta_m_min=2050 * MeV,  
         delta_m_max=2310 * MeV,
         bpv_dira_min=0.9995,
         bpvltime_min=0.19 * picosecond):
@@ -429,18 +417,14 @@ def make_Bz2JpsiKpPim_NoMuonID(
         KPi_comb=make_detachedKst_forB2JpsiX_NoMuonID,
         name="bandq_Bz2JpsiKpPim_NoMuonID_{hash}",
         descriptor='[B0 -> K*(892)0 J/psi(1S)]cc',
-        #  am_min=5280. * MeV,
-        #  am_max=5460. * MeV,?OK
         am_min=4940. * MeV,
         am_max=5460. * MeV,
         apt_min=1200 * MeV,
-        #  m_min=5290. * MeV,
-        #  m_max=5450. * MeV,
         m_min=4950. * MeV,
         m_max=5450. * MeV,
         pt_min=1400 * MeV,
         vtx_chi2pdof_max=16,
-        delta_m_min=2050 * MeV,  #?OK
+        delta_m_min=2050 * MeV,  
         delta_m_max=2310 * MeV,
         bpv_dira_min=0.9997,
         bpvltime_min=0.19 * picosecond):
@@ -466,23 +450,19 @@ def make_Bz2JpsiKpPim_NoMuonID(
 
 
 @configurable
-def make_Bz2JpsiKpPim_pTag_NoMuonID(
+def make_Bz2JpsiKst_pTag_NoMuonID(
         Jpsi=make_Jpsi_pTag_NoMuonID,
         KPi_comb=make_detachedKst_forB2JpsiX_NoMuonID,
-        name="bandq_Bz2JpsiKpPim_pTag_NoMuonID_{hash}",
+        name="bandq_Bz2JpsiKst_pTag_NoMuonID_{hash}",
         descriptor='[B0 -> K*(892)0 J/psi(1S)]cc',
-        #  am_min=5280. * MeV,
-        #  am_max=5460. * MeV,?OK
         am_min=4740. * MeV,
         am_max=5760. * MeV,
         apt_min=1200 * MeV,
-        #  m_min=5290. * MeV,
-        #  m_max=5450. * MeV,
         m_min=4750. * MeV,
         m_max=5750. * MeV,
         pt_min=1400 * MeV,
         vtx_chi2pdof_max=16,
-        delta_m_min=2050 * MeV,  #?OK
+        delta_m_min=2050 * MeV,  
         delta_m_max=2310 * MeV,
         bpv_dira_min=0.9995,
         bpvltime_min=0.19 * picosecond):
@@ -508,23 +488,19 @@ def make_Bz2JpsiKpPim_pTag_NoMuonID(
 
 
 @configurable
-def make_Bz2JpsiKpPim_mTag_NoMuonID(
+def make_Bz2JpsiKst_mTag_NoMuonID(
         Jpsi=make_Jpsi_mTag_NoMuonID,
         KPi_comb=make_detachedKst_forB2JpsiX_NoMuonID,
-        name="bandq_Bz2JpsiKpPim_mTag_NoMuonID_{hash}",
+        name="bandq_Bz2JpsiKst_mTag_NoMuonID_{hash}",
         descriptor='[B0 -> K*(892)0 J/psi(1S)]cc',
-        #  am_min=5280. * MeV,
-        #  am_max=5460. * MeV,?OK
         am_min=4740. * MeV,
         am_max=5760. * MeV,
         apt_min=1200 * MeV,
-        #  m_min=5290. * MeV,
-        #  m_max=5450. * MeV,
         m_min=4750. * MeV,
         m_max=5750. * MeV,
         pt_min=1400 * MeV,
         vtx_chi2pdof_max=16,
-        delta_m_min=2050 * MeV,  #?OK
+        delta_m_min=2050 * MeV,  
         delta_m_max=2310 * MeV,
         bpv_dira_min=0.9995,
         bpvltime_min=0.19 * picosecond):
@@ -558,13 +534,11 @@ def make_Bs2JpsiKpKm_NoMuonID(
         am_min=5100. * MeV,
         am_max=5640. * MeV,
         apt_min=1200 * MeV,
-        #  m_min=5290. * MeV,
-        #  m_max=5450. * MeV,
         m_min=5120. * MeV,
         m_max=5620. * MeV,
         pt_min=1400 * MeV,
         vtx_chi2pdof_max=16,
-        delta_m_min=2150 * MeV,  #?OK
+        delta_m_min=2150 * MeV, 
         delta_m_max=2400 * MeV,
         bpv_dira_min=0.9997,
         bpvltime_min=0.19 * picosecond):
@@ -590,10 +564,10 @@ def make_Bs2JpsiKpKm_NoMuonID(
 
 
 @configurable
-def make_Bs2JpsiKpKm_pTag_NoMuonID(
+def make_Bs2JpsiPhi_pTag_NoMuonID(
         Jpsi=make_Jpsi_pTag_NoMuonID,
         KK_comb=make_detachedPhi_forB2JpsiX_NoMuonID,
-        name="bandq_Bs2JpsiKpKm_pTag_NoMuonID_{hash}",
+        name="bandq_Bs2JpsiPhi_pTag_NoMuonID_{hash}",
         descriptor='B_s0 -> phi(1020) J/psi(1S) ',
         am_min=4860. * MeV,
         am_max=5880. * MeV,
@@ -604,7 +578,7 @@ def make_Bs2JpsiKpKm_pTag_NoMuonID(
         m_max=5870. * MeV,
         pt_min=1400 * MeV,
         vtx_chi2pdof_max=16,
-        delta_m_min=2150 * MeV,  #?OK
+        delta_m_min=2150 * MeV,  
         delta_m_max=2400 * MeV,
         bpv_dira_min=0.9995,
         bpvltime_min=0.19 * picosecond):
@@ -630,21 +604,19 @@ def make_Bs2JpsiKpKm_pTag_NoMuonID(
 
 
 @configurable
-def make_Bs2JpsiKpKm_mTag_NoMuonID(
+def make_Bs2JpsiPhi_mTag_NoMuonID(
         Jpsi=make_Jpsi_mTag_NoMuonID,
         KK_comb=make_detachedPhi_forB2JpsiX_NoMuonID,
-        name="bandq_Bs2JpsiKpKm_mTag_NoMuonID_{hash}",
+        name="bandq_Bs2JpsiPhi_mTag_NoMuonID_{hash}",
         descriptor='B_s0 -> phi(1020) J/psi(1S) ',
         am_min=4860. * MeV,
         am_max=5880. * MeV,
         apt_min=1200 * MeV,
-        #  m_min=5290. * MeV,
-        #  m_max=5450. * MeV,
         m_min=4870. * MeV,
         m_max=5870. * MeV,
         pt_min=1400 * MeV,
         vtx_chi2pdof_max=16,
-        delta_m_min=2150 * MeV,  #?OK
+        delta_m_min=2150 * MeV,  
         delta_m_max=2400 * MeV,
         bpv_dira_min=0.9995,
         bpvltime_min=0.19 * picosecond):
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
index 1889aaeccd7..ce5c9ee7a7c 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
@@ -1041,11 +1041,11 @@ def Bp2JpsiKp_mTag_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_mTag_NoMuonID',
 #         persistreco=persistreco)
 @register_line_builder(turbo_lines)
 @configurable
-def Bz2JpsiKpPim_pTag_NoMuonID_line(
-        name='Hlt2BandQ_Bz2JpsiKpPim_pTag_NoMuonID', prescale=1,
+def Bz2JpsiKst_pTag_NoMuonID_line(
+        name='Hlt2BandQ_Bz2JpsiKst_pTag_NoMuonID', prescale=1,
         persistreco=False):
     """B0->Jpsi K+ pi- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
-    line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKpPim_pTag_NoMuonID()
+    line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKst_pTag_NoMuonID()
     return Hlt2Line(
         name=name,
         algs=make_prefilters() + [line_alg],
@@ -1055,11 +1055,11 @@ def Bz2JpsiKpPim_pTag_NoMuonID_line(
 
 @register_line_builder(turbo_lines)
 @configurable
-def Bz2JpsiKpPim_mTag_NoMuonID_line(
-        name='Hlt2BandQ_Bz2JpsiKpPim_mTag_NoMuonID', prescale=1,
+def Bz2JpsiKst_mTag_NoMuonID_line(
+        name='Hlt2BandQ_Bz2JpsiKst_mTag_NoMuonID', prescale=1,
         persistreco=False):
     """B0->Jpsi K+ pi- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
-    line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKpPim_mTag_NoMuonID()
+    line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKst_mTag_NoMuonID()
     return Hlt2Line(
         name=name,
         algs=make_prefilters() + [line_alg],
@@ -1084,11 +1084,11 @@ def Bz2JpsiKpPim_mTag_NoMuonID_line(
 
 @register_line_builder(turbo_lines)
 @configurable
-def Bs2JpsiKpKm_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_pTag_NoMuonID',
+def Bs2JpsiPhi_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiPhi_pTag_NoMuonID',
                                    prescale=1,
                                    persistreco=False):
     """Bs0->Jpsi K+ K- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
-    line_alg = b_to_jpsiX_NoMuonID.make_Bs2JpsiKpKm_pTag_NoMuonID()
+    line_alg = b_to_jpsiX_NoMuonID.make_Bs2JpsiPhi_pTag_NoMuonID()
     return Hlt2Line(
         name=name,
         algs=make_prefilters() + [line_alg],
@@ -1098,11 +1098,11 @@ def Bs2JpsiKpKm_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_pTag_NoMuonID',
 
 @register_line_builder(turbo_lines)
 @configurable
-def Bs2JpsiKpKm_mTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiKpKm_mTag_NoMuonID',
+def Bs2JpsiPhi_mTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiPhi_mTag_NoMuonID',
                                    prescale=1,
                                    persistreco=False):
     """Bs0->Jpsi K+ K- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
-    line_alg = b_to_jpsiX_NoMuonID.make_Bs2JpsiKpKm_mTag_NoMuonID()
+    line_alg = b_to_jpsiX_NoMuonID.make_Bs2JpsiPhi_mTag_NoMuonID()
     return Hlt2Line(
         name=name,
         algs=make_prefilters() + [line_alg],
-- 
GitLab


From 8734494f6a16a9493dc488458d1bbba1ef9dfbb7 Mon Sep 17 00:00:00 2001
From: Gitlab CI <noreply@cern.ch>
Date: Wed, 10 Jul 2024 05:56:20 +0000
Subject: [PATCH 09/11] Fixed formatting

patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/41022807
---
 .../bandq/builders/b_to_jpsiX_NoMuonID.py     | 213 +++++++++---------
 .../python/Hlt2Conf/lines/bandq/hlt2_bandq.py |  20 +-
 2 files changed, 113 insertions(+), 120 deletions(-)

diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
index a2e7f032317..14777759ffc 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
@@ -34,7 +34,7 @@ from Hlt2Conf.lines.bandq.builders.charged_hadrons import make_detached_kaons, m
 def make_NoMuonID_muons(
         make_particles=make_long_muons,
         name="bandq_NoMuonID_muons_{hash}",
-        pt_min=500. * MeV,  
+        pt_min=500. * MeV,
         p_min=4 * GeV,
         p_max=200. * GeV,
         eta_min=2.,
@@ -57,16 +57,15 @@ def make_NoMuonID_muons(
 
 
 @configurable
-def make_NoMuonID_NoRICHID_muons(
-        make_particles=make_long_muons,
-        name="bandq_NoMuonID_muons_{hash}",
-        pt_min=500. * MeV,  
-        p_min=4 * GeV,
-        p_max=200. * GeV,
-        eta_min=2.,
-        eta_max=5.,
-        mipchi2dvprimary_min=9,
-        pid=None):
+def make_NoMuonID_NoRICHID_muons(make_particles=make_long_muons,
+                                 name="bandq_NoMuonID_muons_{hash}",
+                                 pt_min=500. * MeV,
+                                 p_min=4 * GeV,
+                                 p_max=200. * GeV,
+                                 eta_min=2.,
+                                 eta_max=5.,
+                                 mipchi2dvprimary_min=9,
+                                 pid=None):
 
     pvs = make_pvs()
 
@@ -298,22 +297,21 @@ def make_Jpsi_mTag_NoMuonID(muonm=make_NoMuonID_muons,
 
 
 @configurable
-def make_Bp2JpsiKp_NoMuonID(
-        Jpsi=make_Jpsi_NoMuonID,
-        kaons=make_detached_kaons_forB2JpsiX_NoMuonID,
-        name="bandq_Bp2JpsiKp_NoMuonID_{hash}",
-        descriptor='[B+ -> J/psi(1S) K+]cc',
-        am_min=4940. * MeV,
-        am_max=5460. * MeV,
-        apt_min=1200 * MeV,
-        m_min=4950. * MeV,
-        m_max=5450. * MeV,
-        pt_min=1400 * MeV,
-        vtx_chi2pdof_max=16,
-        delta_m_min=2050 * MeV,  
-        delta_m_max=2310 * MeV,
-        bpv_dira_min=0.9999,
-        bpvltime_min=0.19 * picosecond):
+def make_Bp2JpsiKp_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
+                            kaons=make_detached_kaons_forB2JpsiX_NoMuonID,
+                            name="bandq_Bp2JpsiKp_NoMuonID_{hash}",
+                            descriptor='[B+ -> J/psi(1S) K+]cc',
+                            am_min=4940. * MeV,
+                            am_max=5460. * MeV,
+                            apt_min=1200 * MeV,
+                            m_min=4950. * MeV,
+                            m_max=5450. * MeV,
+                            pt_min=1400 * MeV,
+                            vtx_chi2pdof_max=16,
+                            delta_m_min=2050 * MeV,
+                            delta_m_max=2310 * MeV,
+                            bpv_dira_min=0.9999,
+                            bpvltime_min=0.19 * picosecond):
 
     pvs = make_pvs()
 
@@ -336,22 +334,21 @@ def make_Bp2JpsiKp_NoMuonID(
 
 
 @configurable
-def make_Bp2JpsiKp_pTag_NoMuonID(
-        Jpsi=make_Jpsi_pTag_NoMuonID,
-        kaons=make_detached_kaons_forB2JpsiX_NoMuonID,
-        name="bandq_Bp2JpsiKp_pTag_NoMuonID_{hash}",
-        descriptor='[B+ -> J/psi(1S) K+]cc',
-        am_min=4740. * MeV,
-        am_max=5760. * MeV,
-        apt_min=1200 * MeV,
-        m_min=4750. * MeV,
-        m_max=5750. * MeV,
-        pt_min=1400 * MeV,
-        vtx_chi2pdof_max=16,
-        delta_m_min=2050 * MeV,  
-        delta_m_max=2310 * MeV,
-        bpv_dira_min=0.9995,
-        bpvltime_min=0.19 * picosecond):
+def make_Bp2JpsiKp_pTag_NoMuonID(Jpsi=make_Jpsi_pTag_NoMuonID,
+                                 kaons=make_detached_kaons_forB2JpsiX_NoMuonID,
+                                 name="bandq_Bp2JpsiKp_pTag_NoMuonID_{hash}",
+                                 descriptor='[B+ -> J/psi(1S) K+]cc',
+                                 am_min=4740. * MeV,
+                                 am_max=5760. * MeV,
+                                 apt_min=1200 * MeV,
+                                 m_min=4750. * MeV,
+                                 m_max=5750. * MeV,
+                                 pt_min=1400 * MeV,
+                                 vtx_chi2pdof_max=16,
+                                 delta_m_min=2050 * MeV,
+                                 delta_m_max=2310 * MeV,
+                                 bpv_dira_min=0.9995,
+                                 bpvltime_min=0.19 * picosecond):
 
     pvs = make_pvs()
 
@@ -374,22 +371,21 @@ def make_Bp2JpsiKp_pTag_NoMuonID(
 
 
 @configurable
-def make_Bp2JpsiKp_mTag_NoMuonID(
-        Jpsi=make_Jpsi_mTag_NoMuonID,
-        kaons=make_detached_kaons_forB2JpsiX_NoMuonID,
-        name="bandq_Bp2JpsiKp_mTag_NoMuonID_{hash}",
-        descriptor='[B+ -> J/psi(1S) K+]cc',
-        am_min=4740. * MeV,
-        am_max=5760. * MeV,
-        apt_min=1200 * MeV,
-        m_min=4750. * MeV,
-        m_max=5750. * MeV,
-        pt_min=1400 * MeV,
-        vtx_chi2pdof_max=16,
-        delta_m_min=2050 * MeV,  
-        delta_m_max=2310 * MeV,
-        bpv_dira_min=0.9995,
-        bpvltime_min=0.19 * picosecond):
+def make_Bp2JpsiKp_mTag_NoMuonID(Jpsi=make_Jpsi_mTag_NoMuonID,
+                                 kaons=make_detached_kaons_forB2JpsiX_NoMuonID,
+                                 name="bandq_Bp2JpsiKp_mTag_NoMuonID_{hash}",
+                                 descriptor='[B+ -> J/psi(1S) K+]cc',
+                                 am_min=4740. * MeV,
+                                 am_max=5760. * MeV,
+                                 apt_min=1200 * MeV,
+                                 m_min=4750. * MeV,
+                                 m_max=5750. * MeV,
+                                 pt_min=1400 * MeV,
+                                 vtx_chi2pdof_max=16,
+                                 delta_m_min=2050 * MeV,
+                                 delta_m_max=2310 * MeV,
+                                 bpv_dira_min=0.9995,
+                                 bpvltime_min=0.19 * picosecond):
 
     pvs = make_pvs()
 
@@ -412,22 +408,21 @@ def make_Bp2JpsiKp_mTag_NoMuonID(
 
 
 @configurable
-def make_Bz2JpsiKpPim_NoMuonID(
-        Jpsi=make_Jpsi_NoMuonID,
-        KPi_comb=make_detachedKst_forB2JpsiX_NoMuonID,
-        name="bandq_Bz2JpsiKpPim_NoMuonID_{hash}",
-        descriptor='[B0 -> K*(892)0 J/psi(1S)]cc',
-        am_min=4940. * MeV,
-        am_max=5460. * MeV,
-        apt_min=1200 * MeV,
-        m_min=4950. * MeV,
-        m_max=5450. * MeV,
-        pt_min=1400 * MeV,
-        vtx_chi2pdof_max=16,
-        delta_m_min=2050 * MeV,  
-        delta_m_max=2310 * MeV,
-        bpv_dira_min=0.9997,
-        bpvltime_min=0.19 * picosecond):
+def make_Bz2JpsiKpPim_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
+                               KPi_comb=make_detachedKst_forB2JpsiX_NoMuonID,
+                               name="bandq_Bz2JpsiKpPim_NoMuonID_{hash}",
+                               descriptor='[B0 -> K*(892)0 J/psi(1S)]cc',
+                               am_min=4940. * MeV,
+                               am_max=5460. * MeV,
+                               apt_min=1200 * MeV,
+                               m_min=4950. * MeV,
+                               m_max=5450. * MeV,
+                               pt_min=1400 * MeV,
+                               vtx_chi2pdof_max=16,
+                               delta_m_min=2050 * MeV,
+                               delta_m_max=2310 * MeV,
+                               bpv_dira_min=0.9997,
+                               bpvltime_min=0.19 * picosecond):
 
     pvs = make_pvs()
 
@@ -462,7 +457,7 @@ def make_Bz2JpsiKst_pTag_NoMuonID(
         m_max=5750. * MeV,
         pt_min=1400 * MeV,
         vtx_chi2pdof_max=16,
-        delta_m_min=2050 * MeV,  
+        delta_m_min=2050 * MeV,
         delta_m_max=2310 * MeV,
         bpv_dira_min=0.9995,
         bpvltime_min=0.19 * picosecond):
@@ -500,7 +495,7 @@ def make_Bz2JpsiKst_mTag_NoMuonID(
         m_max=5750. * MeV,
         pt_min=1400 * MeV,
         vtx_chi2pdof_max=16,
-        delta_m_min=2050 * MeV,  
+        delta_m_min=2050 * MeV,
         delta_m_max=2310 * MeV,
         bpv_dira_min=0.9995,
         bpvltime_min=0.19 * picosecond):
@@ -526,22 +521,21 @@ def make_Bz2JpsiKst_mTag_NoMuonID(
 
 
 @configurable
-def make_Bs2JpsiKpKm_NoMuonID(
-        Jpsi=make_Jpsi_NoMuonID,
-        KK_comb=make_detachedPhi_forB2JpsiX_NoMuonID,
-        name="bandq_Bs2JpsiKpKm_NoMuonID_{hash}",
-        descriptor='B_s0 -> phi(1020) J/psi(1S) ',
-        am_min=5100. * MeV,
-        am_max=5640. * MeV,
-        apt_min=1200 * MeV,
-        m_min=5120. * MeV,
-        m_max=5620. * MeV,
-        pt_min=1400 * MeV,
-        vtx_chi2pdof_max=16,
-        delta_m_min=2150 * MeV, 
-        delta_m_max=2400 * MeV,
-        bpv_dira_min=0.9997,
-        bpvltime_min=0.19 * picosecond):
+def make_Bs2JpsiKpKm_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
+                              KK_comb=make_detachedPhi_forB2JpsiX_NoMuonID,
+                              name="bandq_Bs2JpsiKpKm_NoMuonID_{hash}",
+                              descriptor='B_s0 -> phi(1020) J/psi(1S) ',
+                              am_min=5100. * MeV,
+                              am_max=5640. * MeV,
+                              apt_min=1200 * MeV,
+                              m_min=5120. * MeV,
+                              m_max=5620. * MeV,
+                              pt_min=1400 * MeV,
+                              vtx_chi2pdof_max=16,
+                              delta_m_min=2150 * MeV,
+                              delta_m_max=2400 * MeV,
+                              bpv_dira_min=0.9997,
+                              bpvltime_min=0.19 * picosecond):
 
     pvs = make_pvs()
 
@@ -578,7 +572,7 @@ def make_Bs2JpsiPhi_pTag_NoMuonID(
         m_max=5870. * MeV,
         pt_min=1400 * MeV,
         vtx_chi2pdof_max=16,
-        delta_m_min=2150 * MeV,  
+        delta_m_min=2150 * MeV,
         delta_m_max=2400 * MeV,
         bpv_dira_min=0.9995,
         bpvltime_min=0.19 * picosecond):
@@ -604,22 +598,21 @@ def make_Bs2JpsiPhi_pTag_NoMuonID(
 
 
 @configurable
-def make_Bs2JpsiPhi_mTag_NoMuonID(
-        Jpsi=make_Jpsi_mTag_NoMuonID,
-        KK_comb=make_detachedPhi_forB2JpsiX_NoMuonID,
-        name="bandq_Bs2JpsiPhi_mTag_NoMuonID_{hash}",
-        descriptor='B_s0 -> phi(1020) J/psi(1S) ',
-        am_min=4860. * MeV,
-        am_max=5880. * MeV,
-        apt_min=1200 * MeV,
-        m_min=4870. * MeV,
-        m_max=5870. * MeV,
-        pt_min=1400 * MeV,
-        vtx_chi2pdof_max=16,
-        delta_m_min=2150 * MeV,  
-        delta_m_max=2400 * MeV,
-        bpv_dira_min=0.9995,
-        bpvltime_min=0.19 * picosecond):
+def make_Bs2JpsiPhi_mTag_NoMuonID(Jpsi=make_Jpsi_mTag_NoMuonID,
+                                  KK_comb=make_detachedPhi_forB2JpsiX_NoMuonID,
+                                  name="bandq_Bs2JpsiPhi_mTag_NoMuonID_{hash}",
+                                  descriptor='B_s0 -> phi(1020) J/psi(1S) ',
+                                  am_min=4860. * MeV,
+                                  am_max=5880. * MeV,
+                                  apt_min=1200 * MeV,
+                                  m_min=4870. * MeV,
+                                  m_max=5870. * MeV,
+                                  pt_min=1400 * MeV,
+                                  vtx_chi2pdof_max=16,
+                                  delta_m_min=2150 * MeV,
+                                  delta_m_max=2400 * MeV,
+                                  bpv_dira_min=0.9995,
+                                  bpvltime_min=0.19 * picosecond):
 
     pvs = make_pvs()
 
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
index ce5c9ee7a7c..5cb1130ab70 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
@@ -1041,9 +1041,9 @@ def Bp2JpsiKp_mTag_NoMuonID_line(name='Hlt2BandQ_Bp2JpsiKp_mTag_NoMuonID',
 #         persistreco=persistreco)
 @register_line_builder(turbo_lines)
 @configurable
-def Bz2JpsiKst_pTag_NoMuonID_line(
-        name='Hlt2BandQ_Bz2JpsiKst_pTag_NoMuonID', prescale=1,
-        persistreco=False):
+def Bz2JpsiKst_pTag_NoMuonID_line(name='Hlt2BandQ_Bz2JpsiKst_pTag_NoMuonID',
+                                  prescale=1,
+                                  persistreco=False):
     """B0->Jpsi K+ pi- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
     line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKst_pTag_NoMuonID()
     return Hlt2Line(
@@ -1055,9 +1055,9 @@ def Bz2JpsiKst_pTag_NoMuonID_line(
 
 @register_line_builder(turbo_lines)
 @configurable
-def Bz2JpsiKst_mTag_NoMuonID_line(
-        name='Hlt2BandQ_Bz2JpsiKst_mTag_NoMuonID', prescale=1,
-        persistreco=False):
+def Bz2JpsiKst_mTag_NoMuonID_line(name='Hlt2BandQ_Bz2JpsiKst_mTag_NoMuonID',
+                                  prescale=1,
+                                  persistreco=False):
     """B0->Jpsi K+ pi- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
     line_alg = b_to_jpsiX_NoMuonID.make_Bz2JpsiKst_mTag_NoMuonID()
     return Hlt2Line(
@@ -1085,8 +1085,8 @@ def Bz2JpsiKst_mTag_NoMuonID_line(
 @register_line_builder(turbo_lines)
 @configurable
 def Bs2JpsiPhi_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiPhi_pTag_NoMuonID',
-                                   prescale=1,
-                                   persistreco=False):
+                                  prescale=1,
+                                  persistreco=False):
     """Bs0->Jpsi K+ K- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
     line_alg = b_to_jpsiX_NoMuonID.make_Bs2JpsiPhi_pTag_NoMuonID()
     return Hlt2Line(
@@ -1099,8 +1099,8 @@ def Bs2JpsiPhi_pTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiPhi_pTag_NoMuonID',
 @register_line_builder(turbo_lines)
 @configurable
 def Bs2JpsiPhi_mTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiPhi_mTag_NoMuonID',
-                                   prescale=1,
-                                   persistreco=False):
+                                  prescale=1,
+                                  persistreco=False):
     """Bs0->Jpsi K+ K- without Muon-based PID cuts. Cover the full KPi mass spectrum"""
     line_alg = b_to_jpsiX_NoMuonID.make_Bs2JpsiPhi_mTag_NoMuonID()
     return Hlt2Line(
-- 
GitLab


From 4ec794154d1416f781f9986d130579cfaa623946 Mon Sep 17 00:00:00 2001
From: Chenxu Yu <chenxu.yu@cern.ch>
Date: Wed, 10 Jul 2024 11:43:32 +0200
Subject: [PATCH 10/11] Update 2 files

- /Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
- /Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
---
 .../lines/bandq/builders/b_to_jpsiX_NoMuonID.py    |  3 ---
 .../python/Hlt2Conf/lines/bandq/hlt2_bandq.py      | 14 --------------
 2 files changed, 17 deletions(-)

diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
index 14777759ffc..e70e622fb0a 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
@@ -155,7 +155,6 @@ def make_detachedKPi_forB2JpsiX_NoMuonID(
 def make_detachedKst_forB2JpsiX_NoMuonID(
         KPi_comb=make_detachedKPi_forB2JpsiX_NoMuonID,
         name="bandq_detachedKst_forB2JpsiX_NoMuonID_{hash}",
-        # m_min=700. * MeV,
         m_max=1100. * MeV,
         PT_min=600. * MeV):
 
@@ -566,8 +565,6 @@ def make_Bs2JpsiPhi_pTag_NoMuonID(
         am_min=4860. * MeV,
         am_max=5880. * MeV,
         apt_min=1200 * MeV,
-        #  m_min=5290. * MeV,
-        #  m_max=5450. * MeV,
         m_min=4870. * MeV,
         m_max=5870. * MeV,
         pt_min=1400 * MeV,
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
index 5cb1130ab70..6db9a29683b 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
@@ -1110,20 +1110,6 @@ def Bs2JpsiPhi_mTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiPhi_mTag_NoMuonID',
         persistreco=persistreco)
 
 
-#This is a back-up choice if the rate of Bs2JpsiKpKm_NoMuonID_line is found to be not acceptable during rate tuning in Feb.
-#This is a back-up choice if the rate of Bs2JpsiKpKm_NoMuonID_line is found to be not acceptable during rate tuning in Feb.
-#@register_line_builder(turbo_lines)
-#@configurable
-#def Bs2JpsiPhi_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiPhi_NoMuonID',
-#                             prescale=1,
-#                             persistreco=False):
-#    """B0->Jpsi K*0 without Muon-based PID cuts. Focus on the phi(1020) region"""
-#    line_alg = b_to_jpsiX_NoMuonID.make_Bs2JpsiPhi_NoMuonID()
-#    return Hlt2Line(
-#        name=name,
-#        algs=make_prefilters() + [line_alg],
-#        prescale=prescale,
-#        persistreco=persistreco)
 
 
 @register_line_builder(turbo_lines)
-- 
GitLab


From 0989ef52d11a05b48ff2ba708636f93997988ec2 Mon Sep 17 00:00:00 2001
From: Gitlab CI <noreply@cern.ch>
Date: Wed, 10 Jul 2024 09:45:19 +0000
Subject: [PATCH 11/11] Fixed formatting

patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/41032043
---
 .../bandq/builders/b_to_jpsiX_NoMuonID.py     | 31 +++++++++----------
 .../python/Hlt2Conf/lines/bandq/hlt2_bandq.py |  2 --
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
index e70e622fb0a..aed091e199c 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_jpsiX_NoMuonID.py
@@ -557,22 +557,21 @@ def make_Bs2JpsiKpKm_NoMuonID(Jpsi=make_Jpsi_NoMuonID,
 
 
 @configurable
-def make_Bs2JpsiPhi_pTag_NoMuonID(
-        Jpsi=make_Jpsi_pTag_NoMuonID,
-        KK_comb=make_detachedPhi_forB2JpsiX_NoMuonID,
-        name="bandq_Bs2JpsiPhi_pTag_NoMuonID_{hash}",
-        descriptor='B_s0 -> phi(1020) J/psi(1S) ',
-        am_min=4860. * MeV,
-        am_max=5880. * MeV,
-        apt_min=1200 * MeV,
-        m_min=4870. * MeV,
-        m_max=5870. * MeV,
-        pt_min=1400 * MeV,
-        vtx_chi2pdof_max=16,
-        delta_m_min=2150 * MeV,
-        delta_m_max=2400 * MeV,
-        bpv_dira_min=0.9995,
-        bpvltime_min=0.19 * picosecond):
+def make_Bs2JpsiPhi_pTag_NoMuonID(Jpsi=make_Jpsi_pTag_NoMuonID,
+                                  KK_comb=make_detachedPhi_forB2JpsiX_NoMuonID,
+                                  name="bandq_Bs2JpsiPhi_pTag_NoMuonID_{hash}",
+                                  descriptor='B_s0 -> phi(1020) J/psi(1S) ',
+                                  am_min=4860. * MeV,
+                                  am_max=5880. * MeV,
+                                  apt_min=1200 * MeV,
+                                  m_min=4870. * MeV,
+                                  m_max=5870. * MeV,
+                                  pt_min=1400 * MeV,
+                                  vtx_chi2pdof_max=16,
+                                  delta_m_min=2150 * MeV,
+                                  delta_m_max=2400 * MeV,
+                                  bpv_dira_min=0.9995,
+                                  bpvltime_min=0.19 * picosecond):
 
     pvs = make_pvs()
 
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
index 6db9a29683b..8e939a97b1f 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/hlt2_bandq.py
@@ -1110,8 +1110,6 @@ def Bs2JpsiPhi_mTag_NoMuonID_line(name='Hlt2BandQ_Bs2JpsiPhi_mTag_NoMuonID',
         persistreco=persistreco)
 
 
-
-
 @register_line_builder(turbo_lines)
 @configurable
 def EMDM_Lb2LcPi_Lc2LambdaPi_TT_line(
-- 
GitLab