From 3c0e4c53fc1e892188c4c5756f1af57b61fb8342 Mon Sep 17 00:00:00 2001 From: Wouter Hulsbergen Date: Wed, 20 Mar 2024 16:43:03 +0100 Subject: [PATCH 1/9] replace MAXDOCACHI2 by MAXSDOCACHI2 --- Hlt/Hlt2Conf/options/hlt2_line_example.py | 2 +- .../b_to_charmonia/builders/basic_builder.py | 6 ++-- .../b_to_open_charm/builders/basic_builder.py | 2 +- .../lines/bandq/builders/b_to_LcX_TT_lines.py | 6 ++-- .../bandq/builders/b_to_jpsiX_NoMuonID.py | 6 ++-- .../bandq/builders/jpsi_to_lmdlmd_lines.py | 4 +-- .../lines/bandq/builders/ppmumu_lines.py | 6 ++-- .../lines/bandq/builders/qqbar_to_hadrons.py | 4 +-- .../Hlt2Conf/lines/bnoc/builders/b_builder.py | 10 +++--- .../lines/bnoc/builders/basic_builder.py | 6 ++-- .../lines/charm/cbaryon_to_ph0_btag.py | 4 +-- .../Hlt2Conf/lines/charm/cbaryon_to_phh.py | 2 +- .../Hlt2Conf/lines/charm/cbaryon_to_sl.py | 4 +-- .../Hlt2Conf/lines/charm/ccbaryon_hadronic.py | 2 +- .../lines/charm/ccbaryon_to_hyperon_dh.py | 4 +-- .../Hlt2Conf/lines/charm/charm_to_h0x.py | 2 +- .../Hlt2Conf/lines/charm/d0_to_hhgamma.py | 8 ++--- .../Hlt2Conf/lines/charm/d0_to_hhpi0.py | 2 +- .../Hlt2Conf/lines/charm/d0_to_hlnux.py | 2 +- .../python/Hlt2Conf/lines/charm/d0_to_kshh.py | 2 +- .../Hlt2Conf/lines/charm/d_to_hhhgamma.py | 4 +-- .../python/Hlt2Conf/lines/charm/d_to_ksh.py | 2 +- .../Hlt2Conf/lines/charm/dsstar_to_dspipi.py | 6 ++-- .../python/Hlt2Conf/lines/charm/hyperons.py | 6 ++-- .../python/Hlt2Conf/lines/charm/hyperonsTT.py | 34 +++++++++---------- .../Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py | 2 +- .../Hlt2Conf/lines/charm/rare_charm_makers.py | 4 +-- .../python/Hlt2Conf/lines/charm/taggers.py | 2 +- .../Hlt2Conf/lines/hlt2_line_example.py | 4 +-- .../lines/iftPbPb/builders/charm_builders.py | 6 ++-- .../dilepton_mva_builder.py | 2 +- .../python/Hlt2Conf/lines/jets/topobits.py | 4 +-- .../lines/pid/DstToD0Pi_D0ToKPiPiPi.py | 2 +- .../Hlt2Conf/lines/pid/utils/charmonium.py | 2 +- .../Hlt2Conf/lines/pid/utils/neutral_pid.py | 4 +-- .../python/Hlt2Conf/lines/qee/qee_builders.py | 2 +- .../lines/qee/wz_boson_rare_decays.py | 8 ++--- .../lines/rd/builders/b_to_v0ll_builder.py | 8 ++--- .../lines/rd/builders/b_to_xll_builders.py | 2 +- .../lines/rd/builders/baryonic_builders.py | 10 +++--- .../rd/builders/omega_rare_decay_builder.py | 4 +-- .../lines/rd/builders/qqbar_to_ll_builders.py | 8 ++--- .../lines/rd/builders/rad_incl_builder.py | 4 +-- .../lines/rd/builders/rdbuilder_thor.py | 10 +++--- .../lines/rd/builders/strange_builders.py | 2 +- .../lines/semileptonic/builders/b_builder.py | 4 +-- .../semileptonic/builders/base_builder.py | 8 ++--- .../builders/charm_hadron_builder.py | 2 +- .../semileptonic/builders/dilepton_builder.py | 2 +- .../python/Hlt2Conf/lines/test/hlt2_test.py | 20 +++++------ .../python/Hlt2Conf/standard_particles.py | 14 ++++---- Hlt/Hlt2Conf/tests/options/hlt2_monitor.py | 2 +- .../tests/options/hlt2_thor_selections.py | 8 ++--- 53 files changed, 143 insertions(+), 143 deletions(-) diff --git a/Hlt/Hlt2Conf/options/hlt2_line_example.py b/Hlt/Hlt2Conf/options/hlt2_line_example.py index 7a20c63ecc3..221f2aa01bc 100644 --- a/Hlt/Hlt2Conf/options/hlt2_line_example.py +++ b/Hlt/Hlt2Conf/options/hlt2_line_example.py @@ -79,7 +79,7 @@ def make_lambdacs(protons, comb_maxdoca=0.1 * mm, vchi2pdof_max=10, bpvvdchi2_min=25): - two_body_combination_code = F.MAXDOCACHI2CUT(two_body_comb_maxdocachi2) + two_body_combination_code = F.MAXSDOCACHI2CUT(two_body_comb_maxdocachi2) combination_code = require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.SUM(F.PT) > comb_pt_min, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/basic_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/basic_builder.py index c13e83bb61c..4187d48ab11 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/basic_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/basic_builder.py @@ -152,7 +152,7 @@ def make_twobody(particles, combination_code = require_all( in_range(comb_m_min, F.MASS, comb_m_max), - F.MAXDOCACHI2CUT(max_docachi2), + F.MAXSDOCACHI2CUT(max_docachi2), F.SUM(F.PT) > pt_sum) ## F.CHI2 = VCHI2/CHI2VX = F.CHI2DOF, tiny difference from LOKI functor, see check: https://indico.cern.ch/event/995287/contributions/4633380/attachments/2354933/4018715/WP3%20JieWu%2020211129.pdf @@ -455,7 +455,7 @@ def make_selected_jpsi2ee(name='B2CC_Jpsi2EE_Filter_{hash}', electrons, opposite_sign=True) code_dielectron = F.require_all( - F.MAXDOCACHI2CUT(float(max_docachi2)), F.CHI2DOF < max_vchi2pdof, + F.MAXSDOCACHI2CUT(float(max_docachi2)), F.CHI2DOF < max_vchi2pdof, F.PT < pt, F.MASS > comb_m_min, F.MASS < comb_m_max) return ParticleFilter(detached_dielectron_with_brem, F.FILTER(code_dielectron)) @@ -492,7 +492,7 @@ def make_selected_jpsi2ee_wrongsign( m_diE_max=comb_m_max, opposite_sign=False) code_dielectron = F.require_all( - F.MAXDOCACHI2CUT(float(max_docachi2)), F.CHI2DOF < max_vchi2pdof) + F.MAXSDOCACHI2CUT(float(max_docachi2)), F.CHI2DOF < max_vchi2pdof) return ParticleFilter(detached_dielectron_with_brem, F.FILTER(code_dielectron)) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/basic_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/basic_builder.py index 45951fa0ba8..f12448e0e12 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/basic_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/basic_builder.py @@ -546,7 +546,7 @@ def make_selected_ks(input_ks, ''' pvs = make_pvs() code = require_all( - F.MAXDOCACHI2CUT(adocachi2cut), F.CHI2DOF < chi2vx, + F.MAXSDOCACHI2CUT(adocachi2cut), F.CHI2DOF < chi2vx, F.MIN(F.P) > pi_pmin, F.MIN(F.MINIPCHI2(pvs)) > pi_mipchi2pv) if bpvvdchi2_min is not None: diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_LcX_TT_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_LcX_TT_lines.py index 87a0e17b74e..75163810b90 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_LcX_TT_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_LcX_TT_lines.py @@ -164,7 +164,7 @@ def make_EMDM_detached_PipPimMu(make_pions=make_EMDM_detached_Pion_base, """ pvs = make_pvs() combination_code = require_all(F.MASS < am_max, - F.MAXDOCACHI2CUT(chi2_doca_max)) + F.MAXSDOCACHI2CUT(chi2_doca_max)) vertex_code = require_all(F.MASS < m_max, F.CHI2DOF < vtx_chi2pdof_max, F.BPVDLS(pvs) > bpvdls_min) return ParticleCombiner( @@ -193,7 +193,7 @@ def make_EMDM_detached_PipPipPim_fromBeauty( """ pvs = make_pvs() combination_code = require_all(F.MASS < am_max, - F.MAXDOCACHI2CUT(chi2_doca_max)) + F.MAXSDOCACHI2CUT(chi2_doca_max)) vertex_code = require_all(F.MASS < m_max, F.CHI2DOF < vtx_chi2pdof_max, F.BPVDLS(pvs) > bpvdls_min) return ParticleCombiner( @@ -222,7 +222,7 @@ def make_EMDM_detached_PipPipPim_fromCharm( """ pvs = make_pvs() combination_code = require_all(F.MASS < am_max, - F.MAXDOCACHI2CUT(chi2_doca_max)) + F.MAXSDOCACHI2CUT(chi2_doca_max)) vertex_code = require_all(F.MASS < m_max, F.CHI2DOF < vtx_chi2pdof_max, F.BPVDLS(pvs) > bpvdls_min) return ParticleCombiner( 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 32a42599140..a4b86ec9842 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 @@ -116,7 +116,7 @@ def make_detachedKPi_forB2JpsiX_NoMuonID( pvs = make_pvs() combination_code = F.require_all(F.MASS < am_max, - F.MAXDOCACHI2CUT(maxdocachi2)) + F.MAXSDOCACHI2CUT(maxdocachi2)) vertex_code = F.require_all(F.MASS < m_max, F.BPVDLS(pvs) > bpvdls_min) @@ -153,7 +153,7 @@ def make_detachedKK_forB2JpsiX_NoMuonID( pvs = make_pvs() combination_code = F.require_all(F.MASS < am_max, - F.MAXDOCACHI2CUT(maxdocachi2)) + F.MAXSDOCACHI2CUT(maxdocachi2)) vertex_code = F.require_all(F.MASS < m_max, F.BPVDLS(pvs) > bpvdls_min) @@ -192,7 +192,7 @@ def make_Jpsi_NoMuonID(muons=make_NoMuonID_muons, pvs = make_pvs() combination_code = F.require_all( - in_range(am_min, F.MASS, am_max), F.MAXDOCACHI2CUT(maxdocachi2), + in_range(am_min, F.MASS, am_max), F.MAXSDOCACHI2CUT(maxdocachi2), (F.PT > apt_min)) vertex_code = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/jpsi_to_lmdlmd_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/jpsi_to_lmdlmd_lines.py index 06e499c58a5..7be6192e559 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/jpsi_to_lmdlmd_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/jpsi_to_lmdlmd_lines.py @@ -43,7 +43,7 @@ def make_lambdall(): p_min=9. * GeV, pid=F.require_all(F.PID_P > 5., (F.PID_P - F.PID_K) > 0.)) combinationcode = F.require_all( - in_range(1095 * MeV, F.MASS, 1140 * MeV), F.MAXDOCACHI2CUT(4.), + in_range(1095 * MeV, F.MASS, 1140 * MeV), F.MAXSDOCACHI2CUT(4.), F.PT > 500. * MeV, F.MAXDOCACUT(0.12 * mm)) vertexcode = F.require_all( in_range(1105 * MeV, F.MASS, 1130 * MeV), F.CHI2DOF < 5., @@ -76,7 +76,7 @@ def make_lambdadd(): p_min=8. * GeV, pid=F.require_all(F.PID_P > 5., (F.PID_P - F.PID_K) > 0.)) combinationcode = F.require_all( - in_range(1085 * MeV, F.MASS, 1145 * MeV), F.MAXDOCACHI2CUT(4.), + in_range(1085 * MeV, F.MASS, 1145 * MeV), F.MAXSDOCACHI2CUT(4.), F.PT > 600. * MeV, F.MAXDOCACUT(4.0 * mm)) vertexcode = F.require_all( in_range(1105 * MeV, F.MASS, 1130 * MeV), F.CHI2DOF < 5., diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/ppmumu_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/ppmumu_lines.py index 39e837ac183..b1218a01f4f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/ppmumu_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/ppmumu_lines.py @@ -112,7 +112,7 @@ def make_ppmumu_Hc(name='bandq_ppmumu_Hc_{hash}', protons = make_ppmumu_Hc_proton() combination_code = F.require_all( - in_range(am_min, F.MASS, am_max), F.MAXDOCACHI2CUT(docachi2_max)) + in_range(am_min, F.MASS, am_max), F.MAXSDOCACHI2CUT(docachi2_max)) vertex_code = F.require_all( in_range(m_min, F.MASS, m_max), F.CHI2DOF < vtxchi2ndof_max) @@ -176,7 +176,7 @@ def make_ppmumu_High(name='bandq_ppmumu_High_{hash}', protons = make_ppmumu_High_proton() combination_code = F.require_all(F.MASS > am_min, - F.MAXDOCACHI2CUT(docachi2_max)) + F.MAXSDOCACHI2CUT(docachi2_max)) vertex_code = F.require_all(F.MASS > m_min, F.CHI2DOF < vtxchi2ndof_max) @@ -229,7 +229,7 @@ def make_ppmumu_Detached(name='bandq_ppmumu_Detached_{hash}', protons = make_ppmumu_Detached_proton() combination_code = F.require_all( - in_range(am_min, F.MASS, am_max), F.MAXDOCACHI2CUT(docachi2_max)) + in_range(am_min, F.MASS, am_max), F.MAXSDOCACHI2CUT(docachi2_max)) vertex_code = F.require_all( in_range(m_min, F.MASS, m_max), F.CHI2DOF < vtxchi2ndof_max) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/qqbar_to_hadrons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/qqbar_to_hadrons.py index 5df4b8522c6..1dbf7a40886 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/qqbar_to_hadrons.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/qqbar_to_hadrons.py @@ -61,7 +61,7 @@ def make_ccbar_to_hadrons( pvs = make_pvs() combination_code = F.require_all( - in_range(am_min, F.MASS, am_max), F.MAXDOCACHI2CUT(maxdoca_max), + in_range(am_min, F.MASS, am_max), F.MAXSDOCACHI2CUT(maxdoca_max), (F.PT > apt_min)) vertex_code = F.require_all( @@ -175,7 +175,7 @@ def make_double_ccbar_to_hadrons(particles, pvs = make_pvs() combination_code = F.require_all((F.MASS > am_min), - F.MAXDOCACHI2CUT(maxdoca_max), + F.MAXSDOCACHI2CUT(maxdoca_max), (F.PT > apt_min)) vertex_code = F.require_all((F.MASS > m_min), F.CHI2DOF < vtx_chi2pdof_max, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/b_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/b_builder.py index f2ed2b50b8f..5935f5bfacc 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/b_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/b_builder.py @@ -169,9 +169,9 @@ def make_b2x( combination_code = F.require_all( in_range(am_min, F.MASS, am_max), - F.SUM(F.PT) > asumpt_min, F.MAXDOCACHI2CUT(achi2doca_max)) - combination123_code = F.require_all(F.MAXDOCACHI2CUT(achi2doca_max)) - combination12_code = F.require_all(F.MAXDOCACHI2CUT(achi2doca_max)) + F.SUM(F.PT) > asumpt_min, F.MAXSDOCACHI2CUT(achi2doca_max)) + combination123_code = F.require_all(F.MAXSDOCACHI2CUT(achi2doca_max)) + combination12_code = F.require_all(F.MAXSDOCACHI2CUT(achi2doca_max)) if MassWindow: # For BuToKshhh lines if charged: @@ -349,7 +349,7 @@ def make_b2Lambdah(particles, F.CHILD(1, F.PT) > apt1_min, F.SUM(F.PT > sumpt_min) >= sumpt_num_min, in_range(am_min, F.MASS, am_max), - F.MAXDOCACHI2CUT(acutdocachi2)) + F.MAXSDOCACHI2CUT(acutdocachi2)) pvs = make_pvs() @@ -453,7 +453,7 @@ def make_b2hh(particles, combination_cut = require_all( F.SUM(F.PT) > sum_pt, in_range(am_min, F.MASS, am_max), - F.MAXDOCACHI2CUT(docachi2), + F.MAXSDOCACHI2CUT(docachi2), ) composite_cut = require_all( F.PT > pt_min, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py index 5da66cae456..7a762b2d5c0 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py @@ -725,7 +725,7 @@ def make_bbaryon_ks0_dd( descriptor = 'KS0 -> pi+ pi-' combination_code = F.require_all( in_range(mass_min * 0.8, F.MASS, mass_max * 1.2), - F.MAXDOCACHI2CUT(adocachi2cut)) + F.MAXSDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = F.require_all( in_range(mass_min, F.MASS, mass_max), F.CHI2DOF < vchi2pdof_max, @@ -1498,7 +1498,7 @@ def make_veryloose_lambda_LL( descriptor = '[Lambda0 -> p+ pi-]cc' combination_code = require_all( in_range(mass_window_comb_min, F.MASS, mass_window_comb_max), - F.MAXDOCACHI2CUT(adocachi2cut)) + F.MAXSDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = require_all( in_range(mass_window_min, F.MASS, mass_window_max), @@ -1551,7 +1551,7 @@ def make_loose_lambda_DD( descriptor = '[Lambda0 -> p+ pi-]cc' combination_code = require_all( in_range(mass_window_comb_min, F.MASS, mass_window_comb_max), - F.MAXDOCACHI2CUT(adocachi2cut)) + F.MAXSDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = require_all( in_range(mass_window_min, F.MASS, mass_window_max), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_ph0_btag.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_ph0_btag.py index e675c23ddf0..1e12b188832 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_ph0_btag.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_ph0_btag.py @@ -222,7 +222,7 @@ def make_lambdall(): F.MASS < 1160 * MeV, F.SUM(F.PT) > 450 * MeV, F.MAXSDOCACUT(0.2 * mm), - F.MAXDOCACHI2CUT(16.), + F.MAXSDOCACHI2CUT(16.), ), CompositeCut=F.require_all( in_range(1095 * MeV, F.MASS, 1140 * MeV), @@ -246,7 +246,7 @@ def make_lambdadd(): F.MASS < 1180 * MeV, F.SUM(F.PT) > 450 * MeV, F.MAXSDOCACUT(2 * mm), - F.MAXDOCACHI2CUT(16.), + F.MAXSDOCACHI2CUT(16.), ), CompositeCut=F.require_all( in_range(1095 * MeV, F.MASS, 1140 * MeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_phh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_phh.py index 67afaa9c387..3e645b8ad5f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_phh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_phh.py @@ -272,7 +272,7 @@ def combine_lb_lclnu(lc, """Base SL b-hadron decay builder.""" combination_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), - F.MAXDOCACHI2CUT(comb_docachi2_max), F.PT > pt_min, F.P > p_min) + F.MAXSDOCACHI2CUT(comb_docachi2_max), F.PT > pt_min, F.P > p_min) vertex_cut = F.require_all( in_range(mother_m_min, F.MASS, mother_m_max), F.CHI2DOF < vchi2pdof_max, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_sl.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_sl.py index 835961986ef..3b8d872ddce 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_sl.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_sl.py @@ -310,7 +310,7 @@ def make_lambdall(): CombinationCut=F.require_all( F.MASS < 1160 * MeV, F.MAXDOCACUT(0.2 * mm), - F.MAXDOCACHI2CUT(16.), + F.MAXSDOCACHI2CUT(16.), F.SUM(F.PT) > 500 * MeV, ), CompositeCut=F.require_all( @@ -334,7 +334,7 @@ def make_lambdadd(): CombinationCut=F.require_all( F.MASS < 1180 * MeV, F.MAXDOCACUT(2 * mm), - F.MAXDOCACHI2CUT(16.), + F.MAXSDOCACHI2CUT(16.), F.SUM(F.PT) > 500 * MeV, ), CompositeCut=F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_hadronic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_hadronic.py index afb20786fc1..d8bb2386f1a 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_hadronic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_hadronic.py @@ -481,7 +481,7 @@ def _make_xicc_twobody( """ comb_cut = F.require_all( in_range(am_min, F.MASS, am_max), F.PT > pt_min, - F.MAXDOCACUT(doca_max), F.MAXDOCACHI2CUT(docachi2_max)) + F.MAXDOCACUT(doca_max), F.MAXSDOCACHI2CUT(docachi2_max)) pvs = make_pvs() vtx_cut = F.require_all( in_range(m_min, F.MASS, m_max), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_hyperon_dh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_hyperon_dh.py index 9a4e1f20b00..6da4d21ef12 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_hyperon_dh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_hyperon_dh.py @@ -129,7 +129,7 @@ def make_lambdall(): protons = filter_long_protons_from_lambda() pions = filter_long_pions_from_lambda() combinationcode = F.require_all( - in_range(1085 * MeV, F.MASS, 1145 * MeV), F.MAXDOCACHI2CUT(30.), + in_range(1085 * MeV, F.MASS, 1145 * MeV), F.MAXSDOCACHI2CUT(30.), F.MAXDOCACUT(0.2 * mm)) vertexcode = F.require_all( in_range(1095 * MeV, F.MASS, 1135 * MeV), F.CHI2DOF < 9., @@ -147,7 +147,7 @@ def make_lambdadd(): pions = filter_down_pions_from_lambda() protons = filter_down_protons_from_lambda() combinationcode = F.require_all( - in_range(1075 * MeV, F.MASS, 1160 * MeV), F.MAXDOCACHI2CUT(30.), + in_range(1075 * MeV, F.MASS, 1160 * MeV), F.MAXSDOCACHI2CUT(30.), F.MAXDOCACUT(2 * mm)) vertexcode = F.require_all( in_range(1095 * MeV, F.MASS, 1140 * MeV), F.CHI2DOF < 9., diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/charm_to_h0x.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/charm_to_h0x.py index a00af225c66..0d2f0e9ea38 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/charm_to_h0x.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/charm_to_h0x.py @@ -164,7 +164,7 @@ def make_dielectron_with_brem( OppositeSign=opposite_sign).Particles code_dielectron = F.require_all( - # F.MAXDOCACHI2CUT(adocachi2cut), # This causes segfaults + # F.MAXSDOCACHI2CUT(adocachi2cut), # This causes segfaults F.CHI2DOF < vfaspfchi2ndof, F.BPVFDCHI2(pvs) > bpvvdchi2, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py index ca01d3a3c8c..5e239fa06a6 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py @@ -83,7 +83,7 @@ def _make_phi2kk(): name="Charm_D0Tohhgamma_PhiToKpKm", CombinationCut=F.require_all( F.MASS < 2150 * MeV, - F.MAXDOCACHI2CUT(10.), + F.MAXSDOCACHI2CUT(10.), F.DOCA(1, 2) < 200 * um, F.SUM(F.PT) > 0 * MeV, ), @@ -103,7 +103,7 @@ def make_rho2pipi(): name="Charm_D0Tohhgamma_Rho0ToPipPim", CombinationCut=F.require_all( F.MASS < 2150 * MeV, - F.MAXDOCACHI2CUT(10.), + F.MAXSDOCACHI2CUT(10.), F.DOCA(1, 2) < 200 * um, F.SUM(F.PT) > 0 * MeV, ), @@ -124,7 +124,7 @@ def make_kstar2kpi(): name="Charm_D0Tohhgamma_Kst0bToKmPip", CombinationCut=F.require_all( F.MASS < 2150 * MeV, - F.MAXDOCACHI2CUT(10.), + F.MAXSDOCACHI2CUT(10.), F.DOCA(1, 2) < 200 * um, F.SUM(F.PT) > 0 * MeV, ), @@ -144,7 +144,7 @@ def make_dzeros(particle1, particle2, descriptor, name): name=name, CombinationCut=F.require_all( in_range(1610 * MeV, F.MASS, 2130 * MeV), - F.MAXDOCACHI2CUT(10.), + F.MAXSDOCACHI2CUT(10.), F.SUM(F.PT) > 0 * MeV, ), CompositeCut=F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhpi0.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhpi0.py index f1546b6fd68..c4238a05e29 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhpi0.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhpi0.py @@ -94,7 +94,7 @@ def _make_hh_pair(particle1, combination_code = F.require_all(*combination_cut_list, F.MASS < comb_m_max, - F.MAXDOCACHI2CUT(docachi2_max), + F.MAXSDOCACHI2CUT(docachi2_max), F.DOCA(1, 2) < doca_max) vertex_code = F.require_all(F.CHI2DOF < vchi2dof_max, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hlnux.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hlnux.py index 844958e4046..4dbace302ad 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hlnux.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hlnux.py @@ -1033,7 +1033,7 @@ def _build_my_dstar(dzs, decay): Inputs=[dzs, make_tagging_pions()], DecayDescriptor=decay, CombinationCut=F.require_all( - F.MAXDOCACHI2CUT(20.), + F.MAXSDOCACHI2CUT(20.), F.MASS - F.CHILD(1, F.MASS) < 405. * MeV, ), CompositeCut=F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_kshh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_kshh.py index 1ea6500428c..c5536436429 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_kshh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_kshh.py @@ -201,7 +201,7 @@ def make_kshort_dd(): F.P > 4.5 * GeV, F.SUM(F.PT) > 500 * MeV, F.MAXDOCACUT(2 * mm), - F.MAXDOCACHI2CUT(12.), + F.MAXSDOCACHI2CUT(12.), ), CompositeCut=F.require_all( in_range(435 * MeV, F.MASS, 560 * MeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhhgamma.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhhgamma.py index 19a7d837c7e..73b567e6314 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhhgamma.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhhgamma.py @@ -74,12 +74,12 @@ def _make_d2hhhgamma(h1, h2, h3, gamma, descriptor, name): DecayDescriptor=descriptor, name=name, Combination12Cut=F.require_all( - F.MAXDOCACHI2CUT(10.), + F.MAXSDOCACHI2CUT(10.), F.MASS < m_max + 20 * MeV - _PION_M, ), CombinationCut=F.require_all( in_range(1680 * MeV, F.MASS, m_max + 20 * MeV), - F.MAXDOCACHI2CUT(10.), + F.MAXSDOCACHI2CUT(10.), F.SUM(F.PT) > 500 * MeV, ), CompositeCut=F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py index b970bb508a1..3b6abd03a53 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py @@ -143,7 +143,7 @@ def make_ks_dd( Make KS -> pi+ pi- from downstream tracks. """ comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), F.MAXDOCACHI2CUT(docachi2_max), + F.MAXDOCACUT(doca_max), F.MAXSDOCACHI2CUT(docachi2_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dsstar_to_dspipi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dsstar_to_dspipi.py index b8926a79997..400bd3a9e2a 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dsstar_to_dspipi.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dsstar_to_dspipi.py @@ -82,7 +82,7 @@ def make_dss(particle1, particle2, particle3): CombinationCut=F.require_all( in_range(1885 * MeV, F.MASS, 2045 * MeV), F.PT > 4.0 * GeV, - F.MAXDOCACHI2CUT(18.0), + F.MAXSDOCACHI2CUT(18.0), F.MAXDOCACUT(0.27 * mm), ), CompositeCut=F.require_all( @@ -103,7 +103,7 @@ def make_dsstars2536(particle1, particle2, particle3): CombinationCut=F.require_all( in_range(2500 * MeV, F.MASS, 2615 * MeV), F.PT > 4.5 * GeV, - F.MAXDOCACHI2CUT(15.0), + F.MAXSDOCACHI2CUT(15.0), F.DOCA(1, 2) < 0.30 * mm, F.DOCA(1, 3) < 0.30 * mm, F.DOCA(2, 3) < 0.65 * mm, @@ -125,7 +125,7 @@ def make_dsstars2460(particle1, particle2, particle3): CombinationCut=F.require_all( in_range(2370 * MeV, F.MASS, 2500 * MeV), F.PT > 4.5 * GeV, - F.MAXDOCACHI2CUT(15.0), + F.MAXSDOCACHI2CUT(15.0), F.DOCA(1, 2) < 0.30 * mm, F.DOCA(1, 3) < 0.30 * mm, F.DOCA(2, 3) < 0.65 * mm, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperons.py index a233d70082a..7c7e446b129 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperons.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperons.py @@ -406,7 +406,7 @@ def _make_dd_kshorts(): name='Charm_Hyperons_KS0_DD_{hash}', CombinationCut=F.require_all( F.MAXDOCACUT(2 * mm), - F.MAXDOCACHI2CUT(12.), + F.MAXSDOCACHI2CUT(12.), F.math.in_range(425 * MeV, F.MASS, 570 * MeV), F.PT > 400 * MeV, F.P > 4.5 * GeV, @@ -4869,7 +4869,7 @@ def lc_to_l0pipipi_ll_line(name="Hlt2Charm_LcpToL0PimPipPip_LL"): # F.P > None, # 28 * GeV # Possible cuts for future tunning F.SUM(F.PT) > 1.8 * GeV, F.MAXDOCACUT(250. * um), - F.MAXDOCACHI2CUT(12.), + F.MAXSDOCACHI2CUT(12.), ), CompositeCut=F.require_all( F.math.in_range(2211 * MeV, F.MASS, 2361 * MeV), @@ -4914,7 +4914,7 @@ def lc_to_l0pipipi_dd_line(name="Hlt2Charm_LcpToL0PimPipPip_DD"): # F.P > None, # 28 * GeV # Possible cuts for future tunning F.SUM(F.PT) > 1.8 * GeV, F.MAXDOCACUT(2 * mm), - F.MAXDOCACHI2CUT(12.), + F.MAXSDOCACHI2CUT(12.), ), CompositeCut=F.require_all( F.math.in_range(2211 * MeV, F.MASS, 2361 * MeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py index 33b65b32b72..24fd7460fdd 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py @@ -185,7 +185,7 @@ def _make_ttl_xis(): F.PT > 1. * GeV, F.P > 30. * GeV, F.MAXDOCACUT(20.0 * mm), - F.MAXDOCACHI2CUT(3.0), + F.MAXSDOCACHI2CUT(3.0), ), CompositeCut=F.require_all( F.MASS < 1700 * MeV, @@ -213,7 +213,7 @@ def _make_ttd_xis(): F.PT > 1. * GeV, F.P > 25. * GeV, F.MAXDOCACUT(25.0 * mm), - F.MAXDOCACHI2CUT(3.0), + F.MAXSDOCACHI2CUT(3.0), ), CompositeCut=F.require_all( F.MASS < 1700 * MeV, @@ -246,7 +246,7 @@ def xicz_to_ximpi_ttl_l_line(name="Hlt2Charm_Xic0ToXimPip_TTL_L"): F.PT > 1. * GeV, F.P > 40. * GeV, F.MAXDOCACUT(10 * mm), - F.MAXDOCACHI2CUT(3.), + F.MAXSDOCACHI2CUT(3.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -286,7 +286,7 @@ def xicz_to_ximpi_ttd_l_line(name="Hlt2Charm_Xic0ToXimPip_TTD_L"): F.PT > 1. * GeV, F.P > 40. * GeV, F.MAXDOCACUT(10 * mm), - F.MAXDOCACHI2CUT(3.), + F.MAXSDOCACHI2CUT(3.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -326,7 +326,7 @@ def xicz_to_ximpi_ttd_d_line(name="Hlt2Charm_Xic0ToXimPip_TTD_D"): F.PT > 1. * GeV, F.P > 25. * GeV, F.MAXDOCACUT(20 * mm), - F.MAXDOCACHI2CUT(3.), + F.MAXSDOCACHI2CUT(3.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -371,7 +371,7 @@ def xicp_to_ximpipi_ttl_ll_line(name="Hlt2Charm_XicpToXimPipPip_TTL_LL"): F.P > 40. * GeV, F.DOCA(1, 3) < 20 * mm, F.DOCA(2, 3) < 0.2 * mm, - F.MAXDOCACHI2CUT(5.), + F.MAXSDOCACHI2CUT(5.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -416,7 +416,7 @@ def xicp_to_ximpipi_ttd_ll_line(name="Hlt2Charm_XicpToXimPipPip_TTD_LL"): F.P > 40. * GeV, F.DOCA(1, 3) < 20 * mm, F.DOCA(2, 3) < 0.2 * mm, - F.MAXDOCACHI2CUT(5.), + F.MAXSDOCACHI2CUT(5.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -461,7 +461,7 @@ def xicp_to_ximpipi_ttd_dd_line(name="Hlt2Charm_XicpToXimPipPip_TTD_DD"): F.P > 20. * GeV, F.DOCA(1, 3) < 25 * mm, F.DOCA(2, 3) < 1.2 * mm, - F.MAXDOCACHI2CUT(30.), + F.MAXSDOCACHI2CUT(30.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -507,7 +507,7 @@ def xicz_to_lkpi_tt_ll_line(name="Hlt2Charm_Xic0ToL0KmPip_TT_LL"): F.P > 40. * GeV, F.DOCA(1, 3) < 15 * mm, F.DOCA(2, 3) < 0.1 * mm, - F.MAXDOCACHI2CUT(5.), + F.MAXSDOCACHI2CUT(5.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -552,7 +552,7 @@ def xicz_to_lkpi_tt_dd_line(name="Hlt2Charm_Xic0ToL0KmPip_TT_DD"): F.P > 20. * GeV, F.DOCA(1, 3) < 30 * mm, F.DOCA(2, 3) < 1.2 * mm, - F.MAXDOCACHI2CUT(10.), + F.MAXSDOCACHI2CUT(10.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -604,7 +604,7 @@ def lc_to_l0pipipi_tt_lll_line(name="Hlt2Charm_LcpToL0PimPipPip_TT_LLL"): F.DOCA(2, 4) < 0.12 * mm, F.DOCA(3, 4) < 0.12 * mm, F.MAXDOCACUT(30. * mm), - F.MAXDOCACHI2CUT(8.), + F.MAXSDOCACHI2CUT(8.), ), CompositeCut=F.require_all( F.math.in_range(2150 * MeV, F.MASS, 2700 * MeV), @@ -655,7 +655,7 @@ def lc_to_l0pipipi_tt_ddd_line(name="Hlt2Charm_LcpToL0PimPipPip_TT_DDD"): F.DOCA(2, 4) < 0.12 * mm, F.DOCA(3, 4) < 0.12 * mm, F.MAXDOCACUT(30. * mm), - F.MAXDOCACHI2CUT(8.), + F.MAXSDOCACHI2CUT(8.), ), CompositeCut=F.require_all( F.math.in_range(2150 * MeV, F.MASS, 2700 * MeV), @@ -707,7 +707,7 @@ def xicp_to_lkpipi_tt_lll_line(name="Hlt2Charm_XicpToL0KmPipPip_TT_LLL"): F.DOCA(2, 4) < 0.12 * mm, F.DOCA(3, 4) < 0.12 * mm, F.MAXDOCACUT(30. * mm), - F.MAXDOCACHI2CUT(8.), + F.MAXSDOCACHI2CUT(8.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -759,7 +759,7 @@ def xicp_to_lkpipi_tt_ddd_line(name="Hlt2Charm_XicpToL0KmPipPip_TT_DDD"): F.DOCA(2, 4) < 0.12 * mm, F.DOCA(3, 4) < 0.12 * mm, F.MAXDOCACUT(30. * mm), - F.MAXDOCACHI2CUT(8.), + F.MAXSDOCACHI2CUT(8.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -810,7 +810,7 @@ def xicz_to_xim3pi_ttl_lll_line(name="Hlt2Charm_Xic0ToXimPimPipPip_TTL_LLL"): F.DOCA(2, 4) < 0.2 * mm, F.DOCA(3, 4) < 0.2 * mm, F.MAXDOCACUT(30. * mm), - F.MAXDOCACHI2CUT(20.), + F.MAXSDOCACHI2CUT(20.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -862,7 +862,7 @@ def xicz_to_xim3pi_ttd_lll_line(name="Hlt2Charm_Xic0ToXimPimPipPip_TTD_LLL"): F.DOCA(2, 4) < 0.2 * mm, F.DOCA(3, 4) < 0.2 * mm, F.MAXDOCACUT(30. * mm), - F.MAXDOCACHI2CUT(20.), + F.MAXSDOCACHI2CUT(20.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -914,7 +914,7 @@ def xicz_to_xim3pi_ttd_ddd_line(name="Hlt2Charm_Xic0ToXimPimPipPip_TTD_DDD"): F.DOCA(2, 4) < 0.3 * mm, F.DOCA(3, 4) < 0.3 * mm, F.MAXDOCACUT(30. * mm), - F.MAXDOCACHI2CUT(20.), + F.MAXSDOCACHI2CUT(20.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py index 7aa4af07034..54f9fd32b38 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py @@ -170,7 +170,7 @@ def make_ks_dd( ): """Make KS -> pi+ pi- from downstream tracks.""" comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), F.MAXDOCACHI2CUT(docachi2_max), + F.MAXDOCACUT(doca_max), F.MAXSDOCACHI2CUT(docachi2_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py index fec88aa5eee..b3a9194beea 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py @@ -1520,7 +1520,7 @@ def make_rarecharm_dd_lambda2ppi(protons, combination_code = F.require_all( F.MASS < m_max + 35 * MeV, F.PT > comb_pt_min, F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min, F.MAXDOCACUT(amaxdoca_max), - F.MAXDOCACHI2CUT(docachi2_max)) + F.MAXSDOCACHI2CUT(docachi2_max)) vertex_code = F.require_all(F.MASS < m_max, F.PT > pt_min, F.P > p_min, F.CHI2DOF < vchi2pdof_max) @@ -1603,7 +1603,7 @@ def make_rarecharm_bs(dstar, combination_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), - F.MAXDOCACHI2CUT(adocachi2_max)) + F.MAXSDOCACHI2CUT(adocachi2_max)) composite_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/taggers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/taggers.py index cb469812520..79edd43b6b0 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/taggers.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/taggers.py @@ -175,7 +175,7 @@ def _make_sl_bs_from_descriptor(ds, muons, decay_descriptor, name): DecayDescriptor=decay_descriptor, name=name, CombinationCut=F.require_all( - in_range(2.3 * GeV, F.MASS, 10 * GeV), F.MAXDOCACHI2CUT(10.)), + in_range(2.3 * GeV, F.MASS, 10 * GeV), F.MAXSDOCACHI2CUT(10.)), CompositeCut=F.require_all( F.CHI2DOF < 9., in_range(2.3 * GeV, F.MASS, 10 * GeV), in_range(2.8 * GeV, F.BPVCORRM(pvs), 8.5 * GeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/hlt2_line_example.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/hlt2_line_example.py index fd865f8d9a7..f140ea0dfe1 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/hlt2_line_example.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/hlt2_line_example.py @@ -95,12 +95,12 @@ def _pions_for_charm_and_beauty(pt_min=0.5 * GeV): def _make_lambdacs_for_beauty(protons, kaons, pions, pvs): two_body_combination_code = F.require_all( - F.MAXDOCACHI2CUT(9.), F.MAXDOCACUT(0.1 * mm)) + F.MAXSDOCACHI2CUT(9.), F.MAXDOCACUT(0.1 * mm)) combination_code = F.require_all( in_range(2080 * MeV, F.MASS, 2480 * MeV), # mass of the combination F.PT > 1.4 * GeV, # pT of the 3-track combination F.SUM(F.PT) > 2 * GeV, - F.MAXDOCACHI2CUT(9.), + F.MAXSDOCACHI2CUT(9.), F.MAXDOCACUT(0.1 * mm), ) vertex_code = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/builders/charm_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/builders/charm_builders.py index 5cda840e5d7..593cd7c8559 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/builders/charm_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/builders/charm_builders.py @@ -184,7 +184,7 @@ def make_charm2hadrons(name="", F.SUM(F.PT > CriteriaCombination["min_child_pt"]) > 0) if CriteriaCombination["max_doca"] is not None: - combination_code &= F.MAXDOCACHI2CUT(CriteriaCombination["max_doca"]) + combination_code &= F.MAXSDOCACHI2CUT(CriteriaCombination["max_doca"]) vertex_code = F.require_all( F.CHI2DOF < CriteriaCombination["vchi2pdof_max"]) @@ -222,7 +222,7 @@ def make_charm3hadrons(name="", F.SUM(F.PT > CriteriaCombination["min_child_pt"]) > 0) if CriteriaCombination["max_doca"] is not None: - combination_code &= F.MAXDOCACHI2CUT(CriteriaCombination["max_doca"]) + combination_code &= F.MAXSDOCACHI2CUT(CriteriaCombination["max_doca"]) vertex_code = F.require_all( F.CHI2DOF < CriteriaCombination["vchi2pdof_max"]) @@ -263,7 +263,7 @@ def make_charm4hadrons(name="", combination_code = F.require_all( in_range(CriteriaCombination["mmin"], F.MASS, CriteriaCombination["mmin"]), - F.MAXDOCACHI2CUT(CriteriaCombination["max_doca"]), allhaschild_pt, + F.MAXSDOCACHI2CUT(CriteriaCombination["max_doca"]), allhaschild_pt, twohaschild_pt, ahaschild_pt) vertex_code = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_detached_dilepton/dilepton_mva_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_detached_dilepton/dilepton_mva_builder.py index bd158a2f63f..4df2602d67f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_detached_dilepton/dilepton_mva_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_detached_dilepton/dilepton_mva_builder.py @@ -41,7 +41,7 @@ def make_neutral_lls(name="rd_neutral_mesons_lls_{hash}", mipchi2dvprimary_min=pi_ipchi2_min, pid=None) descriptor = 'KS0 -> pi+ pi-' - combination_code = F.require_all(F.MAXDOCACHI2CUT(adocachi2cut)) + combination_code = F.require_all(F.MAXSDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvvdchi2_min) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/jets/topobits.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/jets/topobits.py index eb22be38190..8f34c27d312 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/jets/topobits.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/jets/topobits.py @@ -111,7 +111,7 @@ def make_topo_2body(apt_min=2000. * MeV, combination_code = F.require_all( F.PT > apt_min, F.MASS() < am_max, - F.MAXDOCACHI2CUT(adocachi2_max), + F.MAXSDOCACHI2CUT(adocachi2_max), F.SUM(F.IS_ABS_ID("K+") & (F.BPVIPCHI2(pvs) < ipchi2_max_an)) < an_ipchi2_max_an, ) @@ -157,7 +157,7 @@ def make_topo_2body_with_svtag(apt_min=2000. * MeV, combination_code = F.require_all( F.PT > apt_min, F.MASS() < am_max, - F.MAXDOCACHI2CUT(adocachi2_max), + F.MAXSDOCACHI2CUT(adocachi2_max), F.SUM(F.IS_ABS_ID("K+") & (F.BPVIPCHI2(pvs) < ipchi2_max_an)) < an_ipchi2_max_an, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DstToD0Pi_D0ToKPiPiPi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DstToD0Pi_D0ToKPiPiPi.py index 14313dc3a8f..d1c79a051dd 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DstToD0Pi_D0ToKPiPiPi.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DstToD0Pi_D0ToKPiPiPi.py @@ -75,7 +75,7 @@ def make_dzero_to_kpipipi( mipchi2_min=kpi_mipchi2_min, ) # two_body_combination_code =F.require_all( - # F.MAXDOCACUT(doca_max), F.MAXDOCACHI2CUT(doca_chi2_max) + # F.MAXDOCACUT(doca_max), F.MAXSDOCACHI2CUT(doca_chi2_max) # ) combination_code = F.require_all( in_range(am_min, F.MASS, am_max), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/charmonium.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/charmonium.py index 927823b0774..64c409ecdaf 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/charmonium.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/charmonium.py @@ -285,7 +285,7 @@ def make_jpsi_to_pp( """ combination_code = F.require_all( in_range(am_min, F.MASS, am_max), - F.MAXDOCACHI2CUT(doca_max), + F.MAXSDOCACHI2CUT(doca_max), ) composite_code = F.require_all(in_range(m_min, F.MASS, m_max), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/neutral_pid.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/neutral_pid.py index bbb70b45b35..47f27e4b673 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/neutral_pid.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/neutral_pid.py @@ -289,7 +289,7 @@ def make_prompt_ds(name="pid_prompt_ds"): ds_m_max = 1998 * MeV ds_comb_code = F.require_all( in_range(ds_m_min - 20 * MeV, F.MASS, ds_m_max + 20 * MeV), - F.MAXDOCACHI2 < 50, + F.MAXSDOCACHI2 < 50, F.PT > 2. * GeV, ) @@ -350,7 +350,7 @@ def make_d2etappi(name="pid_d2etappi"): pi = ParticleFilter( make_has_rich_long_pions(), F.FILTER(pi_code), name="pi") - rho_comb_code = F.require_all(F.MAXDOCACHI2 < 50) + rho_comb_code = F.require_all(F.MAXSDOCACHI2 < 50) rho_vert_code = F.require_all( F.CHI2DOF < 9, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py index 0cd780cf62d..996e89fb123 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py @@ -286,7 +286,7 @@ def make_bhadron_majorana(majoranas, """ #majoranas = make_majorana() combination_code = F.require_all( - in_range(am_min, F.MASS, am_max), F.MAXDOCACHI2CUT(adocachi2)) + in_range(am_min, F.MASS, am_max), F.MAXSDOCACHI2CUT(adocachi2)) b_code = F.require_all( in_range(m_min, F.MASS, m_max), F.BPVDLS(pvs()) > bpvdls_min, F.CHI2 < vtxchi2_max, 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 6010719a21a..294cab3c0df 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 @@ -152,7 +152,7 @@ def make_EW_PhiToKK(pvs, combination_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), - F.MAXDOCACHI2CUT(max_docachi2)) + F.MAXSDOCACHI2CUT(max_docachi2)) vertex_code = F.require_all(F.PT > min_pt, F.CHI2 < max_vchi2pdof) @@ -179,7 +179,7 @@ def make_EW_KstToKPi(pvs, combination_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), - F.MAXDOCACHI2CUT(max_docachi2)) + F.MAXSDOCACHI2CUT(max_docachi2)) vertex_code = F.require_all(F.PT > min_pt, F.CHI2 < max_vchi2pdof) @@ -208,7 +208,7 @@ def make_EW_LcToPKPi(pvs, combination_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), - F.MAXDOCACHI2CUT(max_docachi2)) + F.MAXSDOCACHI2CUT(max_docachi2)) vertex_code = F.require_all(F.PT > min_pt, F.CHI2 < max_vchi2pdof) @@ -236,7 +236,7 @@ def make_EW_Xic0ToPKKPi(pvs, combination_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), - F.MAXDOCACHI2CUT(max_docachi2)) + F.MAXSDOCACHI2CUT(max_docachi2)) vertex_code = F.require_all(F.PT > min_pt, F.CHI2 < max_vchi2pdof) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_v0ll_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_v0ll_builder.py index 0fdd740bd6c..23207ee4aaf 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_v0ll_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_v0ll_builder.py @@ -57,7 +57,7 @@ def make_b2ksll(dileptons, # upper B mass and DOCAChi2 cut combination_code = F.require_all(F.MASS < max_mass_B, - F.MAXDOCACHI2CUT(max_docachi2)) + F.MAXSDOCACHI2CUT(max_docachi2)) # some additional cuts vertex_code = F.require_all(F.MASS > min_B_mass, F.MASS < max_B_mass, @@ -93,7 +93,7 @@ def make_lambdab2lambdall(dileptons, # upper B mass and DOCAChi2 cut combination_code = F.require_all(F.MASS < max_mass_B, - F.MAXDOCACHI2CUT(max_docachi2)) + F.MAXSDOCACHI2CUT(max_docachi2)) # some additional cuts vertex_code = F.require_all(F.MASS > min_B_mass, F.MASS < max_B_mass, @@ -126,7 +126,7 @@ def make_ksttokspi(Kshorts, # upper K*+ mass and DOCAChi2 cut combination_code = F.require_all( F.MASS > min_Kst_mass, F.MASS < max_Kst_mass, - F.MAXDOCACHI2CUT(max_docachi2), F.PT > min_pt) + F.MAXSDOCACHI2CUT(max_docachi2), F.PT > min_pt) # some additional cuts vertex_code = F.require_all(F.MASS > min_Kst_mass, F.MASS < max_Kst_mass, @@ -154,7 +154,7 @@ def make_b2kspill(dileptons, # upper B mass and DOCAChi2 cut combination_code = F.require_all(F.MASS < max_mass_B, - F.MAXDOCACHI2CUT(max_docachi2)) + F.MAXSDOCACHI2CUT(max_docachi2)) # some additional cuts vertex_code = F.require_all(F.MASS > min_B_mass, F.MASS < max_B_mass, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xll_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xll_builders.py index b795bc87bf9..99cc29a680b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xll_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xll_builders.py @@ -248,7 +248,7 @@ def make_b_to_Xpbar_dilepton( am_Xpbar_max * am_Xpbar_scale_max), F.SUBCOMB(Functor=F.PT, Indices=[2, 3]) > min_Xpbar_pt, F.SUBCOMB( - Functor=F.MAXDOCACHI2CUT(adocachi2cut_Xpbar_max), Indices=[2, 3]), + Functor=F.MAXSDOCACHI2CUT(adocachi2cut_Xpbar_max), Indices=[2, 3]), in_range(am_b_min * am_b_scale_min, F.MASS, am_b_max * am_b_scale_max), F.PT > min_b_pt) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_builders.py index 6e38d056df5..9d4b3eaa732 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_builders.py @@ -70,7 +70,7 @@ def make_xim_to_lambda_pi( """ comb_cut = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.P > comb_p_min, - F.MAXDOCACHI2CUT(docachi2_max)) + F.MAXSDOCACHI2CUT(docachi2_max)) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), F.P > p_min, F.CHI2DOF < vchi2pdof_max, F.BPVVDZ(pvs) > bpvvdz_min) @@ -106,7 +106,7 @@ def make_omegam_to_lambda_k( """ comb_cut = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.P > comb_p_min, - F.MAXDOCACHI2CUT(docachi2_max)) + F.MAXSDOCACHI2CUT(docachi2_max)) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), F.P > p_min, F.CHI2DOF < vchi2pdof_max, F.BPVVDZ(pvs) > bpvvdz_min) @@ -426,7 +426,7 @@ def make_bhadron(pvs, name = "make_bhadron_for_" + name + "_{hash}" combination_cut = F.require_all( in_range(min_mass * 0.9, F.MASS, max_mass * 1.1), F.PT > 0.9 * pt_min, - F.MAXDOCACHI2CUT(docachi2_max)) + F.MAXSDOCACHI2CUT(docachi2_max)) composite_cut = F.require_all( in_range(min_mass, F.MASS, max_mass), F.PT > pt_min, @@ -469,7 +469,7 @@ def make_bhadron_3body(pvs, combination_cut = require_all( in_range(min_mass * 0.9, F.MASS, max_mass * 1.1), F.PT > 0.9 * pt_min, - F.MAXDOCACHI2CUT(docachi2_max)) + F.MAXSDOCACHI2CUT(docachi2_max)) composite_cut = require_all( in_range(min_mass, F.MASS, max_mass), F.PT > pt_min, @@ -513,7 +513,7 @@ def make_bhadron_4body(pvs, combination_cut = require_all( in_range(min_mass * 0.9, F.MASS, max_mass * 1.1), F.PT > 0.9 * pt_min, - F.MAXDOCACHI2CUT(docachi2_max)) + F.MAXSDOCACHI2CUT(docachi2_max)) composite_cut = require_all( in_range(min_mass, F.MASS, max_mass), F.PT > pt_min, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/omega_rare_decay_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/omega_rare_decay_builder.py index 6ef1ed2cd86..c20f59d71d9 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/omega_rare_decay_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/omega_rare_decay_builder.py @@ -43,7 +43,7 @@ def make_xim_to_lambda_pim(pvs, Builder for Xi- -> Lambda pi-. """ combination_code = F.require_all( - F.MAXDOCACHI2CUT(docachi2_max), in_range(comb_m_min, F.MASS, + F.MAXSDOCACHI2CUT(docachi2_max), in_range(comb_m_min, F.MASS, comb_m_max), F.P > comb_p_min) vertex_code = F.require_all( in_range(m_min, F.MASS, m_max), @@ -101,7 +101,7 @@ def make_omega_to_xi_dip(pvs, """ combination_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.P > comb_p_min, - F.MAXDOCACHI2CUT(docachi2_max)) + F.MAXSDOCACHI2CUT(docachi2_max)) vertex_code = F.require_all( in_range(m_min, F.MASS, m_max), F.P > p_min, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/qqbar_to_ll_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/qqbar_to_ll_builders.py index b6bd5b0ec1a..2e29d4d1919 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/qqbar_to_ll_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/qqbar_to_ll_builders.py @@ -95,7 +95,7 @@ def make_prompt_tautau( ) combination_code = F.require_all( - F.MAXDOCACHI2CUT(max_adocachi2), + F.MAXSDOCACHI2CUT(max_adocachi2), F.ALV(1, 2) > cos_tautauangle, ) vertex_code = F.require_all( @@ -150,7 +150,7 @@ def make_prompt_etau( electrons = make_rd_prompt_electrons( pt_min=min_pt_e, pid=(F.PID_E > min_pid_e)) combination_code = F.require_all( - F.MAXDOCACHI2CUT(max_adocachi2), + F.MAXSDOCACHI2CUT(max_adocachi2), F.ALV(1, 2) > cos_etauangle, ) vertex_code = F.require_all( @@ -209,7 +209,7 @@ def make_prompt_mutau( else: muons = make_rd_prompt_muons( pt_min=min_pt_mu, pid=(F.PID_MU > min_PIDmu)) - combination_code = F.MAXDOCACHI2CUT(max_adocachi2) + combination_code = F.MAXSDOCACHI2CUT(max_adocachi2) vertex_code = F.require_all( F.BPVFDCHI2(pvs) > min_bpvvdchi2, in_range(min_dilepton_mass, F.MASS, max_dilepton_mass), @@ -248,7 +248,7 @@ def make_upsilons_to_upsilons( pvs = make_pvs() combination_code = F.require_all( in_range(min_dilepton_mass, F.MASS, max_dilepton_mass), - F.MAXDOCACHI2CUT(max_adocachi2), + F.MAXSDOCACHI2CUT(max_adocachi2), ) vertex_code = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rad_incl_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rad_incl_builder.py index 95b08d6d086..c2dde10c381 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rad_incl_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rad_incl_builder.py @@ -195,7 +195,7 @@ def make_hh(inputs, """Builds two-hadron particle for inclusive_radiative_b""" combination_code = F.require_all( F.PT > pt_min, - F.MAXDOCACHI2CUT(doca_chi2_max), + F.MAXSDOCACHI2CUT(doca_chi2_max), F.MASS < m_max, ) @@ -250,7 +250,7 @@ def make_hhh(inputs, """Builds HHH particle as HH + H for inclusive_radiative_b""" combination_code = F.require_all( F.PT > pt_min, - F.MAXDOCACHI2CUT(doca_chi2_max), + F.MAXSDOCACHI2CUT(doca_chi2_max), F.MASS < m_max, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py index a9f2484db0b..973132205eb 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py @@ -505,7 +505,7 @@ def make_rd_ks0_lls( descriptor = 'KS0 -> pi+ pi-' combination_code = F.require_all( F.ABS_DELTA_MASS("KS0") < mass_window_comb, - F.MAXDOCACHI2CUT(adocachi2cut)) + F.MAXSDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = F.require_all( F.ABS_DELTA_MASS("KS0") < mass_window, F.PT > pt_min, @@ -546,7 +546,7 @@ def make_rd_ks0_dds( descriptor = 'KS0 -> pi+ pi-' combination_code = F.require_all( F.ABS_DELTA_MASS("KS0") < mass_window_comb, - F.MAXDOCACHI2CUT(adocachi2cut)) + F.MAXSDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = F.require_all( F.ABS_DELTA_MASS("KS0") < mass_window, F.CHI2DOF < vchi2pdof_max, @@ -596,7 +596,7 @@ def make_rd_lambda_lls( descriptor = '[Lambda0 -> p+ pi-]cc' combination_code = F.require_all( F.ABS_DELTA_MASS("Lambda0") < mass_window_comb, - F.MAXDOCACHI2CUT(adocachi2cut)) + F.MAXSDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = F.require_all( F.ABS_DELTA_MASS("Lambda0") < mass_window, F.CHI2DOF < vchi2pdof_max, @@ -647,7 +647,7 @@ def make_rd_lambda_dds( descriptor = '[Lambda0 -> p+ pi-]cc' combination_code = F.require_all( F.ABS_DELTA_MASS("Lambda0") < mass_window_comb, - F.MAXDOCACHI2CUT(adocachi2cut)) + F.MAXSDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = F.require_all( F.ABS_DELTA_MASS("Lambda0") < mass_window, F.CHI2DOF < vchi2pdof_max, @@ -869,7 +869,7 @@ def make_rd_detached_etaprime( photons = make_rd_photons(et_min=et_gamma_min, e_min=e_gamma_min) descriptor = '[eta_prime -> pi+ pi- gamma]cc' combination_code = in_range(am_min, F.MASS, am_max) - combination12_code = F.MAXDOCACHI2CUT(adocachi2_cut) + combination12_code = F.MAXSDOCACHI2CUT(adocachi2_cut) vertex_code = F.require_all(F.PT > pt_min, F.CHI2DOF < vchi2pdof_max) return ParticleCombiner( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/strange_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/strange_builders.py index 2bf5583d39c..8919cabc665 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/strange_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/strange_builders.py @@ -72,7 +72,7 @@ MIN_PID_K = optional_functor(lambda v: F.PID_K >= v) MIN_PID_K_OVER_P = optional_functor(lambda v: (F.PID_K - F.PID_P) >= v) MIN_PID_E = optional_functor(lambda v: F.PID_E >= v) MAX_DOCA = optional_functor(lambda v: F.MAXDOCACUT(v)) -MAX_DOCACHI2 = optional_functor(lambda v: F.MAXDOCACHI2CUT(v)) +MAX_DOCACHI2 = optional_functor(lambda v: F.MAXSDOCACHI2CUT(v)) MIN_BPVVDZ = optional_functor(lambda v, pvs: F.BPVVDZ(pvs) >= v) MAX_IPBPVVDZ_RATIO = optional_functor( lambda v, pvs: F.MINIP(pvs) / F.BPVVDZ(pvs) < v) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/b_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/b_builder.py index 41791840ace..7b7db8a9901 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/b_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/b_builder.py @@ -46,10 +46,10 @@ def make_b2xclnu(particles, if comb_docachi2_max is not None: combination_code = F.require_all(combination_code, - F.MAXDOCACHI2CUT(comb_docachi2_max)) + F.MAXSDOCACHI2CUT(comb_docachi2_max)) if comb_doca_max is not None: combination_code = F.require_all(combination_code, - F.MAXDOCACUT(comb_doca_max)) + F.MAXSDOCACUT(comb_doca_max)) vertex_code = F.require_all( in_range(mother_m_min, F.MASS, mother_m_max), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py index 8c46e43c77f..1cba90d387f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py @@ -470,7 +470,7 @@ def make_ks0_ll( descriptor = 'KS0 -> pi+ pi-' combination_code = F.require_all( in_range(_K0_M - mass_window_comb, F.MASS, _K0_M + mass_window_comb), - F.MAXDOCACHI2CUT(adocachi2cut_max)) + F.MAXSDOCACHI2CUT(adocachi2cut_max)) pvs = make_pvs() vertex_code = F.require_all( in_range(_K0_M - mass_window, F.MASS, _K0_M + mass_window), @@ -511,7 +511,7 @@ def make_ks0_dd( descriptor = 'KS0 -> pi+ pi-' combination_code = F.require_all( in_range(_K0_M - mass_window_comb, F.MASS, _K0_M + mass_window_comb), - F.MAXDOCACHI2CUT(adocachi2cut_max)) + F.MAXSDOCACHI2CUT(adocachi2cut_max)) pvs = make_pvs() vertex_code = F.require_all( in_range(_K0_M - mass_window, F.MASS, _K0_M + mass_window), @@ -564,7 +564,7 @@ def make_lambda_ll( combination_code = F.require_all( in_range(_Lambda0_M - mass_window_comb, F.MASS, _Lambda0_M + mass_window_comb), - F.MAXDOCACHI2CUT(adocachi2cut_max)) + F.MAXSDOCACHI2CUT(adocachi2cut_max)) pvs = make_pvs() vertex_code = F.require_all( in_range(_Lambda0_M - mass_window, F.MASS, _Lambda0_M + mass_window), @@ -617,7 +617,7 @@ def make_lambda_dd( combination_code = F.require_all( in_range(_Lambda0_M - mass_window_comb, F.MASS, _Lambda0_M + mass_window_comb), - F.MAXDOCACHI2CUT(adocachi2cut_max)) + F.MAXSDOCACHI2CUT(adocachi2cut_max)) pvs = make_pvs() vertex_code = F.require_all( in_range(_Lambda0_M - mass_window, F.MASS, _Lambda0_M + mass_window), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/charm_hadron_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/charm_hadron_builder.py index 27cb93f9c88..679c2b216e7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/charm_hadron_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/charm_hadron_builder.py @@ -87,7 +87,7 @@ def make_Hc_to_nbody(particles, F.MAXDOCACUT(comb_doca_max)) if comb_docachi2_max is not None: combination_code = F.require_all(combination_code, - F.MAXDOCACHI2CUT(comb_docachi2_max)) + F.MAXSDOCACHI2CUT(comb_docachi2_max)) mother_code = F.require_all(F.CHI2DOF < vchi2pdof_max) if bpvdira_min is not None: diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/dilepton_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/dilepton_builder.py index a4e5d977495..eebedb0f95f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/dilepton_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/dilepton_builder.py @@ -49,7 +49,7 @@ def make_detached_dimuon_for_b2lllnu(name='detached_dimuon_for_b2lllnu_{hash}', combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.PT > pt_dimuon_min, - F.MAXDOCACHI2CUT(adocachi2cut_max)) + F.MAXSDOCACHI2CUT(adocachi2cut_max)) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvvdchi2_min) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/hlt2_test.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/hlt2_test.py index b74c5ed2597..76885d51ed2 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/hlt2_test.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/hlt2_test.py @@ -169,7 +169,7 @@ def xicz_to_lpipi_dd_line(name="Hlt2Test_Xic0ToL0PimPip_DD"): CombinationCut=F.require_all( F.MASS < 1190 * MeV, F.MAXDOCACUT(2 * mm), - F.MAXDOCACHI2CUT(12.), + F.MAXSDOCACHI2CUT(12.), F.PT > 0.9 * GeV, F.P > 13 * GeV, F.SUM(F.PT) > 1 * GeV, @@ -329,7 +329,7 @@ def _make_phi(): name="FilteredPIDkaons", Input=kaons, Cut=F.FILTER(F.PID_K > -5)) combination_code = F.require_all( F.math.in_range(980. * MeV, F.MASS, 1060. * MeV), - F.MAXDOCACHI2CUT(30.), + F.MAXSDOCACHI2CUT(30.), F.SUM(F.CHI2DOF < 5.) > 0) vertex_code = F.require_all(F.CHI2 < 10, F.PT > 1 * GeV, F.CHI2DOF < 15, F.BPVFDCHI2(make_pvs()) > 0) @@ -386,8 +386,8 @@ def bs2jpsiphi_jpsi2mumu_phi2kk_line(name='Hlt2Test_Bs0ToJpsiPhi_JPsiToMupMum', mother_code = F.CHI2 < 16. combination_code = F.require_all( F.math.in_range(2900 * MeV, F.MASS, 3300 * MeV), - F.MAXDOCACHI2 < - 20, # mstahl: mixture of MAXDOCACHI2 and MAXDOCACHI2CUT. the latter should be preferred + F.MAXSDOCACHI2 < + 20, # mstahl: mixture of MAXSDOCACHI2 and MAXSDOCACHI2CUT. the latter should be preferred F.SUM(F.PT > 0.5 * GeV) > 0) jpsi = ParticleCombiner( name="Test_MassConstrJpsi2MuMuMaker", @@ -433,8 +433,8 @@ def bs2jpsiphi_jpsi2mumu_phi2kk_pvunbiasing_with_refit_line( mother_code = F.CHI2 < 16. combination_code = F.require_all( F.math.in_range(2900 * MeV, F.MASS, 3300 * MeV), - F.MAXDOCACHI2 < - 20, # mstahl: mixture of MAXDOCACHI2 and MAXDOCACHI2CUT. the latter should be preferred + F.MAXSDOCACHI2 < + 20, # mstahl: mixture of MAXSDOCACHI2 and MAXSDOCACHI2CUT. the latter should be preferred F.SUM(F.PT > 0.5 * GeV) > 0) jpsi = ParticleCombiner( name="Test_MassConstrJpsi2MuMuMaker", @@ -472,8 +472,8 @@ def bs2jpsiphi_jpsi2mumu_phi2kk_pvunbiasing_line( mother_code = F.CHI2 < 16. combination_code = F.require_all( F.math.in_range(2900 * MeV, F.MASS, 3300 * MeV), - F.MAXDOCACHI2 < - 20, # mstahl: mixture of MAXDOCACHI2 and MAXDOCACHI2CUT. the latter should be preferred + F.MAXSDOCACHI2 < + 20, # mstahl: mixture of MAXSDOCACHI2 and MAXSDOCACHI2CUT. the latter should be preferred F.SUM(F.PT > 0.5 * GeV) > 0) jpsi = ParticleCombiner( name="Test_MassConstrJpsi2MuMuMaker", @@ -514,7 +514,7 @@ def bs2jpsiphi_jpsi2ee_phi2kk_line(name='Hlt2Test_BsToJpsiPhi_JPsi2ee_PhiToKK', Cut=F.FILTER(F.PID_E > 0.)) mother_code = F.CHI2 < 16. combination_code = F.require_all( - F.math.in_range(2900 * MeV, F.MASS, 3300 * MeV), F.MAXDOCACHI2 < 20, + F.math.in_range(2900 * MeV, F.MASS, 3300 * MeV), F.MAXSDOCACHI2 < 20, F.SUM(F.PT > 0.5 * GeV) > 0) jpsi = ParticleCombiner( name=name, @@ -563,7 +563,7 @@ def _make_sl_bs(dzeros, muons): DecayDescriptor="[B- -> D0 mu-]cc", name="Test_Taggers_BBuilderFor_D0_{hash}", CombinationCut=F.require_all( - in_range(2.3 * GeV, F.MASS, 10 * GeV), F.MAXDOCACHI2CUT(10.)), + in_range(2.3 * GeV, F.MASS, 10 * GeV), F.MAXSDOCACHI2CUT(10.)), CompositeCut=F.require_all( F.CHI2DOF < 9., in_range(2.3 * GeV, F.MASS, 10 * GeV), in_range(2.8 * GeV, F.BPVCORRM(pvs), 8.5 * GeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_particles.py b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_particles.py index 6f8b1d11a1e..8837358e7d6 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_particles.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_particles.py @@ -677,7 +677,7 @@ def make_detached_dielectron(name='std_make_detached_dielectron_{hash}', probnn_e=probnn_e, minipchi2=minipchi2, trghostprob=trghostprob) - combination_code = F.require_all(F.MAXDOCACHI2CUT(float(adocachi2cut))) + combination_code = F.require_all(F.MAXSDOCACHI2CUT(float(adocachi2cut))) vertex_code = F.require_all(F.CHI2DOF < vfaspfchi2ndof, F.BPVFDCHI2(pvs) > bpvvdchi2) return ParticleCombiner( @@ -760,7 +760,7 @@ def make_prompt_dielectron_with_brem( m_diE_ID=dielectron_ID, opposite_sign=opposite_sign) code_dielectron = F.require_all( - F.MAXDOCACHI2CUT(float(adocachi2cut)), F.CHI2DOF < vfaspfchi2ndof) + F.MAXSDOCACHI2CUT(float(adocachi2cut)), F.CHI2DOF < vfaspfchi2ndof) if bpvvdchi2 is not None: code_dielectron = code_dielectron & (F.BPVFDCHI2(pvs) < bpvvdchi2) @@ -816,7 +816,7 @@ def make_detached_dielectron_with_brem( opposite_sign=opposite_sign) code_dielectron = F.require_all( - F.MAXDOCACHI2CUT(float(adocachi2cut)), F.CHI2DOF < vfaspfchi2ndof, + F.MAXSDOCACHI2CUT(float(adocachi2cut)), F.CHI2DOF < vfaspfchi2ndof, F.BPVFDCHI2(pvs) > bpvvdchi2) if fake_electrons == 1: @@ -887,7 +887,7 @@ def make_detached_mue(name='std_make_detached_mue_{hash}', probnn_mu=probnn_mu, minipchi2=minipchi2, trghostprob=trghostprob) - combination_code = F.require_all(F.MAXDOCACHI2CUT(float(adocachi2cut))) + combination_code = F.require_all(F.MAXSDOCACHI2CUT(float(adocachi2cut))) vertex_code = F.require_all(F.CHI2DOF < vfaspfchi2ndof, F.BPVFDCHI2(pvs) > bpvvdchi2) @@ -956,7 +956,7 @@ def make_detached_mue_with_brem(name='std_make_detached_mue_with_brem_{hash}', ismuon=IsMuon, minipchi2=minipchi2_track, trghostprob=max_trghostprob) - combination_code = F.require_all(F.MAXDOCACHI2CUT(float(max_adocachi2))) + combination_code = F.require_all(F.MAXSDOCACHI2CUT(float(max_adocachi2))) vertex_code = F.require_all(F.CHI2DOF < max_vchi2ndof, F.BPVFDCHI2(pvs) > min_bpvvdchi2) return ParticleCombiner( @@ -1025,7 +1025,7 @@ def make_detached_mumu(name='std_make_detached_mumu_{hash}', trghostprob=trghostprob) particles = [muons, muons] - combination_code = F.require_all(F.MAXDOCACHI2CUT(float(adocachi2cut))) + combination_code = F.require_all(F.MAXSDOCACHI2CUT(float(adocachi2cut))) vertex_code = F.require_all(F.CHI2DOF < vfaspfchi2ndof, F.BPVFDCHI2(pvs) > bpvvdchi2) return ParticleCombiner( @@ -1057,7 +1057,7 @@ def make_dimuon_base(name='std_DiMuonBaseCombiner_{hash}', probnn_mu=probnn_mu) # require that the muons come from the same vertex - combination_code = F.ALL if adoca_chi2 is None else F.MAXDOCACHI2CUT( + combination_code = F.ALL if adoca_chi2 is None else F.MAXSDOCACHI2CUT( float(adoca_chi2)) vertex_code = F.require_all(F.CHI2DOF < maxVCHI2PDOF) return ParticleCombiner( diff --git a/Hlt/Hlt2Conf/tests/options/hlt2_monitor.py b/Hlt/Hlt2Conf/tests/options/hlt2_monitor.py index 95f22e416eb..f6d3bf65a97 100644 --- a/Hlt/Hlt2Conf/tests/options/hlt2_monitor.py +++ b/Hlt/Hlt2Conf/tests/options/hlt2_monitor.py @@ -61,7 +61,7 @@ def make_kaons(decay_descriptor, combination_code = F.require_all( in_range(mass_min, F.MASS, mass_max), F.MAXDOCACUT(comb_maxdoca), - F.MAXDOCACHI2CUT(two_body_comb_maxdocachi2), + F.MAXSDOCACHI2CUT(two_body_comb_maxdocachi2), ) vertex_code = (F.CHI2DOF < vchi2pdof_max) return ParticleCombiner( diff --git a/Hlt/Hlt2Conf/tests/options/hlt2_thor_selections.py b/Hlt/Hlt2Conf/tests/options/hlt2_thor_selections.py index 9e825a70668..73bf81316b1 100644 --- a/Hlt/Hlt2Conf/tests/options/hlt2_thor_selections.py +++ b/Hlt/Hlt2Conf/tests/options/hlt2_thor_selections.py @@ -68,12 +68,12 @@ def make_lines(): dzero = ParticleCombiner( Inputs=[combination, pions, pions], DecayDescriptor="D0 -> KS0 pi+ pi-", - Combination12Cut=F.MAXDOCACHI2CUT(10.), + Combination12Cut=F.MAXSDOCACHI2CUT(10.), CombinationCut=F.require_all( - F.SUBCOMB(Functor=F.MAXDOCACHI2CUT(10.), Indices=(2, 3)), - F.SUBCOMB(Functor=F.MAXDOCACHI2CUT(10.), Indices=(1, 3)), + F.SUBCOMB(Functor=F.MAXSDOCACHI2CUT(10.), Indices=(2, 3)), + F.SUBCOMB(Functor=F.MAXSDOCACHI2CUT(10.), Indices=(1, 3)), in_range(1500 * MeV, F.MASS, 2500 * MeV), - F.MAXDOCACHI2CUT(16.), + F.MAXSDOCACHI2CUT(16.), ), CompositeCut=F.CHI2DOF < 12, ) -- GitLab From 8772d543d150bbd1d82eadf52d8348995d3a0da5 Mon Sep 17 00:00:00 2001 From: Wouter Hulsbergen Date: Wed, 20 Mar 2024 17:15:13 +0100 Subject: [PATCH 2/9] replace remaining DOCA with SDOCA --- .../b_to_charmonia/builders/basic_builder.py | 2 +- .../b_to_open_charm/builders/basic_builder.py | 10 +- .../bandq/builders/b_for_spectroscopy.py | 18 +- .../lines/bandq/builders/b_hadrons.py | 38 +- .../lines/bandq/builders/c_hadrons.py | 24 +- .../lines/bandq/builders/charged_hadrons.py | 4 +- .../lines/bandq/builders/dimuon_lines.py | 2 +- .../bandq/builders/jpsi_to_lmdlmd_lines.py | 4 +- .../Hlt2Conf/lines/bnoc/builders/b_builder.py | 30 +- .../lines/bnoc/builders/basic_builder.py | 22 +- .../Hlt2Conf/lines/bnoc/builders/combiners.py | 20 +- .../lines/charm/cbaryon_to_ph0_btag.py | 4 +- .../Hlt2Conf/lines/charm/cbaryon_to_phh.py | 6 +- .../Hlt2Conf/lines/charm/cbaryon_to_pk.py | 4 +- .../Hlt2Conf/lines/charm/cbaryon_to_sl.py | 284 +++---- .../Hlt2Conf/lines/charm/ccbaryon_hadronic.py | 86 +-- .../lines/charm/ccbaryon_to_cbaryon_sl.py | 24 +- .../lines/charm/ccbaryon_to_hyperon_dh.py | 16 +- .../Hlt2Conf/lines/charm/charm_to_h0x.py | 12 +- .../python/Hlt2Conf/lines/charm/d0_to_hh.py | 6 +- .../Hlt2Conf/lines/charm/d0_to_hhgamma.py | 6 +- .../python/Hlt2Conf/lines/charm/d0_to_hhhh.py | 6 +- .../Hlt2Conf/lines/charm/d0_to_hhpi0.py | 2 +- .../python/Hlt2Conf/lines/charm/d0_to_kshh.py | 6 +- .../python/Hlt2Conf/lines/charm/d_to_etah.py | 20 +- .../python/Hlt2Conf/lines/charm/d_to_hhh.py | 12 +- .../python/Hlt2Conf/lines/charm/d_to_ksh.py | 6 +- .../lines/charm/detection_asymmetry_lines.py | 16 +- .../Hlt2Conf/lines/charm/dsstar_to_dspipi.py | 14 +- .../Hlt2Conf/lines/charm/dst_to_dee_makers.py | 32 +- .../lines/charm/hadronic_interaction_lines.py | 4 +- .../python/Hlt2Conf/lines/charm/hexaquarks.py | 2 +- .../python/Hlt2Conf/lines/charm/hyperons.py | 727 +++++++++--------- .../python/Hlt2Conf/lines/charm/hyperonsTT.py | 138 ++-- .../Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py | 10 +- .../python/Hlt2Conf/lines/charm/prod_xsec.py | 14 +- .../Hlt2Conf/lines/charm/rare_charm_makers.py | 62 +- .../Hlt2Conf/lines/charmonium_to_dimuon.py | 4 +- .../Hlt2Conf/lines/hlt2_line_example.py | 6 +- .../Hlt2Conf/lines/ift/hlt2_ift_femtoscopy.py | 6 +- .../lines/ift/hlt2_ift_smog2_trackingeff.py | 4 +- .../ift/hlt2_ift_smog2_trackingeff_Ks.py | 2 +- .../lines/iftPbPb/builders/charm_builders.py | 4 +- .../lines/monitoring/data_quality_PbPb.py | 6 +- .../lines/pid/DsToPhiPi_PhiToMuMuTagged.py | 2 +- .../Hlt2Conf/lines/pid/DstToD0Pi_D0ToKPi.py | 2 +- .../lines/pid/DstToD0Pi_D0ToKPiPiPi.py | 26 +- .../Hlt2Conf/lines/pid/PhiToKK_Detached.py | 4 +- .../Hlt2Conf/lines/pid/utils/charmonium.py | 2 +- .../Hlt2Conf/lines/pid/utils/d_builders.py | 2 +- .../Hlt2Conf/lines/pid/utils/neutral_pid.py | 2 +- .../python/Hlt2Conf/lines/qee/calibration.py | 2 +- .../python/Hlt2Conf/lines/qee/dimuon_no_ip.py | 2 +- .../python/Hlt2Conf/lines/qee/drellyan.py | 2 +- .../lines/rd/builders/Nmu_builders.py | 8 +- .../lines/rd/builders/b_to_hemu_builders.py | 3 +- .../rd/builders/omega_rare_decay_builder.py | 4 +- .../lines/rd/builders/rdbuilder_thor.py | 6 +- .../lines/rd/builders/strange_builders.py | 2 +- .../lines/semileptonic/HbToTauNu_BTracking.py | 4 +- .../lines/semileptonic/builders/b_builder.py | 6 +- .../semileptonic/builders/base_builder.py | 2 +- .../builders/charm_hadron_builder.py | 2 +- .../lines/starterkit/bs_to_jpsiphi.py | 12 +- .../python/Hlt2Conf/lines/test/hlt2_test.py | 26 +- .../python/Hlt2Conf/lines/test/spruce_test.py | 6 +- .../Hlt2Conf/lines/topological_b/__init__.py | 6 +- .../lines/trackeff/DiMuonTrackEfficiency.py | 4 +- .../Hlt2Conf/lines/trackeff/KSVeloLong.py | 2 +- .../Velo2Long_B2JpsiK_ElectronProbe.py | 4 +- .../trackeff/Velo2Long_B2JpsiK_MuonProbe.py | 4 +- 71 files changed, 941 insertions(+), 931 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/basic_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/basic_builder.py index 4187d48ab11..4430814e741 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/basic_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_charmonia/builders/basic_builder.py @@ -420,7 +420,7 @@ def filter_muons_loose(particles, mu_pidp=None): """Returns loosely preselected muons """ code = require_all(F.ISMUON, F.PID_MU > pidmu, - F.PT > pt_min) #, F.MAXDOCACUT(docachi2_max_mu)) + F.PT > pt_min) #, F.MAXSDOCACUT(docachi2_max_mu)) if mu_pidk is not None: code = code & (F.PID_K < mu_pidk) if mu_pidp is not None: diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/basic_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/basic_builder.py index f12448e0e12..06a7a24fee2 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/basic_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/basic_builder.py @@ -649,7 +649,7 @@ def make_rho0(name="B2OCRho0Combiner_{hash}", descriptor = 'rho(770)0 -> pi+ pi-' combination_code = require_all( in_range(am_min, F.MASS, am_max), - F.SUM(F.PT) > asumpt_min, F.MAXDOCACUT(adoca12_max)) + F.SUM(F.PT) > asumpt_min, F.MAXSDOCACUT(adoca12_max)) pvs = make_pvs() vertex_code = require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvvdchi2_min) @@ -688,7 +688,7 @@ def make_kstar0(name="B2OCKstarCombiner_{hash}", descriptor = '[K*(892)0 -> pi- K+]cc' combination_code = require_all( in_range(am_min, F.MASS, am_max), - F.SUM(F.PT) > asumpt_min, F.MAXDOCACUT(adoca12_max)) + F.SUM(F.PT) > asumpt_min, F.MAXSDOCACUT(adoca12_max)) pvs = make_pvs() vertex_code = require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvvdchi2_min) @@ -721,7 +721,7 @@ def make_phi(name="B2OCPhiCombiner_{hash}", descriptor = 'phi(1020) -> K+ K-' combination_code = require_all( in_range(am_min, F.MASS, am_max), - F.SUM(F.PT) > asumpt_min, F.MAXDOCACUT(adoca12_max)) + F.SUM(F.PT) > asumpt_min, F.MAXSDOCACUT(adoca12_max)) pvs = make_pvs() vertex_code = require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvvdchi2_min) @@ -845,7 +845,7 @@ def make_xim_to_lambda0pim(lambdas, # Todo, tune cuts for Xi- from b, default is from c pvs = make_pvs() combination_code = require_all( - F.MAXDOCACUT(comb_doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXSDOCACUT(comb_doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.P > comb_p_min) vertex_code = require_all( in_range(m_min, F.MASS, m_max), F.PT > pt_min, F.P > p_min, @@ -878,7 +878,7 @@ def make_omegam_to_lambda0km(lambdas, # Todo, tune cuts for Omega- from b, default is from c pvs = make_pvs() combination_code = require_all( - F.MAXDOCACUT(comb_doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXSDOCACUT(comb_doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.P > comb_p_min) vertex_code = require_all( in_range(m_min, F.MASS, m_max), F.PT > pt_min, F.P > p_min, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_for_spectroscopy.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_for_spectroscopy.py index 46efd58d2d4..e8a62695df0 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_for_spectroscopy.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_for_spectroscopy.py @@ -355,11 +355,11 @@ def make_b2cx_for_spectroscopy( if len(particles) == 3: combination12_code = require_all(F.MASS < am_max, - F.DOCACHI2(1, 2) < achi2_doca_max) + F.SDOCACHI2(1, 2) < achi2_doca_max) combination_code &= require_all( - F.DOCACHI2(1, 3) < achi2_doca_max, - F.DOCACHI2(2, 3) < achi2_doca_max) + F.SDOCACHI2(1, 3) < achi2_doca_max, + F.SDOCACHI2(2, 3) < achi2_doca_max) return ParticleCombiner( particles, @@ -371,16 +371,16 @@ def make_b2cx_for_spectroscopy( if len(particles) >= 4: combination12_code = require_all(F.MASS < am_max, - F.DOCACHI2(1, 2) < achi2_doca_max) + F.SDOCACHI2(1, 2) < achi2_doca_max) combination123_code = require_all(F.MASS < am_max, - F.DOCACHI2(1, 3) < achi2_doca_max, - F.DOCACHI2(2, 3) < achi2_doca_max) + F.SDOCACHI2(1, 3) < achi2_doca_max, + F.SDOCACHI2(2, 3) < achi2_doca_max) combination_code &= require_all( - F.DOCACHI2(1, 4) < achi2_doca_max, - F.DOCACHI2(2, 4) < achi2_doca_max, - F.DOCACHI2(3, 4) < achi2_doca_max) + F.SDOCACHI2(1, 4) < achi2_doca_max, + F.SDOCACHI2(2, 4) < achi2_doca_max, + F.SDOCACHI2(3, 4) < achi2_doca_max) return ParticleCombiner( name=name, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_hadrons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_hadrons.py index 62f414b57e6..0d2e38329f9 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_hadrons.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_hadrons.py @@ -63,11 +63,11 @@ def _make_generic(particles, if len(particles) == 3: combination12_code = require_all(F.MASS < am_max - _MASS_MIN, - F.DOCACHI2(1, 2) < achi2_doca_max) + F.SDOCACHI2(1, 2) < achi2_doca_max) combination_code &= require_all( - F.DOCACHI2(1, 3) < achi2_doca_max, - F.DOCACHI2(2, 3) < achi2_doca_max) + F.SDOCACHI2(1, 3) < achi2_doca_max, + F.SDOCACHI2(2, 3) < achi2_doca_max) return ParticleCombiner( name=name, @@ -79,16 +79,16 @@ def _make_generic(particles, if len(particles) == 4: combination12_code = require_all(F.MASS < am_max - 2 * _MASS_MIN, - F.DOCACHI2(1, 2) < achi2_doca_max) + F.SDOCACHI2(1, 2) < achi2_doca_max) combination123_code = require_all(F.MASS < am_max - _MASS_MIN, - F.DOCACHI2(1, 3) < achi2_doca_max, - F.DOCACHI2(2, 3) < achi2_doca_max) + F.SDOCACHI2(1, 3) < achi2_doca_max, + F.SDOCACHI2(2, 3) < achi2_doca_max) combination_code &= require_all( - F.DOCACHI2(1, 4) < achi2_doca_max, - F.DOCACHI2(2, 4) < achi2_doca_max, - F.DOCACHI2(3, 4) < achi2_doca_max) + F.SDOCACHI2(1, 4) < achi2_doca_max, + F.SDOCACHI2(2, 4) < achi2_doca_max, + F.SDOCACHI2(3, 4) < achi2_doca_max) return ParticleCombiner( name=name, @@ -101,22 +101,22 @@ def _make_generic(particles, if len(particles) >= 5: combination12_code = require_all(F.MASS < am_max - 3 * _MASS_MIN, - F.DOCACHI2(1, 2) < achi2_doca_max) + F.SDOCACHI2(1, 2) < achi2_doca_max) combination123_code = require_all(F.MASS < am_max - 2 * _MASS_MIN, - F.DOCACHI2(1, 3) < achi2_doca_max, - F.DOCACHI2(2, 3) < achi2_doca_max) + F.SDOCACHI2(1, 3) < achi2_doca_max, + F.SDOCACHI2(2, 3) < achi2_doca_max) combination1234_code = require_all(F.MASS < am_max - _MASS_MIN, - F.DOCACHI2(1, 4) < achi2_doca_max, - F.DOCACHI2(2, 4) < achi2_doca_max, - F.DOCACHI2(3, 4) < achi2_doca_max) + F.SDOCACHI2(1, 4) < achi2_doca_max, + F.SDOCACHI2(2, 4) < achi2_doca_max, + F.SDOCACHI2(3, 4) < achi2_doca_max) combination_code &= require_all( - F.DOCACHI2(1, 5) < achi2_doca_max, - F.DOCACHI2(2, 5) < achi2_doca_max, - F.DOCACHI2(3, 5) < achi2_doca_max, - F.DOCACHI2(4, 5) < achi2_doca_max) + F.SDOCACHI2(1, 5) < achi2_doca_max, + F.SDOCACHI2(2, 5) < achi2_doca_max, + F.SDOCACHI2(3, 5) < achi2_doca_max, + F.SDOCACHI2(4, 5) < achi2_doca_max) return ParticleCombiner( name=name, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/c_hadrons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/c_hadrons.py index c4db864c9d2..cb7555ecf3e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/c_hadrons.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/c_hadrons.py @@ -75,11 +75,11 @@ def _make_charm( elif len(particles) == 3: combination12_code = require_all(F.MASS < am_max, - F.DOCACHI2(1, 2) < achi2_doca_max) + F.SDOCACHI2(1, 2) < achi2_doca_max) combination_code &= require_all( - F.DOCACHI2(1, 3) < achi2_doca_max, - F.DOCACHI2(2, 3) < achi2_doca_max) + F.SDOCACHI2(1, 3) < achi2_doca_max, + F.SDOCACHI2(2, 3) < achi2_doca_max) return ParticleCombiner( name=name, @@ -91,16 +91,16 @@ def _make_charm( if len(particles) == 4: combination12_code = require_all(F.MASS < am_max, - F.DOCACHI2(1, 2) < achi2_doca_max) + F.SDOCACHI2(1, 2) < achi2_doca_max) combination123_code = require_all(F.MASS < am_max, - F.DOCACHI2(1, 3) < achi2_doca_max, - F.DOCACHI2(2, 3) < achi2_doca_max) + F.SDOCACHI2(1, 3) < achi2_doca_max, + F.SDOCACHI2(2, 3) < achi2_doca_max) combination_code &= require_all( - F.DOCACHI2(1, 4) < achi2_doca_max, - F.DOCACHI2(2, 4) < achi2_doca_max, - F.DOCACHI2(3, 4) < achi2_doca_max) + F.SDOCACHI2(1, 4) < achi2_doca_max, + F.SDOCACHI2(2, 4) < achi2_doca_max, + F.SDOCACHI2(3, 4) < achi2_doca_max) return ParticleCombiner( name=name, @@ -314,9 +314,9 @@ def make_tightomegac(particles, combination_code = require_all( in_range(am_min, F.MASS, am_max), F.PT > apt_min, - F.DOCACHI2(1, 2) < achi2_doca_max, - F.DOCACHI2(1, 3) < achi2_doca_max, - F.DOCACHI2(2, 3) < achi2_doca_max, + F.SDOCACHI2(1, 2) < achi2_doca_max, + F.SDOCACHI2(1, 3) < achi2_doca_max, + F.SDOCACHI2(2, 3) < achi2_doca_max, F.SUM(F.PT) > comb_sum_pt_min, F.SUM(F.PT > comb_pt_min_at_least_one) >= 1, F.SUM(F.PT > comb_pt_min_at_least_two) >= 2, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/charged_hadrons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/charged_hadrons.py index d5cbad1fb60..29d066a4205 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/charged_hadrons.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/charged_hadrons.py @@ -232,7 +232,7 @@ def make_detached_phi(name='bandq_detached_phi_{hash}', combination_code = require_all( in_range(am_min, F.MASS, am_max), - F.DOCACHI2(1, 2) < maxDOCAChi2) + F.SDOCACHI2(1, 2) < maxDOCAChi2) vertex_code = require_all(F.CHI2DOF < vtx_chi2pdof_max, F.PT > minpt, in_range(m_min, F.MASS, m_max)) @@ -259,7 +259,7 @@ def make_prompt_phi(name='bandq_prompt_phi_{hash}', combination_code = require_all( in_range(am_min, F.MASS, am_max), - F.DOCACHI2(1, 2) < maxDOCAChi2) + F.SDOCACHI2(1, 2) < maxDOCAChi2) vertex_code = require_all(F.CHI2DOF < vtx_chi2pdof_max, F.PT > minpt, in_range(m_min, F.MASS, m_max)) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/dimuon_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/dimuon_lines.py index e1c872fa530..bb6ecf1d66c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/dimuon_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/dimuon_lines.py @@ -169,7 +169,7 @@ def make_soft_detached_dimuon(name='DiMuonDetachedSoftFilter_{hash}', pvs = make_pvs() combination_code = require_all( - F.MAXDOCACUT(maxDOCA), + F.MAXSDOCACUT(maxDOCA), F.ALV(1, 2) < maxCosAngle, F.MASS < maxMass_dimuon) # require that the muons come from the same vertex diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/jpsi_to_lmdlmd_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/jpsi_to_lmdlmd_lines.py index 7be6192e559..70d56e13a05 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/jpsi_to_lmdlmd_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/jpsi_to_lmdlmd_lines.py @@ -44,7 +44,7 @@ def make_lambdall(): pid=F.require_all(F.PID_P > 5., (F.PID_P - F.PID_K) > 0.)) combinationcode = F.require_all( in_range(1095 * MeV, F.MASS, 1140 * MeV), F.MAXSDOCACHI2CUT(4.), - F.PT > 500. * MeV, F.MAXDOCACUT(0.12 * mm)) + F.PT > 500. * MeV, F.MAXSDOCACUT(0.12 * mm)) vertexcode = F.require_all( in_range(1105 * MeV, F.MASS, 1130 * MeV), F.CHI2DOF < 5., in_range(-100 * mm, F.END_VZ, 500 * mm), @@ -77,7 +77,7 @@ def make_lambdadd(): pid=F.require_all(F.PID_P > 5., (F.PID_P - F.PID_K) > 0.)) combinationcode = F.require_all( in_range(1085 * MeV, F.MASS, 1145 * MeV), F.MAXSDOCACHI2CUT(4.), - F.PT > 600. * MeV, F.MAXDOCACUT(4.0 * mm)) + F.PT > 600. * MeV, F.MAXSDOCACUT(4.0 * mm)) vertexcode = F.require_all( in_range(1105 * MeV, F.MASS, 1130 * MeV), F.CHI2DOF < 5., in_range(300 * mm, F.END_VZ, 2275 * mm), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/b_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/b_builder.py index 5935f5bfacc..c1f4f1a25e0 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/b_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/b_builder.py @@ -45,7 +45,7 @@ def make_b2ksks(particles, AllowDiffInputsForSameIDChildren=False): combination_code = F.require_all( - in_range(am_min, F.MASS, am_max), F.MAXDOCACUT(adoca_max), + in_range(am_min, F.MASS, am_max), F.MAXSDOCACUT(adoca_max), F.SUM(F.PT) > asumpt_min) pvs = make_pvs() @@ -216,14 +216,14 @@ def make_b2x( if daughter_mipchi2_min is not None: vertex_code &= F.MIN(F.MINIPCHI2(pvs)) > daughter_mipchi2_min if adoca_max is not None: - combination12_code &= F.DOCA(1, 2) < adoca_max + combination12_code &= F.SDOCA(1, 2) < adoca_max combination123_code &= F.require_all( - F.DOCA(1, 3) < adoca_max, - F.DOCA(2, 3) < adoca_max) + F.SDOCA(1, 3) < adoca_max, + F.SDOCA(2, 3) < adoca_max) combination_code &= F.require_all( - F.DOCA(1, 4) < adoca_max, - F.DOCA(2, 4) < adoca_max, - F.DOCA(3, 4) < adoca_max) + F.SDOCA(1, 4) < adoca_max, + F.SDOCA(2, 4) < adoca_max, + F.SDOCA(3, 4) < adoca_max) return ParticleCombiner( particles, @@ -292,7 +292,7 @@ def make_b2hhh( Specialised 3-body Hb --> (h h h) decay maker ''' - combination12_code = F.require_all(F.DOCA(1, 2) < adoca_max) + combination12_code = F.require_all(F.SDOCA(1, 2) < adoca_max) pvs = make_pvs() combination_code = F.require_all( @@ -831,7 +831,7 @@ def make_b2kshh(particles, Primary vertex maker function. Remaining parameters define thresholds for the selection. """ - combination12_cut = require_all(F.DOCACHI2(1, 2) < adoca12_max) + combination12_cut = require_all(F.SDOCACHI2(1, 2) < adoca12_max) combination_cut = require_all( in_range(m_min - 100 * MeV, F.MASS, m_max + 100 * MeV), @@ -839,8 +839,8 @@ def make_b2kshh(particles, F.SUM(F.PT > amed_pt_min) >= 2, F.SUBCOMB(Functor=F.MAX(F.P), Indices=[2, 3]) > hh_amaxp_min, F.SUBCOMB(Functor=F.MAX(F.PT), Indices=[2, 3]) > hh_amaxpt_min, - F.DOCACHI2(1, 3) < adoca13_max, - F.DOCACHI2(2, 3) < adoca23_max) + F.SDOCACHI2(1, 3) < adoca13_max, + F.SDOCACHI2(2, 3) < adoca23_max) pvs = make_pvs() @@ -1029,7 +1029,7 @@ def make_btovv(particles, if asumpt_min is not None: combination_code &= F.SUM(F.PT) > asumpt_min if adoca12_max is not None: - combination_code &= F.DOCA(1, 2) < adoca12_max + combination_code &= F.SDOCA(1, 2) < adoca12_max pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, @@ -1071,13 +1071,13 @@ def make_BdsToVKpKm(particles, bpvipchi2_max=20.0, bpvdira_min=0.999): - combination12_cut = require_all(F.DOCACHI2(1, 2) < adoca_max) + combination12_cut = require_all(F.SDOCACHI2(1, 2) < adoca_max) combination_cut = require_all( in_range(m_min - 50 * MeV, F.MASS, m_max + 50 * MeV), F.SUM(F.PT) > asumpt_min, - F.DOCACHI2(1, 3) < adoca_max, - F.DOCACHI2(2, 3) < adoca_max) + F.SDOCACHI2(1, 3) < adoca_max, + F.SDOCACHI2(2, 3) < adoca_max) combination_cut &= (F.SUBCOMB( Functor=in_range(kk_min, F.MASS, kk_max), Indices=[2, 3])) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py index 7a762b2d5c0..25f71063b34 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py @@ -685,7 +685,7 @@ def make_bbaryon_ks0_ll( descriptor = 'KS0 -> pi+ pi-' combination_code = F.require_all( in_range(mass_min * 0.9, F.MASS, mass_max * 1.1), - F.MAXDOCACUT(doca_max)) + F.MAXSDOCACUT(doca_max)) pvs = make_pvs() vertex_code = F.require_all( in_range(mass_min, F.MASS, mass_max), F.PT > pt_min, @@ -763,7 +763,7 @@ def make_kstar0(name='BNOC_Kstar_Combiner_{hash}', descriptor = '[K*(892)0 -> K+ pi-]cc' combination_code = F.require_all( in_range(am_min, F.MASS, am_max), - F.SUM(F.PT) > asumpt_min, F.MAXDOCACUT(adoca12_max)) + F.SUM(F.PT) > asumpt_min, F.MAXSDOCACUT(adoca12_max)) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min) @@ -821,7 +821,7 @@ def make_wide_kstar0(name='BNOC_WideKstar_Combiner_{hash}', descriptor = '[K*(892)0 -> K+ pi-]cc' combination_code = F.require_all( in_range(am_min, F.MASS, am_max), - F.SUM(F.PT) > asumpt_min, F.MAXDOCACUT(adoca12_max)) + F.SUM(F.PT) > asumpt_min, F.MAXSDOCACUT(adoca12_max)) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min) @@ -937,7 +937,7 @@ def make_phi(name='BNOC_Phi_Combiner_{hash}', in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > asumpt_min) if adoca12_max is not None: - combination_code &= F.MAXDOCACUT(adoca12_max) + combination_code &= F.MAXSDOCACUT(adoca12_max) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min) @@ -985,7 +985,7 @@ def make_phi_fake(name='BNOC_Phi_Combiner_fake_{hash}', in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > asumpt_min) if adoca12_max is not None: - combination_code &= F.MAXDOCACUT(adoca12_max) + combination_code &= F.MAXSDOCACUT(adoca12_max) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min) @@ -1037,7 +1037,7 @@ def make_rho0(name='BNOC_Rho_Combiner_{hash}', combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > asumpt_min, - F.SUM(F.P) > asump_min, F.MAXDOCACUT(adoca12_max)) + F.SUM(F.P) > asump_min, F.MAXSDOCACUT(adoca12_max)) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min) @@ -1087,7 +1087,7 @@ def make_rho0_fake(name='BNOC_Rho_Combiner_fake_{hash}', combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > asumpt_min, - F.SUM(F.P) > asump_min, F.MAXDOCACUT(adoca12_max)) + F.SUM(F.P) > asump_min, F.MAXSDOCACUT(adoca12_max)) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min) @@ -1134,7 +1134,7 @@ def make_omega0(name='BNOC_Omega0_Combiner_{hash}', combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > asumpt_min, - F.SUM(F.P) > asump_min, F.MAXDOCACUT(adoca12_max)) + F.SUM(F.P) > asump_min, F.MAXSDOCACUT(adoca12_max)) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min) @@ -1186,7 +1186,7 @@ def make_omega0_fake(name='BNOC_Omega0_Combiner_fake_{hash}', combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > asumpt_min, - F.SUM(F.P) > asump_min, F.MAXDOCACUT(adoca12_max)) + F.SUM(F.P) > asump_min, F.MAXSDOCACUT(adoca12_max)) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min) @@ -1592,7 +1592,7 @@ def make_xim_to_lambda0pim(lambdas, pvs = make_pvs() comb_cut = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.P > comb_p_min, - F.MAXDOCACUT(doca_max)) + F.MAXSDOCACUT(doca_max)) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), F.P > p_min, F.PT > pt_min, F.CHI2DOF < vchi2pdof_max, @@ -1633,7 +1633,7 @@ def make_omegam_to_lambda0km(lambdas, pvs = make_pvs() comb_cut = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.P > comb_p_min, - F.MAXDOCACUT(doca_max)) + F.MAXSDOCACUT(doca_max)) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), F.P > p_min, F.PT > pt_min, F.CHI2DOF < vchi2pdof_max, F.CHI2DOF < vchi2pdof_max, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/combiners.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/combiners.py index 4f6e4ccab8a..2ccfc7e03c6 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/combiners.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/combiners.py @@ -60,7 +60,7 @@ def make_twobody( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > asumpt_min, (F.CHILD(1, F.PT) * F.CHILD(2, F.PT)) > ptproduct_min, - F.DOCA(1, 2) < adoca12_max) + F.SDOCA(1, 2) < adoca12_max) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, @@ -139,16 +139,16 @@ def make_threebody(particles, Remaining parameters define thresholds for the selection. """ if adoca12_max is not None: - combination12_code = F.DOCA(1, 2) < adoca12_max + combination12_code = F.SDOCA(1, 2) < adoca12_max else: combination12_code = F.ALL combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > asumpt_min) if adoca13_max is not None: - combination_code &= F.DOCA(1, 3) < adoca13_max + combination_code &= F.SDOCA(1, 3) < adoca13_max if adoca23_max is not None: - combination_code &= F.DOCA(2, 3) < adoca23_max + combination_code &= F.SDOCA(2, 3) < adoca23_max pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min, @@ -197,18 +197,18 @@ def make_fourbody(particles, Primary vertex maker function. Remaining parameters define thresholds for the selection. """ - combination12_code = F.DOCA(1, 2) < adoca12_max + combination12_code = F.SDOCA(1, 2) < adoca12_max combination123_code = F.require_all( - F.DOCA(1, 3) < adoca13_max, - F.DOCA(2, 3) < adoca23_max) + F.SDOCA(1, 3) < adoca13_max, + F.SDOCA(2, 3) < adoca23_max) combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.PT > asumpt_min) if adoca14_max is not None: - combination_code &= F.DOCA(1, 4) < adoca14_max + combination_code &= F.SDOCA(1, 4) < adoca14_max if adoca24_max is not None: - combination_code &= F.DOCA(2, 4) < adoca24_max + combination_code &= F.SDOCA(2, 4) < adoca24_max if adoca34_max is not None: - combination_code &= F.DOCA(3, 4) < adoca34_max + combination_code &= F.SDOCA(3, 4) < adoca34_max pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_ph0_btag.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_ph0_btag.py index 1e12b188832..1bfc4c327ce 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_ph0_btag.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_ph0_btag.py @@ -460,7 +460,7 @@ def make_lc_to_lambdaetapi(lambdas, F.SUM(F.PT) > comb_sum_pt_min, F.P > comb_p_min, in_range(comb_m_min, F.MASS, comb_m_max), - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), ), CompositeCut=F.require_all( F.P > p_min, @@ -518,7 +518,7 @@ def make_lb_to_lcpi(lcs, F.P > comb_p_min, F.SUM(F.PT) > comb_sum_pt_min, in_range(comb_m_min, F.MASS, comb_m_max), - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), ), CompositeCut=F.require_all( F.PT > pt_min, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_phh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_phh.py index 3e645b8ad5f..3f2e838965d 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_phh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_phh.py @@ -135,7 +135,7 @@ def combine_phi_kk( """Make phi(1020) -> K- K+ from long tracks.""" kaons = filter_long_kaons_from_strange(pvs) comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXSDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), @@ -180,7 +180,7 @@ def combine_lc_phh(protons, Cuts generally based on Run2 Turbo lines. """ comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXSDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), @@ -227,7 +227,7 @@ def combine_lc_phip(phis, Cuts generally based on Run2 Turbo lines. """ comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXSDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_pk.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_pk.py index 5712f7e47e0..656f6686888 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_pk.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_pk.py @@ -112,7 +112,7 @@ def combine_xic_pk(protons, Cuts generally based on Run2 Turbo lines. """ comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXSDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), @@ -159,7 +159,7 @@ def combine_xib( ): """Combiner for Xic0/Oc0 and pion/kaon to create Xib/Omegab.""" comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXSDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_sl.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_sl.py index 3b8d872ddce..7e51f84cd3e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_sl.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_sl.py @@ -309,7 +309,7 @@ def make_lambdall(): name='Charm_CBaryonToSl_make_lambdall_{hash}', CombinationCut=F.require_all( F.MASS < 1160 * MeV, - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), F.MAXSDOCACHI2CUT(16.), F.SUM(F.PT) > 500 * MeV, ), @@ -333,7 +333,7 @@ def make_lambdadd(): name='Charm_CBaryonToSl_make_lambdadd_{hash}', CombinationCut=F.require_all( F.MASS < 1180 * MeV, - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), F.MAXSDOCACHI2CUT(16.), F.SUM(F.PT) > 500 * MeV, ), @@ -360,7 +360,7 @@ def make_xim_to_lambdapi(lambdas, pions, ll=True): name='Charm_CBaryonToSl_make_xim_to_lambdapi_{hash}', CombinationCut=F.require_all( in_range(1242 * MeV, F.MASS, 1402 * MeV), - F.MAXDOCACUT((0.2 if ll else 2) * mm), + F.MAXSDOCACUT((0.2 if ll else 2) * mm), F.SUM(F.PT) > 500 * MeV, ), CompositeCut=composite_cut, @@ -381,7 +381,7 @@ def make_omegam_to_lambdak(lambdas, kaons, ll=True): name='Charm_CBaryonToSl_make_omegam_to_lambdak_{hash}', CombinationCut=F.require_all( in_range(1592 * MeV, F.MASS, 1752 * MeV), - F.MAXDOCACUT((0.2 if ll else 2) * mm), + F.MAXSDOCACUT((0.2 if ll else 2) * mm), F.SUM(F.PT) > 500 * MeV, ), CompositeCut=composite_cut, @@ -516,7 +516,7 @@ def make_lambdacpxicp_to_lambdamu_ll_from_beauty(decay_descriptor, Mmax): F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, in_range(1200 * MeV, F.MASS, Mmax * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 16 * GeV, @@ -544,7 +544,7 @@ def make_lambdacpxicp_to_lambdapi_ll_from_beauty(Mmin, Mmax): F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, in_range(Mmin * MeV, F.MASS, Mmax * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 16 * GeV, @@ -572,7 +572,7 @@ def make_lambdacpxicp_to_lambdamu_dd_from_beauty(decay_descriptor, Mmax): F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, in_range(1200 * MeV, F.MASS, Mmax * MeV), - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), ), CompositeCut=F.require_all( F.P > 16 * GeV, @@ -599,7 +599,7 @@ def make_lambdacpxicp_to_lambdapi_dd_from_beauty(Mmin, Mmax): F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, in_range(Mmin * MeV, F.MASS, Mmax * MeV), - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), ), CompositeCut=F.require_all( F.P > 16 * GeV, @@ -626,12 +626,12 @@ def make_xic0_to_lambda0pillmu_from_beauty(): [lambdas, pions, muons], DecayDescriptor="[Xi_c0 -> Lambda0 pi- mu+]cc", name="Charm_CBaryonToSl_Xic0ToL0piLLMuFromBeauty", - Combination12Cut=F.require_all(F.MAXDOCACUT(0.15 * mm), ), + Combination12Cut=F.require_all(F.MAXSDOCACUT(0.15 * mm), ), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), in_range(1500 * MeV, F.MASS, 2600 * MeV), ), CompositeCut=F.require_all( @@ -654,13 +654,13 @@ def make_xic0_to_lambda0piddmu_from_beauty(): [lambdas, pions, muons], DecayDescriptor="[Xi_c0 -> Lambda0 pi- mu+]cc", name="Charm_CBaryonToSl_Xic0ToL0piDDMuFromBeauty", - Combination12Cut=F.require_all(F.MAXDOCACUT(0.15 * mm), ), + Combination12Cut=F.require_all(F.MAXSDOCACUT(0.15 * mm), ), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -682,13 +682,13 @@ def make_xic0_to_lambda0kllmu_from_beauty(): [lambdas, kaons, muons], DecayDescriptor="[Xi_c0 -> Lambda0 K- mu+]cc", name="Charm_CBaryonToSl_Xic0ToL0KLLMuFromBeauty", - Combination12Cut=F.require_all(F.MAXDOCACUT(0.15 * mm), ), + Combination12Cut=F.require_all(F.MAXSDOCACUT(0.15 * mm), ), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1700 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -710,13 +710,13 @@ def make_xic0_to_lambda0kddmu_from_beauty(): [lambdas, kaons, muons], DecayDescriptor="[Xi_c0 -> Lambda0 K- mu+]cc", name="Charm_CBaryonToSl_Xic0ToL0KDDMuFromBeauty", - Combination12Cut=F.require_all(F.MAXDOCACUT(0.15 * mm), ), + Combination12Cut=F.require_all(F.MAXSDOCACUT(0.15 * mm), ), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -744,7 +744,7 @@ def make_xic0omegac0_to_ximlllmu_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -772,7 +772,7 @@ def make_xic0omegac0_to_ximddlmu_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.3 * mm), + F.MAXSDOCACUT(0.3 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -800,7 +800,7 @@ def make_xic0omegac0_to_ximdddmu_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.3 * mm), + F.MAXSDOCACUT(0.3 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -828,7 +828,7 @@ def make_omegac0_to_omegamlllmu_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1800 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -856,7 +856,7 @@ def make_omegac0_to_omegamddlmu_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.3 * mm), + F.MAXSDOCACUT(0.3 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -884,7 +884,7 @@ def make_omegac0_to_omegamdddmu_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.3 * mm), + F.MAXSDOCACUT(0.3 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -910,13 +910,13 @@ def make_xic0_to_lambda0pillpi_from_beauty(): [lambdas, pions, pions], DecayDescriptor="[Xi_c0 -> Lambda0 pi- pi+]cc", name="Charm_CBaryonToSl_Xic0ToL0piLLPiFromBeauty", - Combination12Cut=F.MAXDOCACUT(0.15 * mm), + Combination12Cut=F.MAXSDOCACUT(0.15 * mm), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -937,13 +937,13 @@ def make_xic0_to_lambda0piddpi_from_beauty(): [lambdas, pions, pions], DecayDescriptor="[Xi_c0 -> Lambda0 pi- pi+]cc", name="Charm_CBaryonToSl_Xic0ToL0piDDPiFromBeauty", - Combination12Cut=F.MAXDOCACUT(0.15 * mm), + Combination12Cut=F.MAXSDOCACUT(0.15 * mm), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -965,13 +965,13 @@ def make_xic0_to_lambda0kllpi_from_beauty(): [lambdas, kaons, pions], DecayDescriptor="[Xi_c0 -> Lambda0 K- pi+]cc", name="Charm_CBaryonToSl_Xic0ToL0KLLPiFromBeauty", - Combination12Cut=F.MAXDOCACUT(0.15 * mm), + Combination12Cut=F.MAXSDOCACUT(0.15 * mm), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -993,13 +993,13 @@ def make_xic0_to_lambda0kddpi_from_beauty(): [lambdas, kaons, pions], DecayDescriptor="[Xi_c0 -> Lambda0 K- pi+]cc", name="Charm_CBaryonToSl_Xic0ToL0KDDPiFromBeauty", - Combination12Cut=F.MAXDOCACUT(0.15 * mm), + Combination12Cut=F.MAXSDOCACUT(0.15 * mm), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1027,7 +1027,7 @@ def make_xic0omegac0_to_ximlllpi_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1055,7 +1055,7 @@ def make_xic0omegac0_to_ximddlpi_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1083,7 +1083,7 @@ def make_xic0omegac0_to_ximdddpi_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1111,7 +1111,7 @@ def make_omegac0_to_omegamlllpi_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1139,7 +1139,7 @@ def make_omegac0_to_omegamddlpi_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.3 * mm), + F.MAXSDOCACUT(0.3 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1167,7 +1167,7 @@ def make_omegac0_to_omegamdddpi_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.3 * mm), + F.MAXSDOCACUT(0.3 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1194,13 +1194,13 @@ def make_xic0_to_lambda0pillmu_ws_from_beauty(): [lambdas, pions, muons], DecayDescriptor="[Xi_c0 -> Lambda0 pi- mu-]cc", name="Charm_CBaryonToSl_Xic0ToL0piLLMuWSFromBeauty", - Combination12Cut=F.MAXDOCACUT(0.15 * mm), + Combination12Cut=F.MAXSDOCACUT(0.15 * mm), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1222,13 +1222,13 @@ def make_xic0_to_lambda0piddmu_ws_from_beauty(): [lambdas, pions, muons], DecayDescriptor="[Xi_c0 -> Lambda0 pi- mu-]cc", name="Charm_CBaryonToSl_Xic0ToL0piDDMuWSFromBeauty", - Combination12Cut=F.MAXDOCACUT(0.15 * mm), + Combination12Cut=F.MAXSDOCACUT(0.15 * mm), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1250,13 +1250,13 @@ def make_xic0_to_lambda0kllmu_ws_from_beauty(): [lambdas, kaons, muons], DecayDescriptor="[Xi_c0 -> Lambda0 K- mu-]cc", name="Charm_CBaryonToSl_Xic0ToL0KLLMuWSFromBeauty", - Combination12Cut=F.MAXDOCACUT(0.15 * mm), + Combination12Cut=F.MAXSDOCACUT(0.15 * mm), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 16 * GeV, @@ -1278,13 +1278,13 @@ def make_xic0_to_lambda0kddmu_ws_from_beauty(): [lambdas, kaons, muons], DecayDescriptor="[Xi_c0 -> Lambda0 K- mu-]cc", name="Charm_CBaryonToSl_Xic0ToL0KDDMuWSFromBeauty", - Combination12Cut=F.MAXDOCACUT(0.15 * mm), + Combination12Cut=F.MAXSDOCACUT(0.15 * mm), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 16 * GeV, @@ -1312,7 +1312,7 @@ def make_xic0omegac0_to_ximlllmu_ws_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1340,7 +1340,7 @@ def make_xic0omegac0_to_ximddlmu_ws_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1368,7 +1368,7 @@ def make_xic0omegac0_to_ximdddmu_ws_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1396,7 +1396,7 @@ def make_omegac0_to_omegamlllmu_ws_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1424,7 +1424,7 @@ def make_omegac0_to_omegamddlmu_ws_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.3 * mm), + F.MAXSDOCACUT(0.3 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1452,7 +1452,7 @@ def make_omegac0_to_omegamdddmu_ws_from_beauty(): F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, in_range(1500 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(0.3 * mm), + F.MAXSDOCACUT(0.3 * mm), ), CompositeCut=F.require_all( F.P > 20 * GeV, @@ -1487,7 +1487,7 @@ def lambdacpxicp_to_lambda0llmu_line(name="Hlt2Charm_LcpXicpToL0MupNu_LL", F.PT > 1 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.P > 16 * GeV, @@ -1519,7 +1519,7 @@ def lambdacpxicp_to_lambda0ddmu_line(name="Hlt2Charm_LcpXicpToL0MupNu_DD", F.PT > 1 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), ), CompositeCut=F.require_all( F.P > 16 * GeV, @@ -1550,7 +1550,7 @@ def lambdacp_to_pkmu_line(name="Hlt2Charm_LcpXicpToPpKmMupNu", prescale=1): F.PT > 1 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, - F.MAXDOCACUT(0.15 * mm), + F.MAXSDOCACUT(0.15 * mm), ), CompositeCut=F.require_all( F.P > 16 * GeV, @@ -1610,7 +1610,7 @@ def omegac0_to_omegamlllmu_line(name="Hlt2Charm_Oc0ToOmMupNu_LLL", prescale=1): F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.BPVCORRM(pvs) < 3 * GeV, @@ -1643,7 +1643,7 @@ def omegac0_to_omegamddlmu_line(name="Hlt2Charm_Oc0ToOmMupNu_DDL", prescale=1): F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, - F.MAXDOCACUT(0.3 * mm), + F.MAXSDOCACUT(0.3 * mm), ), CompositeCut=F.require_all( F.BPVCORRM(pvs) < 3 * GeV, @@ -1676,7 +1676,7 @@ def omegac0_to_omegamdddmu_line(name="Hlt2Charm_Oc0ToOmMupNu_DDD", prescale=1): F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.BPVCORRM(pvs) < 3 * GeV, @@ -1710,7 +1710,7 @@ def xic0omegac0_to_ximlllmu_line(name="Hlt2Charm_Xic0Oc0ToXimMupNu_LLL", F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.BPVCORRM(pvs) < 3 * GeV, @@ -1744,7 +1744,7 @@ def xic0omegac0_to_ximddlmu_line(name="Hlt2Charm_Xic0Oc0ToXimMupNu_DDL", F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, - F.MAXDOCACUT(0.3 * mm), + F.MAXSDOCACUT(0.3 * mm), ), CompositeCut=F.require_all( F.BPVCORRM(pvs) < 3 * GeV, @@ -1775,12 +1775,12 @@ def xicp_to_ximlllpipmu_line(name="Hlt2Charm_XicpToXimPipMupNu_LLL", [xim, pions, muons], DecayDescriptor="[Xi_c+ -> Xi- pi+ mu+]cc", name="Charm_CBaryonToSl_XicpToXimLLLPipMu", - Combination12Cut=F.MAXDOCACUT(0.2 * mm, ), + Combination12Cut=F.MAXSDOCACUT(0.2 * mm, ), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.BPVCORRM(pvs) < 2.8 * GeV, @@ -1811,12 +1811,12 @@ def xicp_to_ximddlpipmu_line(name="Hlt2Charm_XicpToXimPipMupNu_DDL", [xim, pions, muons], DecayDescriptor="[Xi_c+ -> Xi- pi+ mu+ ]cc", name="Charm_CBaryonToSl_XicpToXimDDLPipMu", - Combination12Cut=F.MAXDOCACUT(0.25 * mm, ), + Combination12Cut=F.MAXSDOCACUT(0.25 * mm, ), CombinationCut=F.require_all( F.PT > 1.2 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, - F.MAXDOCACUT(0.25 * mm), + F.MAXSDOCACUT(0.25 * mm), ), CompositeCut=F.require_all( F.BPVCORRM(pvs) < 2.8 * GeV, @@ -1845,12 +1845,12 @@ def xic0_to_lambda0llkmmu_line(name="Hlt2Charm_Xic0Oc0ToL0KmMupNu_LL", [lambdas, kaons, muons], DecayDescriptor="[Xi_c0 -> Lambda0 K- mu+]cc", name="Charm_CBaryonToSl_Xic0ToLmdLLKMu", - Combination12Cut=F.MAXDOCACUT(0.2 * mm, ), + Combination12Cut=F.MAXSDOCACUT(0.2 * mm, ), CombinationCut=F.require_all( F.PT > 1.6 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ), CompositeCut=F.require_all( F.BPVCORRM(pvs) < 3 * GeV, @@ -1879,12 +1879,12 @@ def xic0_to_lambda0ddkmmu_line(name="Hlt2Charm_Xic0Oc0ToL0KmMupNu_DD", [lambdas, muons, kaons], DecayDescriptor="[Xi_c0 -> Lambda0 mu+ K-]cc", name="Charm_CBaryonToSl_Xic0ToLmdDDKMu", - Combination12Cut=F.MAXDOCACUT(2 * mm, ), + Combination12Cut=F.MAXSDOCACUT(2 * mm, ), CombinationCut=F.require_all( F.PT > 1.8 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2.2 * GeV, - F.DOCA(1, 3) < 2 * mm, + F.SDOCA(1, 3) < 2 * mm, F.SDOCA(2, 3) < 0.3 * mm, # for faster calculation, use SDOCA when L0, KS are not involved ), @@ -1918,7 +1918,7 @@ def lb0_to_lambdacppippimpim_lambdacpkmmu_line( in_range(4000 * MeV, F.MASS, 6200 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -1950,7 +1950,7 @@ def lb0_to_lambdacppimpimpip_lambdacpkmpip_line( in_range(5400 * MeV, F.MASS, 6000 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -1982,7 +1982,7 @@ def lb0_to_lambdacppimpimpip_lambdacpkmmu_ws_line( in_range(4000 * MeV, F.MASS, 6200 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2013,7 +2013,7 @@ def lb0_to_lambdacppimpimpim_ws_lambdacpkmmu_line( in_range(4000 * MeV, F.MASS, 6200 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2045,7 +2045,7 @@ def lb0_to_lambdacppimpimpip_lambdacppimmu_line( in_range(3600 * MeV, F.MASS, 6100 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 30 * GeV, @@ -2077,7 +2077,7 @@ def lb0_to_lambdacppimpimpip_lambdacppimpip_line( in_range(5400 * MeV, F.MASS, 6000 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 30 * GeV, @@ -2110,7 +2110,7 @@ def lb0_to_lambdacppimpimpip_lambdacppimmu_ws_line( in_range(3600 * MeV, F.MASS, 6100 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2142,7 +2142,7 @@ def lb0_to_lambdacppimpimpim_ws_lambdacppimmu_line( in_range(3600 * MeV, F.MASS, 6100 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2174,7 +2174,7 @@ def Xibm_to_Xic0pippimpim_Xic0L0Pimmu_ll_line( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2207,7 +2207,7 @@ def lb0_to_lambdacppimpimpip_lambdaclambdamu_ll_line( in_range(3600 * MeV, F.MASS, 6200 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2239,7 +2239,7 @@ def Xibm_to_Xic0pippimpim_Xic0L0Pimmu_dd_line( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2271,7 +2271,7 @@ def lb0_to_lambdacppimpimpip_lambdaclambdapip_ll_line( in_range(5400 * MeV, F.MASS, 6000 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2303,7 +2303,7 @@ def Xibm_to_Xic0pippimpim_Xic0L0Kmmu_ll_line( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2336,7 +2336,7 @@ def lb0_to_lambdacppimpimpip_lambdaclambdamu_ll_ws_line( in_range(3600 * MeV, F.MASS, 6200 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2369,7 +2369,7 @@ def lb0_to_lambdacppimpimpim_ws_lambdaclambdamu_ll_line( in_range(3600 * MeV, F.MASS, 6200 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2401,7 +2401,7 @@ def Xibm_to_Xic0pippimpim_Xic0L0Kmmu_dd_line( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2434,7 +2434,7 @@ def lb0_to_lambdacppimpimpip_lambdaclambdamu_dd_line( in_range(3600 * MeV, F.MASS, 6200 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2466,7 +2466,7 @@ def lb0_to_lambdacppimpimpip_lambdaclambdapip_dd_line( in_range(5400 * MeV, F.MASS, 6000 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2498,7 +2498,7 @@ def Xibm_to_Xic0pippimpim_Xic0Ximmu_lll_line( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2531,7 +2531,7 @@ def lb0_to_lambdacppimpimpip_lambdaclambdamu_dd_ws_line( in_range(3600 * MeV, F.MASS, 6200 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2564,7 +2564,7 @@ def lb0_to_lambdacppimpimpim_ws_lambdaclambdamu_dd_line( in_range(3600 * MeV, F.MASS, 6200 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2597,7 +2597,7 @@ def xib0_to_xicppimpimpip_xicplambdamu_ll_line( in_range(3600 * MeV, F.MASS, 6350 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2629,7 +2629,7 @@ def Xibm_to_Xic0pippimpim_Xic0Ximmu_ddl_line( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2661,7 +2661,7 @@ def xib0_to_xicppimpimpip_xicplambdapip_ll_line( in_range(5650 * MeV, F.MASS, 6200 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2693,7 +2693,7 @@ def Xibm_to_Xic0pippimpim_Xic0Ximmu_ddd_line( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2726,7 +2726,7 @@ def xib0_to_xicppimpimpip_xicplambdamu_ll_ws_line( in_range(3600 * MeV, F.MASS, 6350 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2759,7 +2759,7 @@ def xib0_to_xicppimpimpim_ws_xicplambdamu_ll_line( in_range(3600 * MeV, F.MASS, 6350 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2791,7 +2791,7 @@ def Obm_to_Oc0pippimpim_Oc0Ximmu_lll_line( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2824,7 +2824,7 @@ def xib0_to_xicppimpimpip_xicplambdamu_dd_line( in_range(3600 * MeV, F.MASS, 6350 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2856,7 +2856,7 @@ def xib0_to_xicppimpimpip_xicplambdapip_dd_line( in_range(5650 * MeV, F.MASS, 6200 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2888,7 +2888,7 @@ def Obm_to_Oc0pippimpim_Oc0Ximmu_ddl_line( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2921,7 +2921,7 @@ def xib0_to_xicppimpimpip_xicplambdamu_dd_ws_line( in_range(3600 * MeV, F.MASS, 6350 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2953,7 +2953,7 @@ def Obm_to_Oc0pippimpim_Oc0Ximmu_ddd_line( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -2986,7 +2986,7 @@ def xib0_to_xicppimpimpim_ws_xicplambdamu_dd_line( in_range(3600 * MeV, F.MASS, 6350 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3018,7 +3018,7 @@ def Obm_to_Oc0pippimpim_Oc0Ommu_lll_line( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3050,7 +3050,7 @@ def Obm_to_Oc0pippimpim_Oc0Ommu_ddl_line( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3082,7 +3082,7 @@ def Obm_to_Oc0pippimpim_Oc0Ommu_ddd_line( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3117,7 +3117,7 @@ def Xibm_to_Xic0pippimpim_Xic0L0PimPip_ll_line( in_range(5500 * MeV, F.MASS, 6100 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3149,7 +3149,7 @@ def Xibm_to_Xic0pippimpim_Xic0L0PimPip_dd_line( in_range(5500 * MeV, F.MASS, 6100 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3181,7 +3181,7 @@ def Xibm_to_Xic0pippimpim_Xic0L0Kmpi_ll_line( in_range(5500 * MeV, F.MASS, 6100 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3213,7 +3213,7 @@ def Xibm_to_Xic0pippimpim_Xic0L0Kmpi_dd_line( in_range(5500 * MeV, F.MASS, 6100 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3245,7 +3245,7 @@ def Xibm_to_Xic0pippimpim_Xic0Ximpi_lll_line( in_range(5500 * MeV, F.MASS, 6100 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3277,7 +3277,7 @@ def Xibm_to_Xic0pippimpim_Xic0Ximpi_ddl_line( in_range(5500 * MeV, F.MASS, 6100 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3309,7 +3309,7 @@ def Xibm_to_Xic0pippimpim_Xic0Ximpi_ddd_line( in_range(5500 * MeV, F.MASS, 6100 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3341,7 +3341,7 @@ def Obm_to_Oc0pippimpim_Oc0Ximpi_lll_line( in_range(5600 * MeV, F.MASS, 6250 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3373,7 +3373,7 @@ def Obm_to_Oc0pippimpim_Oc0Ximpi_ddl_line( in_range(5600 * MeV, F.MASS, 6250 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3405,7 +3405,7 @@ def Obm_to_Oc0pippimpim_Oc0Ximpi_ddd_line( in_range(5600 * MeV, F.MASS, 6250 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3437,7 +3437,7 @@ def Obm_to_Oc0pippimpim_Oc0Ompi_lll_line( in_range(5600 * MeV, F.MASS, 6250 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3469,7 +3469,7 @@ def Obm_to_Oc0pippimpim_Oc0Ompi_ddl_line( in_range(5600 * MeV, F.MASS, 6250 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3501,7 +3501,7 @@ def Obm_to_Oc0pippimpim_Oc0Ompi_ddd_line( in_range(5600 * MeV, F.MASS, 6250 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3539,7 +3539,7 @@ def Xibm_to_Xic0pippimpim_Xic0L0Pimmum_ll_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3572,7 +3572,7 @@ def Xibm_to_Xic0pippimpim_Xic0L0Pimmum_dd_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3605,7 +3605,7 @@ def Xibm_to_Xic0pippimpim_Xic0L0Kmmum_ll_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3638,7 +3638,7 @@ def Xibm_to_Xic0pippimpim_Xic0L0Kmmum_dd_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3671,7 +3671,7 @@ def Xibm_to_Xic0pimpimpim_Xic0L0Pimmu_ll_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3704,7 +3704,7 @@ def Xibm_to_Xic0pimpimpim_Xic0L0Pimmu_dd_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3737,7 +3737,7 @@ def Xibm_to_Xic0pimpimpim_Xic0L0Kmmu_ll_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3770,7 +3770,7 @@ def Xibm_to_Xic0pimpimpim_Xic0L0Kmmu_dd_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3803,7 +3803,7 @@ def Xibm_to_Xic0pippimpim_Xic0Ximmum_lll_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3836,7 +3836,7 @@ def Xibm_to_Xic0pippimpim_Xic0Ximmum_ddl_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3869,7 +3869,7 @@ def Xibm_to_Xic0pippimpim_Xic0Ximmum_ddd_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3902,7 +3902,7 @@ def Xibm_to_Xic0pimpimpim_Xic0Ximmu_lll_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3935,7 +3935,7 @@ def Xibm_to_Xic0pimpimpim_Xic0Ximmu_ddl_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -3968,7 +3968,7 @@ def Xibm_to_Xic0pimpimpim_Xic0Ximmu_ddd_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -4000,7 +4000,7 @@ def Obm_to_Oc0pippimpim_Oc0Ximmum_lll_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -4032,7 +4032,7 @@ def Obm_to_Oc0pippimpim_Oc0Ximmum_ddl_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -4064,7 +4064,7 @@ def Obm_to_Oc0pippimpim_Oc0Ximmum_ddd_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -4096,7 +4096,7 @@ def Obm_to_Oc0pippimpim_Oc0Ommum_lll_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -4128,7 +4128,7 @@ def Obm_to_Oc0pippimpim_Oc0Ommum_ddl_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -4160,7 +4160,7 @@ def Obm_to_Oc0pippimpim_Oc0Ommum_ddd_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -4192,7 +4192,7 @@ def Obm_to_Oc0pimpimpim_Oc0Ximmu_lll_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -4224,7 +4224,7 @@ def Obm_to_Oc0pimpimpim_Oc0Ximmu_ddl_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -4256,7 +4256,7 @@ def Obm_to_Oc0pimpimpim_Oc0Ximmu_ddd_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -4288,7 +4288,7 @@ def Obm_to_Oc0pimpimpim_Oc0Ommu_lll_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -4320,7 +4320,7 @@ def Obm_to_Oc0pimpimpim_Oc0Ommu_ddl_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, @@ -4352,7 +4352,7 @@ def Obm_to_Oc0pimpimpim_Oc0Ommu_ddd_wsline( in_range(4000 * MeV, F.MASS, 6500 * MeV), F.SDOCA(2, 4) < 0.3 * mm, F.SDOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(2 * mm)), + F.MAXSDOCACUT(2 * mm)), CompositeCut=F.require_all( F.PT > 2.0 * GeV, F.P > 22 * GeV, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_hadronic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_hadronic.py index d8bb2386f1a..61cda5a902b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_hadronic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_hadronic.py @@ -182,7 +182,7 @@ def _make_hc_twobody(particles, """ comb_cut = F.require_all( in_range(am_min, F.MASS, am_max), F.PT > pt_min, - F.MAXDOCACUT(doca_max)) + F.MAXSDOCACUT(doca_max)) pvs = make_pvs() vtx_cut = F.require_all( in_range(m_min, F.MASS, m_max), F.CHI2DOF < chi2dof_max, @@ -219,7 +219,7 @@ def _make_hc_threebody(particles, """ Make three-body charmed hadron decays. """ - comb12_cut = F.require_all(F.MASS < am_max, F.DOCA(1, 2) < doca12_max) + comb12_cut = F.require_all(F.MASS < am_max, F.SDOCA(1, 2) < doca12_max) pvs = make_pvs() comb_cut = F.require_all( in_range(am_min, F.MASS, am_max), @@ -228,8 +228,8 @@ def _make_hc_threebody(particles, F.SUM(F.PT > trk_2of3_pt_min) >= 2, F.SUM(F.MINIPCHI2(pvs) > trk_1of3_ipchi2_min) >= 1, F.SUM(F.MINIPCHI2(pvs) > trk_2of3_ipchi2_min) >= 2, - F.DOCA(1, 3) < doca13_max, - F.DOCA(2, 3) < doca23_max) + F.SDOCA(1, 3) < doca13_max, + F.SDOCA(2, 3) < doca23_max) vtx_cut = F.require_all(*[ in_range(m_min, F.MASS, m_max), F.CHI2DOF < chi2dof_max, @@ -273,10 +273,10 @@ def _make_hc_fourbody(particles, """ Make four-body charmed hadron decays. """ - comb12_cut = F.require_all(F.MASS < am_max, F.DOCA(1, 2) < doca12_max) + comb12_cut = F.require_all(F.MASS < am_max, F.SDOCA(1, 2) < doca12_max) comb123_cut = F.require_all(F.MASS < am_max, - F.DOCA(1, 3) < doca13_max, - F.DOCA(2, 3) < doca23_max) + F.SDOCA(1, 3) < doca13_max, + F.SDOCA(2, 3) < doca23_max) pvs = make_pvs() comb_cut = F.require_all( in_range(am_min, F.MASS, am_max), @@ -285,9 +285,9 @@ def _make_hc_fourbody(particles, F.SUM(F.PT > trk_2of4_pt_min) >= 2, F.SUM(F.MINIPCHI2(pvs) > trk_1of4_ipchi2_min) >= 1, F.SUM(F.MINIPCHI2(pvs) > trk_2of4_ipchi2_min) >= 2, - F.DOCA(1, 4) < doca14_max, - F.DOCA(2, 4) < doca24_max, - F.DOCA(3, 4) < doca34_max, + F.SDOCA(1, 4) < doca14_max, + F.SDOCA(2, 4) < doca24_max, + F.SDOCA(3, 4) < doca34_max, ) vtx_cut = F.require_all( in_range(m_min, F.MASS, m_max), F.CHI2DOF < chi2dof_max, @@ -481,7 +481,7 @@ def _make_xicc_twobody( """ comb_cut = F.require_all( in_range(am_min, F.MASS, am_max), F.PT > pt_min, - F.MAXDOCACUT(doca_max), F.MAXSDOCACHI2CUT(docachi2_max)) + F.MAXSDOCACUT(doca_max), F.MAXSDOCACHI2CUT(docachi2_max)) pvs = make_pvs() vtx_cut = F.require_all( in_range(m_min, F.MASS, m_max), @@ -521,19 +521,19 @@ def _make_xicc_threebody( Make three-body doubly charmed hadron decays. """ comb12_cut = F.require_all(F.MASS < am_max, - F.DOCA(1, 2) < doca_12_max, - F.DOCACHI2(1, 2) < docachi2_12_max) + F.SDOCA(1, 2) < doca_12_max, + F.SDOCACHI2(1, 2) < docachi2_12_max) comb_cut = F.require_all( in_range(am_min, F.MASS, am_max), F.PT > pt_min, F.require_any( F.CHILD(2, F.PT) > trk_1of2_pt_min, F.CHILD(3, F.PT) > trk_1of2_pt_min), - F.DOCA(1, 3) < doca_13_max, - F.DOCA(1, 3) < doca_13_max, - F.DOCA(2, 3) < doca_23_max, - F.DOCACHI2(1, 3) < docachi2_13_max, - F.DOCACHI2(1, 3) < docachi2_13_max, - F.DOCACHI2(2, 3) < docachi2_23_max) + F.SDOCA(1, 3) < doca_13_max, + F.SDOCA(1, 3) < doca_13_max, + F.SDOCA(2, 3) < doca_23_max, + F.SDOCACHI2(1, 3) < docachi2_13_max, + F.SDOCACHI2(1, 3) < docachi2_13_max, + F.SDOCACHI2(2, 3) < docachi2_23_max) pvs = make_pvs() vtx_cut = F.require_all( in_range(m_min, F.MASS, m_max), @@ -581,14 +581,14 @@ def _make_xicc_fourbody( Make four-body doubly charmed hadron decays. """ comb12_cut = F.require_all(F.MASS < am_max, - F.DOCA(1, 2) < doca_12_max, - F.DOCACHI2(1, 2) < docachi2_12_max) + F.SDOCA(1, 2) < doca_12_max, + F.SDOCACHI2(1, 2) < docachi2_12_max) comb123_cut = F.require_all( F.MASS < am_max, - F.DOCA(1, 3) < doca_13_max, - F.DOCA(2, 3) < doca_23_max, - F.DOCACHI2(1, 3) < docachi2_13_max, - F.DOCACHI2(2, 3) < docachi2_23_max, + F.SDOCA(1, 3) < doca_13_max, + F.SDOCA(2, 3) < doca_23_max, + F.SDOCACHI2(1, 3) < docachi2_13_max, + F.SDOCACHI2(2, 3) < docachi2_23_max, F.require_any( F.CHILD(2, F.PT) > trk_2of3_pt_min, F.CHILD(3, F.PT) > trk_2of3_pt_min)) @@ -604,12 +604,12 @@ def _make_xicc_fourbody( F.require_any( F.CHILD(3, F.PT) > trk_2of3_pt_min, F.CHILD(4, F.PT) > trk_2of3_pt_min), - F.DOCA(1, 4) < doca_14_max, - F.DOCA(2, 4) < doca_24_max, - F.DOCA(3, 4) < doca_34_max, - F.DOCACHI2(1, 4) < docachi2_14_max, - F.DOCACHI2(2, 4) < docachi2_24_max, - F.DOCACHI2(3, 4) < docachi2_34_max) + F.SDOCA(1, 4) < doca_14_max, + F.SDOCA(2, 4) < doca_24_max, + F.SDOCA(3, 4) < doca_34_max, + F.SDOCACHI2(1, 4) < docachi2_14_max, + F.SDOCACHI2(2, 4) < docachi2_24_max, + F.SDOCACHI2(3, 4) < docachi2_34_max) pvs = make_pvs() vtx_cut = F.require_all( in_range(m_min, F.MASS, m_max), @@ -652,14 +652,14 @@ def _make_pseudo_fourbody(particles, chi2dof_max=60.0): """Make pseudo particles from Xicc decay.""" comb12_cut = F.require_all(F.MASS < am_max, - F.DOCA(1, 2) < doca_12_max, - F.DOCACHI2(1, 2) < docachi2_12_max) + F.SDOCA(1, 2) < doca_12_max, + F.SDOCACHI2(1, 2) < docachi2_12_max) comb123_cut = F.require_all( F.MASS < am_max, - F.DOCA(1, 3) < doca_13_max, - F.DOCA(2, 3) < doca_23_max, - F.DOCACHI2(1, 3) < docachi2_13_max, - F.DOCACHI2(2, 3) < docachi2_23_max, + F.SDOCA(1, 3) < doca_13_max, + F.SDOCA(2, 3) < doca_23_max, + F.SDOCACHI2(1, 3) < docachi2_13_max, + F.SDOCACHI2(2, 3) < docachi2_23_max, F.require_any( F.CHILD(2, F.PT) > trk_3of4_pt_min, F.CHILD(3, F.PT) > trk_3of4_pt_min)) @@ -667,12 +667,12 @@ def _make_pseudo_fourbody(particles, F.SUM(F.PT > trk_1of4_pt_min) >= 1, F.SUM(F.PT > trk_2of4_pt_min) >= 2, F.SUM(F.PT > trk_3of4_pt_min) >= 3, - F.DOCA(1, 4) < doca_14_max, - F.DOCA(2, 4) < doca_24_max, - F.DOCA(3, 4) < doca_34_max, - F.DOCACHI2(1, 4) < docachi2_14_max, - F.DOCACHI2(2, 4) < docachi2_24_max, - F.DOCACHI2(3, 4) < docachi2_34_max) + F.SDOCA(1, 4) < doca_14_max, + F.SDOCA(2, 4) < doca_24_max, + F.SDOCA(3, 4) < doca_34_max, + F.SDOCACHI2(1, 4) < docachi2_14_max, + F.SDOCACHI2(2, 4) < docachi2_24_max, + F.SDOCACHI2(3, 4) < docachi2_34_max) vtx_cut = F.CHI2DOF < chi2dof_max return ParticleCombiner( particles, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_cbaryon_sl.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_cbaryon_sl.py index 187a99a58ff..79c783a91a1 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_cbaryon_sl.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_cbaryon_sl.py @@ -112,10 +112,10 @@ def make_lc_to_pkpi(protons, kaons, pions): """Return a Lambda_c+ -> p K- pi+ decay maker.""" pvs = make_pvs() combination12_code = F.require_all( - F.MAXDOCACUT(0.15 * mm), F.MASS < 2242 * MeV) + F.MAXSDOCACUT(0.15 * mm), F.MASS < 2242 * MeV) combination_code = F.require_all( in_range(2191 * MeV, F.MASS, 2381 * MeV), - F.MAX(F.MINIPCHI2(pvs)) > 9., F.MAXDOCACUT(0.15 * mm), F.PT > 2 * GeV) + F.MAX(F.MINIPCHI2(pvs)) > 9., F.MAXSDOCACUT(0.15 * mm), F.PT > 2 * GeV) vertex_code = F.require_all(F.CHI2DOF < 6., in_range(2211 * MeV, F.MASS, 2361 * MeV), F.BPVFDCHI2(pvs) > 9., @@ -133,10 +133,10 @@ def make_xicp_to_pkpi(protons, kaons, pions): """Return a Xi_c+ -> p K- pi+ decay maker.""" pvs = make_pvs() combination12_code = F.require_all( - F.MAXDOCACUT(0.15 * mm), F.MASS < 2430 * MeV) + F.MAXSDOCACUT(0.15 * mm), F.MASS < 2430 * MeV) combination_code = F.require_all( in_range(2368 * MeV, F.MASS, 2568 * MeV), - F.MAX(F.MINIPCHI2(pvs)) > 9., F.MAXDOCACUT(0.15 * mm), F.PT > 2 * GeV) + F.MAX(F.MINIPCHI2(pvs)) > 9., F.MAXSDOCACUT(0.15 * mm), F.PT > 2 * GeV) vertex_code = F.require_all(F.CHI2DOF < 6., in_range(2388 * MeV, F.MASS, 2548 * MeV), F.BPVFDCHI2(pvs) > 12., @@ -154,12 +154,13 @@ def make_xic0_to_pkkpi(protons, kaons, pions): """Return a Xi_c0 -> p K- K- pi+ decay maker.""" pvs = make_pvs() combination12_code = F.require_all( - F.MAXDOCACUT(0.15 * mm), F.MASS < 1930 * MeV) + F.MAXSDOCACUT(0.15 * mm), F.MASS < 1930 * MeV) combination123_code = F.require_all( - F.MAXDOCACUT(0.15 * mm), F.MASS < 2421 * MeV) + F.MAXSDOCACUT(0.15 * mm), F.MASS < 2421 * MeV) combination_code = F.require_all( in_range(2380 * MeV, F.MASS, 2560 * MeV), - F.MAX(F.MINIPCHI2(pvs)) > 12., F.MAXDOCACUT(0.15 * mm), F.PT > 2 * GeV) + F.MAX(F.MINIPCHI2(pvs)) > 12., F.MAXSDOCACUT(0.15 * mm), + F.PT > 2 * GeV) vertex_code = F.require_all(F.CHI2DOF < 6., in_range(2400 * MeV, F.MASS, 2540 * MeV), F.BPVFDCHI2(pvs) > 6., @@ -178,12 +179,13 @@ def make_omegac0_to_pkkpi(protons, kaons, pions): """Return a Omega_c0 -> p K- K- pi+ decay maker.""" pvs = make_pvs() combination12_code = F.require_all( - F.MAXDOCACUT(0.15 * mm), F.MASS < 2155 * MeV) + F.MAXSDOCACUT(0.15 * mm), F.MASS < 2155 * MeV) combination123_code = F.require_all( - F.MAXDOCACUT(0.15 * mm), F.MASS < 2646 * MeV) + F.MAXSDOCACUT(0.15 * mm), F.MASS < 2646 * MeV) combination_code = F.require_all( in_range(2605 * MeV, F.MASS, 2785 * MeV), - F.MAX(F.MINIPCHI2(pvs)) > 12., F.MAXDOCACUT(0.15 * mm), F.PT > 2 * GeV) + F.MAX(F.MINIPCHI2(pvs)) > 12., F.MAXSDOCACUT(0.15 * mm), + F.PT > 2 * GeV) vertex_code = F.require_all(F.CHI2DOF < 6., in_range(2625 * MeV, F.MASS, 2765 * MeV), F.BPVFDCHI2(pvs) > 9., @@ -203,7 +205,7 @@ def make_cc_baryon(baryon, particle, name, decay_descriptor, comb_m_max, """Combine a charm baryon with muon.""" pvs = make_pvs() combination_code = F.require_all(F.PT > comb_pt_min, - F.MAXDOCACUT(doca_max)) + F.MAXSDOCACUT(doca_max)) vertex_code = F.require_all(F.CHI2DOF < vchi2dof_max, F.BPVCORRM(pvs) < comb_m_max, F.BPVDIRA(pvs) > bpvdira_min, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_hyperon_dh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_hyperon_dh.py index 6da4d21ef12..da1b7d7e039 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_hyperon_dh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_hyperon_dh.py @@ -130,7 +130,7 @@ def make_lambdall(): pions = filter_long_pions_from_lambda() combinationcode = F.require_all( in_range(1085 * MeV, F.MASS, 1145 * MeV), F.MAXSDOCACHI2CUT(30.), - F.MAXDOCACUT(0.2 * mm)) + F.MAXSDOCACUT(0.2 * mm)) vertexcode = F.require_all( in_range(1095 * MeV, F.MASS, 1135 * MeV), F.CHI2DOF < 9., F.BPVVDZ(pvs) > 4 * mm, in_range(-100 * mm, F.END_VZ, 500 * mm)) @@ -148,7 +148,7 @@ def make_lambdadd(): protons = filter_down_protons_from_lambda() combinationcode = F.require_all( in_range(1075 * MeV, F.MASS, 1160 * MeV), F.MAXSDOCACHI2CUT(30.), - F.MAXDOCACUT(2 * mm)) + F.MAXSDOCACUT(2 * mm)) vertexcode = F.require_all( in_range(1095 * MeV, F.MASS, 1140 * MeV), F.CHI2DOF < 9., in_range(300 * mm, F.END_VZ, 2275 * mm)) @@ -164,7 +164,7 @@ def make_xim_to_lambdapi(lambdas, pions): """Return a Xi- -> Lambda0 pi- decay maker.""" pvs = make_pvs() combinationcode = F.require_all( - in_range(1248 * MeV, F.MASS, 1396 * MeV), F.MAXDOCACUT(2 * mm), + in_range(1248 * MeV, F.MASS, 1396 * MeV), F.MAXSDOCACUT(2 * mm), F.SUM(F.PT) > 500 * MeV) vertexcode = F.require_all( in_range(1258 * MeV, F.MASS, 1386 * MeV), F.PT > 300 * MeV, @@ -194,9 +194,9 @@ def make_d_to_3h( 2. Ds- -> K- K+ pi+ """ pvs = make_pvs() - combination12_code = F.MAXDOCACUT(0.2 * mm) + combination12_code = F.MAXSDOCACUT(0.2 * mm) combination_code = F.require_all( - F.PT > comb_pt_min, F.MAXDOCACUT(0.2 * mm), + F.PT > comb_pt_min, F.MAXSDOCACUT(0.2 * mm), in_range(m_min - 20 * MeV, F.MASS, m_max + 20 * MeV)) vertex_code = F.require_all( F.CHI2DOF < vchi2dof_max, @@ -216,10 +216,10 @@ def make_d_to_3h( def make_cc_baryon(particle1, particle2, particle3, name, decay_descriptor, m_min, m_max, vchi2dof_max, bpvipchi2_max, bpvdira_min): pvs = make_pvs() - combination12_code = F.MAXDOCACUT(2 * mm) + combination12_code = F.MAXSDOCACUT(2 * mm) combination_code = F.require_all( - F.DOCA(1, 3) < 2 * mm, - F.DOCA(2, 3) < 0.2 * mm, + F.SDOCA(1, 3) < 2 * mm, + F.SDOCA(2, 3) < 0.2 * mm, in_range(m_min - 30 * MeV, F.MASS, m_max + 30 * MeV)) vertex_code = F.require_all( in_range(m_min, F.MASS, m_max), F.CHI2DOF < vchi2dof_max, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/charm_to_h0x.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/charm_to_h0x.py index 0d2f0e9ea38..50f1584d081 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/charm_to_h0x.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/charm_to_h0x.py @@ -196,7 +196,7 @@ def make_pi0_eeg_adder( combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > apt_min, - # F.MAXDOCACUT(amindoca_max), + # F.MAXSDOCACUT(amindoca_max), ) vertex_code = F.require_all( in_range(m_min, F.MASS, m_max), @@ -229,7 +229,7 @@ def make_pi0_eeee( combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > apt_min, - # F.MAXDOCACUT(amindoca_max), + # F.MAXSDOCACUT(amindoca_max), ) vertex_code = F.require_all( in_range(m_min, F.MASS, m_max), @@ -265,7 +265,7 @@ def make_eta_eeg_adder( combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > apt_min, - # F.MAXDOCACUT(amindoca_max), + # F.MAXSDOCACUT(amindoca_max), ) vertex_code = F.require_all( @@ -311,7 +311,7 @@ def make_d_to_hh0( combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > apt_min, - # F.MAXDOCACUT(amindoca_max) + # F.MAXSDOCACUT(amindoca_max) ) vertex_code = F.require_all( @@ -352,7 +352,7 @@ def make_d0_to_hhh0( combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > apt_min, - # F.MAXDOCACUT(amindoca_max) + # F.MAXSDOCACUT(amindoca_max) ) vertex_code = F.require_all( @@ -395,7 +395,7 @@ def make_d0_to_h0h0( combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > apt_min, - # F.MAXDOCACUT(amindoca_max), + # F.MAXSDOCACUT(amindoca_max), ) vertex_code = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hh.py index bbf9c3c678d..44a34571e52 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hh.py @@ -177,7 +177,7 @@ def make_dzeros(particle1, particle2, descriptor): in_range(1685 * MeV, F.MASS, 2045 * MeV), F.PT > 2 * GeV, F.MAX(F.PT) > 1200 * MeV, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), CompositeCut=F.require_all( in_range(1715 * MeV, F.MASS, 2015 * MeV), @@ -217,7 +217,7 @@ def make_dzeros_lowbias(particle1, particle2, descriptor): in_range(1714 * MeV, F.MASS, 2014 * MeV), F.MAX(F.PT) > 1200 * MeV, F.PT > 2 * GeV, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), CompositeCut=F.require_all( in_range(1764 * MeV, F.MASS, 1964 * MeV), @@ -492,7 +492,7 @@ def make_dzeros_for_b(particle1, particle2, descriptor): in_range(1685 * MeV, F.MASS, 2045 * MeV), F.MAX(F.PT) > 1200 * MeV, F.PT > 1 * GeV, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), CompositeCut=F.require_all( in_range(1715 * MeV, F.MASS, 2015 * MeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py index 5e239fa06a6..201cf42b470 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py @@ -84,7 +84,7 @@ def _make_phi2kk(): CombinationCut=F.require_all( F.MASS < 2150 * MeV, F.MAXSDOCACHI2CUT(10.), - F.DOCA(1, 2) < 200 * um, + F.SDOCA(1, 2) < 200 * um, F.SUM(F.PT) > 0 * MeV, ), CompositeCut=F.require_all( @@ -104,7 +104,7 @@ def make_rho2pipi(): CombinationCut=F.require_all( F.MASS < 2150 * MeV, F.MAXSDOCACHI2CUT(10.), - F.DOCA(1, 2) < 200 * um, + F.SDOCA(1, 2) < 200 * um, F.SUM(F.PT) > 0 * MeV, ), CompositeCut=F.require_all( @@ -125,7 +125,7 @@ def make_kstar2kpi(): CombinationCut=F.require_all( F.MASS < 2150 * MeV, F.MAXSDOCACHI2CUT(10.), - F.DOCA(1, 2) < 200 * um, + F.SDOCA(1, 2) < 200 * um, F.SUM(F.PT) > 0 * MeV, ), CompositeCut=F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhhh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhhh.py index 3624da2827e..07f2ade9fe4 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhhh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhhh.py @@ -147,7 +147,7 @@ def make_dzeros(particle1, combination_cut = F.require_all( in_range((1790 if for_b else 1700) * MeV, F.MASS, comb_m_max), F.PT > (1700 if for_b else 1900) * MeV, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ) if not for_b: combination_cut &= F.require_all( @@ -171,11 +171,11 @@ def make_dzeros(particle1, name=name, Combination12Cut=F.require_all( F.MASS < comb_m_max - m3 - m4, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), Combination123Cut=F.require_all( F.MASS < comb_m_max - m4, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), CombinationCut=combination_cut, CompositeCut=composite_cut, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhpi0.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhpi0.py index c4238a05e29..ca08b0ae4d4 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhpi0.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhpi0.py @@ -95,7 +95,7 @@ def _make_hh_pair(particle1, combination_code = F.require_all(*combination_cut_list, F.MASS < comb_m_max, F.MAXSDOCACHI2CUT(docachi2_max), - F.DOCA(1, 2) < doca_max) + F.SDOCA(1, 2) < doca_max) vertex_code = F.require_all(F.CHI2DOF < vchi2dof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_kshh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_kshh.py index c5536436429..6cedd2df807 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_kshh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_kshh.py @@ -175,7 +175,7 @@ def make_kshort_ll(): in_range(435 * MeV, F.MASS, 560 * MeV), F.PT > 300 * MeV, F.P > 3.5 * GeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), CompositeCut=F.require_all( in_range(455 * MeV, F.MASS, 540 * MeV), @@ -200,7 +200,7 @@ def make_kshort_dd(): F.PT > 400 * MeV, F.P > 4.5 * GeV, F.SUM(F.PT) > 500 * MeV, - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), F.MAXSDOCACHI2CUT(12.), ), CompositeCut=F.require_all( @@ -223,7 +223,7 @@ def make_kshort_ll_lowbias(): in_range(435 * MeV, F.MASS, 560 * MeV), F.PT > 200 * MeV, F.P > 2.5 * GeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), CompositeCut=F.require_all( in_range(455 * MeV, F.MASS, 540 * MeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_etah.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_etah.py index 99a0e032206..da24942882b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_etah.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_etah.py @@ -167,7 +167,7 @@ def _make_pion_pairs_from_eta(): pions = _filter_pions_from_eta() combination_code = F.require_all( in_range(180 * MeV, F.MASS, 770 * MeV), - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ) composite_code = F.require_all( in_range(200 * MeV, F.MASS, 750 * MeV), @@ -185,7 +185,7 @@ def _make_pion_pairs_from_eta_loose(): pions = _filter_pions_from_eta_loose() combination_code = F.require_all( in_range(180 * MeV, F.MASS, 770 * MeV), - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ) composite_code = F.require_all( in_range(200 * MeV, F.MASS, 750 * MeV), @@ -203,7 +203,7 @@ def _make_pion_pairs_from_etaprime(): pions = _filter_pions_from_etaprime() combination_code = F.require_all( in_range(180 * MeV, F.MASS, 1070 * MeV), - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ) composite_code = F.require_all( in_range(200 * MeV, F.MASS, 1050 * MeV), @@ -227,7 +227,7 @@ def _make_rho_from_etaprime(): pions = _filter_pions_from_etaprime() combination_code = F.require_all( in_range(580 * MeV, F.MASS, 1020 * MeV), - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ) composite_code = F.require_all( in_range(600 * MeV, F.MASS, 1000 * MeV), @@ -246,7 +246,7 @@ def _make_dplus_to_etah(pion_pairs, neutrals, odd_particles, descriptor): combination_code = F.require_all( in_range(1600 * MeV, F.MASS, 2200 * MeV), F.PT > 3000 * MeV, - F.DOCA(1, 3) < 0.05 * mm, + F.SDOCA(1, 3) < 0.05 * mm, ) vertex_code = F.require_all(in_range(1650 * MeV, F.MASS, 2150 * MeV)) return ParticleCombiner([pion_pairs, neutrals, odd_particles], @@ -263,7 +263,7 @@ def _make_dplus_to_etaprimeh(pion_pairs, neutrals, odd_particles, descriptor): combination_code = F.require_all( in_range(1600 * MeV, F.MASS, 2200 * MeV), F.PT > 3000 * MeV, - F.DOCA(1, 3) < 0.05 * mm, + F.SDOCA(1, 3) < 0.05 * mm, ) vertex_code = F.require_all(in_range(1650 * MeV, F.MASS, 2150 * MeV)) return ParticleCombiner([pion_pairs, neutrals, odd_particles], @@ -279,7 +279,7 @@ def _make_lambdas_to_etap(pion_pairs, neutrals, odd_particles, descriptor): combination_code = F.require_all( in_range(2100 * MeV, F.MASS, 2500 * MeV), F.PT > 3000 * MeV, - F.DOCA(1, 3) < 0.05 * mm, + F.SDOCA(1, 3) < 0.05 * mm, ) vertex_code = F.require_all(in_range(2150 * MeV, F.MASS, 2450 * MeV)) return ParticleCombiner([pion_pairs, neutrals, odd_particles], @@ -297,7 +297,7 @@ def _make_lambdas_to_etaprimep(pion_pairs, neutrals, odd_particles, combination_code = F.require_all( in_range(2100 * MeV, F.MASS, 2500 * MeV), F.PT > 3000 * MeV, - F.DOCA(1, 3) < 0.05 * mm, + F.SDOCA(1, 3) < 0.05 * mm, ) vertex_code = F.require_all(in_range(2150 * MeV, F.MASS, 2450 * MeV)) return ParticleCombiner([pion_pairs, neutrals, odd_particles], @@ -313,7 +313,7 @@ def _make_dplus_to_etamu(pion_pairs, neutrals, odd_particles, descriptor): combination_code = F.require_all( in_range(1500 * MeV, F.MASS, 2200 * MeV), F.PT > 3000 * MeV, - F.DOCA(1, 3) < 0.05 * mm, + F.SDOCA(1, 3) < 0.05 * mm, ) vertex_code = F.require_all(in_range(1550 * MeV, F.MASS, 2150 * MeV)) return ParticleCombiner([pion_pairs, neutrals, odd_particles], @@ -329,7 +329,7 @@ def _make_dplus_to_etaprimemu(pion_pairs, neutrals, odd_particles, descriptor): in_range(850 * MeV, F.MASS, 1060 * MeV)) combination_code = F.require_all( in_range(1500 * MeV, F.MASS, 2200 * MeV), F.PT > 3000 * MeV, - F.DOCA(1, 3) < 0.05 * mm) + F.SDOCA(1, 3) < 0.05 * mm) vertex_code = F.require_all(in_range(1550 * MeV, F.MASS, 2150 * MeV)) return ParticleCombiner([pion_pairs, neutrals, odd_particles], DecayDescriptor=descriptor, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhh.py index 9ed8495a5a0..f8c24625360 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhh.py @@ -145,7 +145,7 @@ def _make_d_or_ds_to_hhh(particles, name, descriptor, with_cuts=True): Inputs=particles, name=name, DecayDescriptor=descriptor, - Combination12Cut=F.require_all(F.MAXDOCACUT(doca12_max)), + Combination12Cut=F.require_all(F.MAXSDOCACUT(doca12_max)), CombinationCut=F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.MAX(F.PT) > max_pt_min, @@ -153,8 +153,8 @@ def _make_d_or_ds_to_hhh(particles, name, descriptor, with_cuts=True): F.SUM(F.PT) > sum_pt_min, F.MAX(F.MINIPCHI2(pvs)) > max_mipchi2_min, F.SUM(F.MINIPCHI2(pvs) > trk_2of3_mipchi2_min) > 1, - F.DOCA(1, 3) < doca13_max, - F.DOCA(2, 3) < doca23_max), + F.SDOCA(1, 3) < doca13_max, + F.SDOCA(2, 3) < doca23_max), CompositeCut=F.require_all(*vertex_cuts)) @@ -208,7 +208,7 @@ def _make_d_to_hhh_for_secondaries(particles, name, descriptor): Inputs=particles, name=name, DecayDescriptor=descriptor, - Combination12Cut=F.require_all(F.MAXDOCACUT(doca12_max)), + Combination12Cut=F.require_all(F.MAXSDOCACUT(doca12_max)), CombinationCut=F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.MAX(F.PT) > max_pt_min, @@ -216,8 +216,8 @@ def _make_d_to_hhh_for_secondaries(particles, name, descriptor): F.SUM(F.PT) > sum_pt_min, F.MAX(F.MINIPCHI2(pvs)) > max_mipchi2_min, F.SUM(F.MINIPCHI2(pvs) > trk_2of3_mipchi2_min) > 1, - F.DOCA(1, 3) < doca13_max, - F.DOCA(2, 3) < doca23_max), + F.SDOCA(1, 3) < doca13_max, + F.SDOCA(2, 3) < doca23_max), CompositeCut=F.require_all( in_range(m_min, F.MASS, m_max), F.CHI2DOF < vchi2dof_max, F.BPVLTIME(pvs) > bpvltime_min, F.PT > pt_min)) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py index 3b6abd03a53..287fcc5f930 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py @@ -102,7 +102,7 @@ def make_ks_ll( ): """Make KS -> pi+ pi- from long tracks.""" comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXSDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), @@ -143,7 +143,7 @@ def make_ks_dd( Make KS -> pi+ pi- from downstream tracks. """ comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), F.MAXSDOCACHI2CUT(docachi2_max), + F.MAXSDOCACUT(doca_max), F.MAXSDOCACHI2CUT(docachi2_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( @@ -192,7 +192,7 @@ def combine_d_ks_h( Cuts generally based on Run2 Turbo lines. """ comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXSDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/detection_asymmetry_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/detection_asymmetry_lines.py index 65f59d0fa7a..2a1d811ef5d 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/detection_asymmetry_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/detection_asymmetry_lines.py @@ -131,7 +131,7 @@ def make_kshorts_to_pipi(pions_plus, """ combination_cuts = F.require_all( in_range(am_min, F.MASS, am_max), F.PT > pt_min, - F.MIN(F.PT) > child_pt_min, F.MAXDOCACUT(doca_max)) + F.MIN(F.PT) > child_pt_min, F.MAXSDOCACUT(doca_max)) vertex_cuts = F.require_all(F.CHI2DOF < vchi2pdof_max, in_range(mass_min, F.MASS, mass_max), @@ -181,7 +181,7 @@ def make_prompt_dplus_to_kspi(kshorts, (F.CHILD(1, F.CHILD(2, F.MINIPCHI2(pvs))) > trk_2of3_ipchi2_min) + (F.CHILD(2, F.MINIPCHI2(pvs)) > trk_2of3_ipchi2_min)) > 1, # to be replaced with INTREE - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), ) cos_bpvdira_min = math.cos(acos_bpvdira_max) @@ -249,7 +249,7 @@ def make_prompt_ds_to_ksk(kshorts, (F.CHILD(1, F.CHILD(2, F.MINIPCHI2(pvs))) > trk_2of3_ipchi2_min) + (F.CHILD(2, F.MINIPCHI2(pvs)) > trk_2of3_ipchi2_min)) > 1, # to be replaced with INTREE - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), ) cos_bpvdira_min = math.cos(acos_bpvdira_max) @@ -315,7 +315,7 @@ def make_prompt_lc_to_ksproton(kshorts, (F.CHILD(1, F.CHILD(2, F.MINIPCHI2(pvs))) > trk_2of3_ipchi2_min) + (F.CHILD(2, F.MINIPCHI2(pvs)) > trk_2of3_ipchi2_min)) > 1, # to be replaced with INTREE - F.MAXDOCACUT(doca_max)) + F.MAXSDOCACUT(doca_max)) cos_bpvdira_min = math.cos(acos_bpvdira_max) vertex_cuts = F.require_all( @@ -376,7 +376,7 @@ def make_prompt_dplus_to_kpipi(kaons, in_range(am_min, F.MASS, am_max), F.MAX(F.PT) > amaxchild_pt_min, F.SUM(F.PT > trk_2of3_pt_min) > 1, - F.SUM(F.PT) > aptsum_min, F.MAXDOCACUT(doca_max), + F.SUM(F.PT) > aptsum_min, F.MAXSDOCACUT(doca_max), F.MAX(F.MINIPCHI2(pvs)) > amaxchild_ipchi2_min, F.SUM(F.MINIPCHI2(pvs) > trk_2of3_ipchi2_min) > 1, F.CHILD(1, F.PID_K < bachelor_pion_pidk_max)) @@ -431,7 +431,7 @@ def make_prompt_ds_to_kkpi(kaons, in_range(am_min, F.MASS, am_max), F.MAX(F.PT) > amaxchild_pt_min, F.SUM(F.PT > trk_2of3_pt_min) > 1, - F.SUM(F.PT) > aptsum_min, F.MAXDOCACUT(doca_max), + F.SUM(F.PT) > aptsum_min, F.MAXSDOCACUT(doca_max), F.MAX(F.MINIPCHI2(pvs)) > amaxchild_ipchi2_min, F.SUM(F.MINIPCHI2(pvs) > trk_2of3_ipchi2_min) > 1, (F.SUBCOMB( Functor=in_range(phi_mass_min, F.MASS, phi_mass_max), @@ -486,7 +486,7 @@ def make_prompt_ds_to_pipipi(pions, F.MAX(F.PT) > amaxchild_pt_min, F.SUM(F.PT > trk_2of3_pt_min) > 1, F.SUM(F.PT) > aptsum_min, - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), F.MAX(F.MINIPCHI2(pvs)) > amaxchild_ipchi2_min, F.SUM(F.MINIPCHI2(pvs) > trk_2of3_ipchi2_min) > 1, ) @@ -539,7 +539,7 @@ def make_prompt_lc_to_pkpi(protons, F.MAX(F.PT) > amaxchild_pt_min, F.SUM(F.PT > trk_2of3_pt_min) > 1, F.SUM(F.PT) > aptsum_min, - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), F.MAX(F.MINIPCHI2(pvs)) > amaxchild_ipchi2_min, F.SUM(F.MINIPCHI2(pvs) > trk_2of3_ipchi2_min) > 1, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dsstar_to_dspipi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dsstar_to_dspipi.py index 400bd3a9e2a..639bba7ea28 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dsstar_to_dspipi.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dsstar_to_dspipi.py @@ -83,7 +83,7 @@ def make_dss(particle1, particle2, particle3): in_range(1885 * MeV, F.MASS, 2045 * MeV), F.PT > 4.0 * GeV, F.MAXSDOCACHI2CUT(18.0), - F.MAXDOCACUT(0.27 * mm), + F.MAXSDOCACUT(0.27 * mm), ), CompositeCut=F.require_all( in_range(1890 * MeV, F.MASS, 2040 * MeV), @@ -104,9 +104,9 @@ def make_dsstars2536(particle1, particle2, particle3): in_range(2500 * MeV, F.MASS, 2615 * MeV), F.PT > 4.5 * GeV, F.MAXSDOCACHI2CUT(15.0), - F.DOCA(1, 2) < 0.30 * mm, - F.DOCA(1, 3) < 0.30 * mm, - F.DOCA(2, 3) < 0.65 * mm, + F.SDOCA(1, 2) < 0.30 * mm, + F.SDOCA(1, 3) < 0.30 * mm, + F.SDOCA(2, 3) < 0.65 * mm, ), CompositeCut=F.require_all( in_range(2410 * MeV, F.MASS, 2670 * MeV), @@ -126,9 +126,9 @@ def make_dsstars2460(particle1, particle2, particle3): in_range(2370 * MeV, F.MASS, 2500 * MeV), F.PT > 4.5 * GeV, F.MAXSDOCACHI2CUT(15.0), - F.DOCA(1, 2) < 0.30 * mm, - F.DOCA(1, 3) < 0.30 * mm, - F.DOCA(2, 3) < 0.65 * mm, + F.SDOCA(1, 2) < 0.30 * mm, + F.SDOCA(1, 3) < 0.30 * mm, + F.SDOCA(2, 3) < 0.65 * mm, ), CompositeCut=F.require_all( in_range(2375 * MeV, F.MASS, 2500 * MeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dst_to_dee_makers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dst_to_dee_makers.py index 548a737bd69..cff89c3b052 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dst_to_dee_makers.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dst_to_dee_makers.py @@ -358,7 +358,7 @@ def make_dzeros_for_hh(particle1, particle2, descriptor): in_range(1685 * MeV, F.MASS, 2045 * MeV), F.PT > 2 * GeV, F.MAX(F.PT) > 1200 * MeV, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), CompositeCut=F.require_all( in_range(1715 * MeV, F.MASS, 2015 * MeV), @@ -390,7 +390,7 @@ def make_untight_dzeros_for_hh(particle1, particle2, descriptor): in_range(1685 * MeV, F.MASS, 2045 * MeV), F.PT > 2 * GeV, #F.MAX(F.PT) > 1200 * MeV, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), CompositeCut=F.require_all( in_range(1715 * MeV, F.MASS, 2015 * MeV), @@ -421,7 +421,7 @@ def make_dzeros_for_hhhh(particle1, particle2, particle3, particle4, combination_cut = F.require_all( in_range(1700 * MeV, F.MASS, comb_m_max), F.P > 25 * GeV, F.PT > 1900 * MeV, - F.MAX(F.PT) > 1200 * MeV, F.MAXDOCACUT(0.1 * mm)) + F.MAX(F.PT) > 1200 * MeV, F.MAXSDOCACUT(0.1 * mm)) # CompositeCut composite_cut = F.require_all( in_range(1790 * MeV, F.MASS, 2010 * MeV), @@ -438,11 +438,11 @@ def make_dzeros_for_hhhh(particle1, particle2, particle3, particle4, name=name, Combination12Cut=F.require_all( F.MASS < comb_m_max - 2 * _PION_M, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), Combination123Cut=F.require_all( F.MASS < comb_m_max - _PION_M, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), CombinationCut=combination_cut, CompositeCut=composite_cut, @@ -469,7 +469,7 @@ def make_untight_dzeros_for_hhhh(particle1, particle2, particle3, particle4, combination_cut = F.require_all( in_range(1700 * MeV, F.MASS, comb_m_max), F.P > 25 * GeV, F.PT > 1900 * MeV, - F.MAX(F.PT) > 1200 * MeV, F.MAXDOCACUT(0.1 * mm)) + F.MAX(F.PT) > 1200 * MeV, F.MAXSDOCACUT(0.1 * mm)) # CompositeCut composite_cut = F.require_all( in_range(1790 * MeV, F.MASS, 2010 * MeV), @@ -486,11 +486,11 @@ def make_untight_dzeros_for_hhhh(particle1, particle2, particle3, particle4, name=name, Combination12Cut=F.require_all( F.MASS < comb_m_max - 2 * _PION_M, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), Combination123Cut=F.require_all( F.MASS < comb_m_max - _PION_M, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), CombinationCut=combination_cut, CompositeCut=composite_cut, @@ -522,8 +522,8 @@ def make_ds_to_hhh(particle1, particle2, particle3, descriptor, F.SUM(F.PT) > 3 * GeV, F.MAX(F.MINIPCHI2(pvs)) > 50, F.SUM(F.MINIPCHI2(pvs) > 10.) > 1, - F.DOCA(1, 3) < 0.1 * mm, - F.DOCA(2, 3) < 0.1 * mm) + F.SDOCA(1, 3) < 0.1 * mm, + F.SDOCA(2, 3) < 0.1 * mm) # CompositeCut composite_cut = F.require_all( @@ -536,7 +536,7 @@ def make_ds_to_hhh(particle1, particle2, particle3, descriptor, Inputs=[particle1, particle2, particle3], name=name, DecayDescriptor=descriptor, - Combination12Cut=F.require_all(F.MAXDOCACUT(0.1 * mm)), + Combination12Cut=F.require_all(F.MAXSDOCACUT(0.1 * mm)), CombinationCut=combination_cut, CompositeCut=composite_cut) @@ -569,8 +569,8 @@ def make_untight_ds_to_hhh(particle1, #F.SUM(F.PT) > 3 * GeV, #F.MAX(F.MINIPCHI2(pvs)) > 50, #F.SUM(F.MINIPCHI2(pvs) > 10.) > 1, - F.DOCA(1, 3) < 0.1 * mm, - F.DOCA(2, 3) < 0.1 * mm) + F.SDOCA(1, 3) < 0.1 * mm, + F.SDOCA(2, 3) < 0.1 * mm) # CompositeCut composite_cut = F.require_all( @@ -585,7 +585,7 @@ def make_untight_ds_to_hhh(particle1, Inputs=[particle1, particle2, particle3], name=name, DecayDescriptor=descriptor, - Combination12Cut=F.require_all(F.MAXDOCACUT(0.1 * mm)), + Combination12Cut=F.require_all(F.MAXSDOCACUT(0.1 * mm)), CombinationCut=combination_cut, CompositeCut=composite_cut) @@ -644,7 +644,7 @@ def dst_BDT_functor(pvs, line): 'D0_PT': F.CHILD(1, F.PT), 'D0_BPVFDCHI2': F.CHILD(1, F.BPVFDCHI2(pvs)), 'D0_BPVDIRA': F.CHILD(1, F.BPVDIRA(pvs)), - 'D0_DOCA': F.CHILD(1, F.DOCA(1, 2)) + 'D0_DOCA': F.CHILD(1, F.SDOCA(1, 2)) } dp_vars_thor = { @@ -653,7 +653,7 @@ def dst_BDT_functor(pvs, line): 'DpDs_PT': F.CHILD(1, F.PT), 'DpDs_BPVDIRA': F.CHILD(1, F.BPVDIRA(pvs)), 'DpDs_BPVIPCHI2': F.CHILD(1, F.BPVIPCHI2(pvs)), - 'DpDs_DOCA': F.CHILD(1, F.DOCA(1, 2)) + 'DpDs_DOCA': F.CHILD(1, F.SDOCA(1, 2)) } kpi_vars_thor = { diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hadronic_interaction_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hadronic_interaction_lines.py index b28c6c67174..7da27f72f8c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hadronic_interaction_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hadronic_interaction_lines.py @@ -141,7 +141,7 @@ def _hadint_make_dzeros_Kpi( CombinationCut=F.require_all( F.SUM(F.PT) > sum_pt_min, in_range(_D0_M - comb_m_window, F.MASS, _D0_M + comb_m_window), - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), F.SUM(F.MINIPCHI2(make_pvs())) > sum_mipchi2_min, ), CompositeCut=F.require_all( @@ -197,7 +197,7 @@ def _hadint_make_dzeros_Kpipipi( CombinationCut=F.require_all( F.SUM(F.PT) > sum_pt_min, in_range(_D0_M - comb_m_window, F.MASS, _D0_M + comb_m_window), - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), F.SUM(F.MINIPCHI2(make_pvs())) > sum_mipchi2_min, ), CompositeCut=F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hexaquarks.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hexaquarks.py index 32205a4af1b..f385d86d11e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hexaquarks.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hexaquarks.py @@ -249,7 +249,7 @@ def _make_combination( combination_cut = F.require_all( in_range(am_min, F.MASS, am_max), - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), F.SUM(F.PT) > sum_pt_min, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperons.py index 7c7e446b129..2f15a6bb9da 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperons.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperons.py @@ -382,7 +382,7 @@ def _make_ll_kshorts(): name='Charm_Hyperons_KS0_LL_{hash}', CombinationCut=F.require_all( F.MASS > 435 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), F.MASS < 560 * MeV, F.PT > 300 * MeV, F.P > 3.5 * GeV, @@ -405,7 +405,7 @@ def _make_dd_kshorts(): DecayDescriptor="KS0 -> pi+ pi-", name='Charm_Hyperons_KS0_DD_{hash}', CombinationCut=F.require_all( - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), F.MAXSDOCACHI2CUT(12.), F.math.in_range(425 * MeV, F.MASS, 570 * MeV), F.PT > 400 * MeV, @@ -429,7 +429,7 @@ def _make_ll_lambdas_for_charm(): name='Charm_Hyperons_LambdaFromC_LL_{hash}', CombinationCut=F.require_all( F.MASS < 1190 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 500 * MeV, ), CompositeCut=F.require_all( @@ -450,7 +450,7 @@ def _make_dd_lambdas(): name='Charm_Hyperons_Lambda_DD_{hash}', CombinationCut=F.require_all( F.MASS < 1150 * MeV, - F.MAXDOCACUT(3 * mm), + F.MAXSDOCACUT(3 * mm), F.PT > 500 * MeV, ), CompositeCut=F.require_all( @@ -471,7 +471,7 @@ def _make_ll_lambdas_for_hyperon(): name='Charm_Hyperons_LambdaFromHyperon_LL_{hash}', CombinationCut=F.require_all( F.MASS < 1190 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 450 * MeV, ), CompositeCut=F.require_all( @@ -492,7 +492,7 @@ def _make_lll_xis(ll_lambdas, pions, pvs): name='Charm_Hyperons_Xim_LLL_{hash}', CombinationCut=F.require_all( F.MASS < 1400 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), F.PT > 500 * MeV, ), CompositeCut=F.require_all( @@ -514,7 +514,7 @@ def _make_ddl_xis(dd_lambdas, pions, pvs): name='Charm_Hyperons_Xim_DDL_{hash}', CombinationCut=F.require_all( F.MASS < 1400 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), F.PT > 1 * GeV, F.P > 14 * GeV, ), @@ -538,7 +538,7 @@ def _make_ddd_xis(dd_lambdas, down_pions, pvs): CombinationCut=F.require_all( F.MASS < 1390 * MeV, F.PT > 600 * MeV, - F.MAXDOCACUT(3 * mm), + F.MAXSDOCACUT(3 * mm), ), CompositeCut=F.require_all( F.math.in_range(1290 * MeV, @@ -562,7 +562,7 @@ def _make_lll_omegas(ll_lambdas, kaons, pvs): name='Charm_Hyperons_Omegam_LLL_{hash}', CombinationCut=F.require_all( F.MASS < 1750 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), F.PT > 550 * MeV, ), CompositeCut=F.require_all( @@ -584,7 +584,7 @@ def _make_ddl_omegas(dd_lambdas, kaons, pvs): name='Charm_Hyperons_Omegam_DDL_{hash}', CombinationCut=F.require_all( F.MASS < 1750 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), F.PT > 1 * GeV, F.P > 14 * GeV, ), @@ -608,7 +608,7 @@ def _make_ddd_omegas(dd_lambdas, down_kaons, pvs): CombinationCut=F.require_all( F.MASS < 1750 * MeV, F.PT > 650 * MeV, - F.MAXDOCACUT(3 * mm), + F.MAXSDOCACUT(3 * mm), ), CompositeCut=F.require_all( F.math.in_range(1640 * MeV, @@ -770,7 +770,7 @@ def _make_bbaryon_to_cbaryonttrack(cbaryon, track, pvs, descriptor, suffix): name='Charm_Hyperons_XbToXcTrack_{hash}', CombinationCut=F.require_all( F.MASS < 6.4 * GeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 1.4 * GeV, F.P > 24 * GeV, ), @@ -795,7 +795,7 @@ def _make_xib0_to_xicppim(xicp, pim, pvs, suffix): CombinationCut=F.require_all( F.MASS > 5.3 * GeV, F.MASS < 6.1 * GeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 1.4 * GeV, F.P > 24 * GeV, ), @@ -820,7 +820,7 @@ def _make_bbaryon_to_cbaryond(xc, d, pvs, descriptor, suffix): name='Charm_Hyperons_XbToXcD_{hash}', CombinationCut=F.require_all( F.math.in_range(4.9 * GeV, F.MASS, 6.4 * GeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 3.8 * GeV, F.P > 28 * GeV, F.SUM(F.PT) > 4.5 * GeV, @@ -847,7 +847,7 @@ def _make_detached_lc_to_lpi_ll(ll_lambdas, pions, pvs): name='Charm_Hyperons_DetachedLcpToL0Pip_LL_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -871,7 +871,7 @@ def _make_detached_lc_to_lpi_dd(dd_lambdas, pions, pvs): name='Charm_Hyperons_DetachedLcpToL0Pip_DD_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), F.PT > 0.9 * GeV, F.P > 15 * GeV, ), @@ -894,7 +894,7 @@ def _make_detached_xicp_to_lpi_ll(ll_lambdas, pions, pvs): name='Charm_Hyperons_DetachedXicpToL0Pip_LL_{hash}', CombinationCut=F.require_all( F.math.in_range(2360 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -918,7 +918,7 @@ def _make_detached_xicp_to_lpi_dd(dd_lambdas, pions, pvs): name='Charm_Hyperons_DetachedXicpToL0Pip_DD_{hash}', CombinationCut=F.require_all( F.math.in_range(2360 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -941,7 +941,7 @@ def _make_detached_xicz_to_ximpi_lll(lll_xis, pions, pvs): name='Charm_Hyperons_DetachedXic0ToXimPip_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -965,7 +965,7 @@ def _make_detached_xicz_to_ximpi_ddl(ddl_xis, pions, pvs): name='Charm_Hyperons_DetachedXic0ToXimPip_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -989,7 +989,7 @@ def _make_detached_xicz_to_ximk_lll(lll_xis, kaons, pvs): name='Charm_Hyperons_DetachedXic0ToXimKp_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -1013,7 +1013,7 @@ def _make_detached_xicz_to_ximk_ddl(ddl_xis, kaons, pvs): name='Charm_Hyperons_DetachedXic0ToXimKp_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -1037,7 +1037,7 @@ def _make_detached_oc_to_ximk_lll(lll_xis, kaons, pvs): name='Charm_Hyperons_DetachedOc0ToXimKp_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1061,7 +1061,7 @@ def _make_detached_oc_to_ximk_ddl(ddl_xis, kaons, pvs): name='Charm_Hyperons_DetachedOc0ToXimKp_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -1085,7 +1085,7 @@ def _make_detached_oc_to_ompi_lll(lll_oms, pions, pvs): name='Charm_Hyperons_DetachedOc0ToOmPip_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 1.3 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1109,7 +1109,7 @@ def _make_detached_oc_to_ompi_ddl(ddl_oms, pions, pvs): name='Charm_Hyperons_DetachedOc0ToOmPip_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 1.3 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.3 * GeV, @@ -1133,11 +1133,11 @@ def _make_detached_xicp_to_ximpipi_lll(lll_xis, pions, pvs): name='Charm_Hyperons_DetachedXicpToXimPipPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 250 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 250 * um, + F.SDOCA(2, 3) < 250 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -1162,11 +1162,11 @@ def _make_detached_xicp_to_ximpipi_ddl(ddl_xis, pions, pvs): name='Charm_Hyperons_DetachedXicpToXimPipPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 1.2 * mm, - F.DOCA(2, 3) < 400 * um, + F.SDOCA(1, 3) < 1.2 * mm, + F.SDOCA(2, 3) < 400 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -1191,11 +1191,11 @@ def _make_detached_xicz_to_lkpi_ll(ll_lambdas, kaons, pions, pvs): name='Charm_Hyperons_DetachedXic0ToL0KmPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 250 * um, F.math.in_range(2360 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -1220,11 +1220,11 @@ def _make_detached_xicz_to_lkpi_dd(dd_lambdas, kaons, pions, pvs): name='Charm_Hyperons_DetachedXic0ToL0KmPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(800 * um), + F.MAXSDOCACUT(800 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 1 * mm, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 1 * mm, + F.SDOCA(2, 3) < 250 * um, F.math.in_range(2360 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -1297,7 +1297,7 @@ def lc_to_lpi_ll_line(name="Hlt2Charm_LcpToL0Pip_LL"): name='Charm_Hyperons_LcpToL0Pip_LL_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -1327,7 +1327,7 @@ def lc_to_lpi_dd_line(name="Hlt2Charm_LcpToL0Pip_DD"): name='Charm_Hyperons_LcpToL0Pip_DD_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1442,7 +1442,7 @@ def lc_to_lk_ll_line(name="Hlt2Charm_LcpToL0Kp_LL"): name='Charm_Hyperons_LcpToL0Kp_LL_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -1472,7 +1472,7 @@ def lc_to_lk_dd_line(name="Hlt2Charm_LcpToL0Kp_DD"): name='Charm_Hyperons_LcpToL0Kp_DD_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1501,7 +1501,7 @@ def lc_to_lk_llinclb_line(name="Hlt2Charm_LcpToL0Kp_LL_Inclb_PR"): name='Charm_Hyperons_DetachedLcpToL0Kp_LL_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -1535,7 +1535,7 @@ def lc_to_lk_ddinclb_line(name="Hlt2Charm_LcpToL0Kp_DD_Inclb_PR"): name='Charm_Hyperons_DetachedLcpToL0Kp_DD_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1567,7 +1567,7 @@ def xicp_to_lpi_ll_line(name="Hlt2Charm_XicpToL0Pip_LL"): name='Charm_Hyperons_XicpToL0Pip_LL_{hash}', CombinationCut=F.require_all( F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 1.3 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -1598,7 +1598,7 @@ def xicp_to_lpi_dd_line(name="Hlt2Charm_XicpToL0Pip_DD"): name='Charm_Hyperons_XicpToL0Pip_DD_{hash}', CombinationCut=F.require_all( F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), F.PT > 1.3 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2.4 * GeV, @@ -1723,7 +1723,7 @@ def xicz_to_ximpi_lll_line(name="Hlt2Charm_Xic0ToXimPip_LLL"): name='Charm_Hyperons_Xic0ToXimPip_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1756,7 +1756,7 @@ def xicz_to_ximpi_ddl_line(name="Hlt2Charm_Xic0ToXimPip_DDL"): name='Charm_Hyperons_Xic0ToXimPip_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -1887,7 +1887,7 @@ def xicz_to_ximk_lll_line(name="Hlt2Charm_Xic0ToXimKp_LLL"): name='Charm_Hyperons_Xic0ToXimKp_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1919,7 +1919,7 @@ def xicz_to_ximk_ddl_line(name="Hlt2Charm_Xic0ToXimKp_DDL"): name='Charm_Hyperons_Xic0ToXimKp_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2056,7 +2056,7 @@ def xicz_to_omk_lll_line(name="Hlt2Charm_Xic0ToOmKp_LLL"): name='Charm_Hyperons_Xic0ToOmKp_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -2088,7 +2088,7 @@ def xicz_to_omk_ddl_line(name="Hlt2Charm_Xic0ToOmKp_DDL"): name='Charm_Hyperons_Xic0ToOmKp_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2120,7 +2120,7 @@ def xicz_to_l0ll_kshortsll_line(name="Hlt2Charm_Xic0ToL0Ks_LLLL", prescale=1): name='Charm_Hyperons_Xic0ToL0Ks_LLLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2370 * MeV, F.MASS, 2570 * MeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2154,7 +2154,7 @@ def xicz_to_l0dd_kshortsll_line(name="Hlt2Charm_Xic0ToL0Ks_DDLL", prescale=1): name='Charm_Hyperons_Xic0ToL0Ks_DDLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2370 * MeV, F.MASS, 2570 * MeV), - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2192,7 +2192,7 @@ def xicz_to_l0ll_kshortsdd_line(name="Hlt2Charm_Xic0ToL0Ks_LLDD", prescale=1): F.SUM(F.PT) > 2.2 * GeV, ), CompositeCut=F.require_all( - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), F.math.in_range(2390 * MeV, F.MASS, 2550 * MeV), F.PT > 1 * GeV, F.P > 24 * GeV, @@ -2220,7 +2220,7 @@ def xicz_to_l0dd_kshortsdd_line(name="Hlt2Charm_Xic0ToL0Ks_DDDD", prescale=1): name='Charm_Hyperons_Xic0ToL0Ks_DDDD_{hash}', CombinationCut=F.require_all( F.math.in_range(2370 * MeV, F.MASS, 2570 * MeV), - F.MAXDOCACUT(5 * mm), + F.MAXSDOCACUT(5 * mm), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2254,7 +2254,7 @@ def oc_to_ximpi_lll_line(name="Hlt2Charm_Oc0ToXimPip_LLL"): name='Charm_Hyperons_Oc0ToXimPip_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -2286,7 +2286,7 @@ def oc_to_ximpi_ddl_line(name="Hlt2Charm_Oc0ToXimPip_DDL"): name='Charm_Hyperons_Oc0ToXimPip_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2319,7 +2319,7 @@ def oc_to_ximk_lll_line(name="Hlt2Charm_Oc0ToXimKp_LLL"): name='Charm_Hyperons_Oc0ToXimKp_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -2351,7 +2351,7 @@ def oc_to_ximk_ddl_line(name="Hlt2Charm_Oc0ToXimKp_DDL"): name='Charm_Hyperons_Oc0ToXimKp_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2487,7 +2487,7 @@ def oc_to_ompi_lll_line(name="Hlt2Charm_Oc0ToOmPip_LLL"): name='Charm_Hyperons_Oc0ToOmPip_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 16 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -2519,7 +2519,7 @@ def oc_to_ompi_ddl_line(name="Hlt2Charm_Oc0ToOmPip_DDL"): name='Charm_Hyperons_Oc0ToOmPip_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2654,7 +2654,7 @@ def oc_to_omk_lll_line(name="Hlt2Charm_Oc0ToOmKp_LLL"): name='Charm_Hyperons_Oc0ToOmKp_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -2686,7 +2686,7 @@ def oc_to_omk_ddl_line(name="Hlt2Charm_Oc0ToOmKp_DDL"): name='Charm_Hyperons_Oc0ToOmKp_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2718,7 +2718,7 @@ def oc_to_l0ll_kshortsll_line(name="Hlt2Charm_Oc0ToL0Ks_LLLL", prescale=1): name='Charm_Hyperons_Oc0ToL0Ks_LLLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2752,7 +2752,7 @@ def oc_to_l0dd_kshortsll_line(name="Hlt2Charm_Oc0ToL0Ks_DDLL", prescale=1): name='Charm_Hyperons_Oc0ToL0Ks_DDLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2785,7 +2785,7 @@ def oc_to_l0ll_kshortsdd_line(name="Hlt2Charm_Oc0ToL0Ks_LLDD", prescale=1): name='Charm_Hyperons_Oc0ToL0Ks_LLDD_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2818,7 +2818,7 @@ def oc_to_l0dd_kshortsdd_line(name="Hlt2Charm_Oc0ToL0Ks_DDDD", prescale=1): name='Charm_Hyperons_Oc0ToL0Ks_DDDD_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXDOCACUT(5 * mm), + F.MAXSDOCACUT(5 * mm), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2871,10 +2871,11 @@ def o_to_xipipi_line(name="Hlt2Charm_OmToXimPimPip_LongXim_SP"): name='Charm_Hyperons_OmToXimPimPip_{hash}', Combination12Cut=F.require_all( F.MASS < 1631 * MeV, - F.MAXDOCACUT(250 * um), + F.MAXSDOCACUT(250 * um), ), - CombinationCut=F.require_all(F.MASS < 1770 * MeV, F.MAXDOCACUT( - 250 * um), F.PT > 1 * GeV, F.P > 16 * GeV), + CombinationCut=F.require_all(F.MASS < 1770 * MeV, + F.MAXSDOCACUT(250 * um), F.PT > 1 * GeV, + F.P > 16 * GeV), CompositeCut=F.require_all( F.MASS < 1750 * MeV, F.CHI2DOF < 7., @@ -2904,12 +2905,12 @@ def lc_to_lksk_ll_line(name="Hlt2Charm_LcpToL0KsKp_LLLL"): name='Charm_Hyperons_LcpToL0KsKp_LLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 1915 * MeV, - F.MAXDOCACUT(300 * um), + F.MAXSDOCACUT(300 * um), ), CombinationCut=F.require_all( F.MASS < 2405 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 250 * um, F.PT > 1.3 * GeV, F.P > 17 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -2943,11 +2944,11 @@ def lc_to_lksk_dl_line(name="Hlt2Charm_LcpToL0KsKp_DDLL"): name='Charm_Hyperons_LcpToL0KsKp_DDLL_{hash}', Combination12Cut=F.require_all( F.MASS < 1915 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 600 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 600 * um, + F.SDOCA(2, 3) < 250 * um, F.MASS < 2405 * MeV, F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -2981,11 +2982,11 @@ def lc_to_lksk_ld_line(name="Hlt2Charm_LcpToL0KsKp_LLDD"): name='Charm_Hyperons_LcpToL0KsKp_LLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 1915 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 800 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 800 * um, F.MASS < 2405 * MeV, F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3029,12 +3030,12 @@ def lcp_to_smkpi_longsm_line( name='Charm_Hyperons_LcpToSmPipPip_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), ), CombinationCut=F.require_all( F.MASS > 2165 * MeV, F.MASS < 2405 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 1.3 * GeV, F.P > 17 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -3054,7 +3055,7 @@ def lcp_to_smkpi_longsm_line( CombinationCut=F.require_all( F.MASS > 5.2 * GeV, F.MASS < 6.0 * GeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 1.4 * GeV, F.P > 24 * GeV, ), @@ -3092,11 +3093,11 @@ def lc_to_ximkpi_lll_line(name="Hlt2Charm_LcpToXimKpPip_LLL"): name='Charm_Hyperons_LcpToXimKpPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2265 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 250 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 250 * um, + F.SDOCA(2, 3) < 250 * um, F.math.in_range(2165 * MeV, F.MASS, 2405 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3131,11 +3132,11 @@ def lc_to_ximkpi_ddl_line(name="Hlt2Charm_LcpToXimKpPip_DDL"): name='Charm_Hyperons_LcpToXimKpPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2265 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 1.2 * mm, - F.DOCA(2, 3) < 400 * um, + F.SDOCA(1, 3) < 1.2 * mm, + F.SDOCA(2, 3) < 400 * um, F.math.in_range(2165 * MeV, F.MASS, 2405 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3170,11 +3171,11 @@ def xicp_to_lkspi_ll_line(name="Hlt2Charm_XicpToL0KsPip_LLLL"): name='Charm_Hyperons_XicpToL0KsPip_LLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(300 * um), + F.MAXSDOCACUT(300 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 250 * um, F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3209,11 +3210,11 @@ def xicp_to_lkspi_dl_line(name="Hlt2Charm_XicpToL0KsPip_DDLL"): name='Charm_Hyperons_XicpToL0KsPip_DDLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 600 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 600 * um, + F.SDOCA(2, 3) < 250 * um, F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3247,11 +3248,11 @@ def xicp_to_lkspi_ld_line(name="Hlt2Charm_XicpToL0KsPip_LLDD"): name='Charm_Hyperons_XicpToL0KsPip_LLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 800 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 800 * um, F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3286,11 +3287,11 @@ def xicp_to_lksk_ll_line(name="Hlt2Charm_XicpToL0KsKp_LLLL"): name='Charm_Hyperons_XicpToL0KsKp_LLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 150 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 150 * um, + F.SDOCA(2, 3) < 200 * um, F.math.in_range(2295 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3325,11 +3326,11 @@ def xicp_to_lksk_dl_line(name="Hlt2Charm_XicpToL0KsKp_DDLL"): name='Charm_Hyperons_XicpToL0KsKp_DDLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 500 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 500 * um, + F.SDOCA(2, 3) < 200 * um, F.math.in_range(2295 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3363,11 +3364,11 @@ def xicp_to_lksk_ld_line(name="Hlt2Charm_XicpToL0KsKp_LLDD"): name='Charm_Hyperons_XicpToL0KsKp_LLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 150 * um, - F.DOCA(2, 3) < 500 * um, + F.SDOCA(1, 3) < 150 * um, + F.SDOCA(2, 3) < 500 * um, F.math.in_range(2295 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3416,12 +3417,12 @@ def xicp_to_spkpi_longsp_line( name='Charm_Hyperons_XicpToSpKmPip_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), ), CombinationCut=F.require_all( F.MASS > 2350 * MeV, F.MASS < 2590 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 1.3 * GeV, F.P > 17 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -3457,11 +3458,11 @@ def xicp_to_ximpipi_lll_line(name="Hlt2Charm_XicpToXimPipPip_LLL"): name='Charm_Hyperons_XicpToXimPipPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 250 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 250 * um, + F.SDOCA(2, 3) < 250 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3495,11 +3496,11 @@ def xicp_to_ximpipi_ddl_line(name="Hlt2Charm_XicpToXimPipPip_DDL"): name='Charm_Hyperons_XicpToXimPipPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 1.2 * mm, - F.DOCA(2, 3) < 400 * um, + F.SDOCA(1, 3) < 1.2 * mm, + F.SDOCA(2, 3) < 400 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3642,12 +3643,12 @@ def xicp_to_ximpipi_longxim_line( name="Charm_Hyperons_XicpToXiPipPip_XiLong", Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), ), CombinationCut=F.require_all( F.MASS > 2350 * MeV, F.MASS < 2590 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 1.3 * GeV, F.P > 17 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -3686,11 +3687,11 @@ def xicp_to_ximkpi_lll_line(name="Hlt2Charm_XicpToXimKpPip_LLL"): name='Charm_Hyperons_XicpToXimKpPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 200 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3727,11 +3728,11 @@ def xicp_to_ximkpi_ddl_line(name="Hlt2Charm_XicpToXimKpPip_DDL"): name='Charm_Hyperons_XicpToXimKpPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 1.2 * mm, - F.DOCA(2, 3) < 400 * um, + F.SDOCA(1, 3) < 1.2 * mm, + F.SDOCA(2, 3) < 400 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3769,11 +3770,11 @@ def xicp_to_omkpi_lll_line(name="Hlt2Charm_XicpToOmKpPip_LLL"): name='Charm_Hyperons_XicpToOmKpPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 200 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3810,11 +3811,11 @@ def xicp_to_omkpi_ddl_line(name="Hlt2Charm_XicpToOmKpPip_DDL"): name='Charm_Hyperons_XicpToOmKpPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 1.2 * mm, - F.DOCA(2, 3) < 400 * um, + F.SDOCA(1, 3) < 1.2 * mm, + F.SDOCA(2, 3) < 400 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3858,12 +3859,12 @@ def xicp_to_omkpi_longom_line( name='Charm_Hyperons_XicpToOmKpPip_OmLong_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), ), CombinationCut=F.require_all( F.MASS > 2350 * MeV, F.MASS < 2590 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 1.3 * GeV, F.P > 17 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -3898,11 +3899,11 @@ def xicz_to_lpipi_ll_line(name="Hlt2Charm_Xic0ToL0PimPip_LL"): name='Charm_Hyperons_Xic0ToL0PimPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 100 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 100 * um, + F.SDOCA(2, 3) < 200 * um, F.math.in_range(2250 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3935,11 +3936,11 @@ def xicz_to_lpipi_dd_line(name="Hlt2Charm_Xic0ToL0PimPip_DD"): name='Charm_Hyperons_Xic0ToL0PimPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(800 * um), + F.MAXSDOCACUT(800 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 800 * um, - F.DOCA(2, 3) < 150 * um, + F.SDOCA(1, 3) < 800 * um, + F.SDOCA(2, 3) < 150 * um, F.math.in_range(2250 * MeV, F.MASS, 2590 * MeV), F.MAX(F.MINIPCHI2(pvs)) > 9., F.PT > 1.3 * GeV, @@ -3973,11 +3974,11 @@ def xicz_to_lkpi_ll_line(name="Hlt2Charm_Xic0ToL0KmPip_LL"): name='Charm_Hyperons_Xic0ToL0KmPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 150 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 150 * um, + F.SDOCA(2, 3) < 250 * um, F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4011,11 +4012,11 @@ def xicz_to_lkpi_dd_line(name="Hlt2Charm_Xic0ToL0KmPip_DD"): name='Charm_Hyperons_Xic0ToL0KmPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(700 * um), + F.MAXSDOCACUT(700 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 800 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 800 * um, + F.SDOCA(2, 3) < 250 * um, F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), F.MAX(F.MINIPCHI2(pvs)) > 9., F.PT > 1.3 * GeV, @@ -4148,11 +4149,11 @@ def xicz_to_lkk_ll_line(name="Hlt2Charm_Xic0ToL0KmKp_LL"): name='Charm_Hyperons_Xic0ToL0KmKp_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 100 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 100 * um, + F.SDOCA(2, 3) < 200 * um, F.math.in_range(2280 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4184,11 +4185,11 @@ def xicz_to_lkk_dd_line(name="Hlt2Charm_Xic0ToL0KmKp_DD"): name='Charm_Hyperons_Xic0ToL0KmKp_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 750 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 750 * um, + F.SDOCA(2, 3) < 250 * um, F.math.in_range(2280 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4221,11 +4222,11 @@ def xicz_to_ximkspi_ll_line(name="Hlt2Charm_Xic0ToXimKsPip_LLLLL"): name='Charm_Hyperons_Xic0ToXimKsPip_LLLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(250 * um), + F.MAXSDOCACUT(250 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 150 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 150 * um, + F.SDOCA(2, 3) < 200 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4262,11 +4263,11 @@ def xicz_to_ximkspi_ld_line(name="Hlt2Charm_Xic0ToXimKsPip_LLLDD"): name='Charm_Hyperons_Xic0ToXimKsPip_LLLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 150 * um, - F.DOCA(2, 3) < 1 * mm, + F.SDOCA(1, 3) < 150 * um, + F.SDOCA(2, 3) < 1 * mm, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4301,11 +4302,11 @@ def xicz_to_ximkspi_dl_line(name="Hlt2Charm_Xic0ToXimKsPip_DDLLL"): name='Charm_Hyperons_Xic0ToXimKsPip_DDLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 750 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 750 * um, + F.SDOCA(2, 3) < 200 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4341,11 +4342,11 @@ def xicz_to_ximkspi_dd_line(name="Hlt2Charm_Xic0ToXimKsPip_DDLDD"): name='Charm_Hyperons_Xic0ToXimKsPip_DDLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 750 * um, - F.DOCA(2, 3) < 1 * mm, + F.SDOCA(1, 3) < 750 * um, + F.SDOCA(2, 3) < 1 * mm, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4381,11 +4382,11 @@ def xicz_to_ximksk_ll_line(name="Hlt2Charm_Xic0ToXimKsKp_LLLLL"): name='Charm_Hyperons_Xic0ToXimKsKp_LLLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXDOCACUT(250 * um), + F.MAXSDOCACUT(250 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 150 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 150 * um, + F.SDOCA(2, 3) < 200 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4421,11 +4422,11 @@ def xicz_to_ximksk_ld_line(name="Hlt2Charm_Xic0ToXimKsKp_LLLDD"): name='Charm_Hyperons_Xic0ToXimKsKp_LLLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 150 * um, - F.DOCA(2, 3) < 1 * mm, + F.SDOCA(1, 3) < 150 * um, + F.SDOCA(2, 3) < 1 * mm, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4461,11 +4462,11 @@ def xicz_to_ximksk_dl_line(name="Hlt2Charm_Xic0ToXimKsKp_DDLLL"): name='Charm_Hyperons_Xic0ToXimKsKp_DDLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 750 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 750 * um, + F.SDOCA(2, 3) < 200 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4501,11 +4502,11 @@ def xicz_to_ximksk_dd_line(name="Hlt2Charm_Xic0ToXimKsKp_DDLDD"): name='Charm_Hyperons_Xic0ToXimKsKp_DDLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 750 * um, - F.DOCA(2, 3) < 1 * mm, + F.SDOCA(1, 3) < 750 * um, + F.SDOCA(2, 3) < 1 * mm, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4543,11 +4544,11 @@ def oc_to_lkpi_ll_line(name="Hlt2Charm_Oc0ToL0KmPip_LL"): name='Charm_Hyperons_Oc0ToL0KmPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2675 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 150 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 150 * um, + F.SDOCA(2, 3) < 250 * um, F.math.in_range(2470 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4583,11 +4584,11 @@ def oc_to_lkpi_dd_line(name="Hlt2Charm_Oc0ToL0KmPip_DD"): name='Charm_Hyperons_Oc0ToL0KmPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2675 * MeV, - F.MAXDOCACUT(700 * um), + F.MAXSDOCACUT(700 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 800 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 800 * um, + F.SDOCA(2, 3) < 250 * um, F.math.in_range(2470 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4619,11 +4620,11 @@ def oc_to_lkk_ll_line(name="Hlt2Charm_Oc0ToL0KmKp_LL"): name='Charm_Hyperons_Oc0ToL0KmKp_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2320 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 100 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 100 * um, + F.SDOCA(2, 3) < 200 * um, F.math.in_range(2490 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4655,11 +4656,11 @@ def oc_to_lkk_dd_line(name="Hlt2Charm_Oc0ToL0KmKp_DD"): name='Charm_Hyperons_Oc0ToL0KmKp_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2320 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 750 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 750 * um, + F.SDOCA(2, 3) < 250 * um, F.math.in_range(2490 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4692,11 +4693,11 @@ def oc_to_ximkspi_ll_line(name="Hlt2Charm_Oc0ToXimKsPip_LLLLL"): name='Charm_Hyperons_Oc0ToXimKsPip_LLLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2675 * MeV, - F.MAXDOCACUT(250 * um), + F.MAXSDOCACUT(250 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 150 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 150 * um, + F.SDOCA(2, 3) < 200 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4731,11 +4732,11 @@ def oc_to_ximkspi_ld_line(name="Hlt2Charm_Oc0ToXimKsPip_LLLDD"): name='Charm_Hyperons_Oc0ToXimKsPip_LLLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2675 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 150 * um, - F.DOCA(2, 3) < 1 * mm, + F.SDOCA(1, 3) < 150 * um, + F.SDOCA(2, 3) < 1 * mm, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4769,11 +4770,11 @@ def oc_to_ximkspi_dl_line(name="Hlt2Charm_Oc0ToXimKsPip_DDLLL"): name='Charm_Hyperons_Oc0ToXimKsPip_DDLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2675 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 750 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 750 * um, + F.SDOCA(2, 3) < 200 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4808,11 +4809,11 @@ def oc_to_ximkspi_dd_line(name="Hlt2Charm_Oc0ToXimKsPip_DDLDD"): name='Charm_Hyperons_Oc0ToXimKsPip_DDLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2675 * MeV, - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 750 * um, - F.DOCA(2, 3) < 1 * mm, + F.SDOCA(1, 3) < 750 * um, + F.SDOCA(2, 3) < 1 * mm, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4856,19 +4857,19 @@ def lc_to_l0pipipi_ll_line(name="Hlt2Charm_LcpToL0PimPipPip_LL"): name='Charm_Hyperons_LcpToL0PimPipPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXDOCACUT(200 * um), + F.MAXSDOCACUT(200 * um), ), Combination123Cut=F.require_all( F.MASS < 2240 * MeV, - F.DOCA(1, 3) < 250 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 250 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( F.math.in_range(2201 * MeV, F.MASS, 2371 * MeV), # F.PT > None, # 1.3 * GeV # Possible cuts for future tunning # F.P > None, # 28 * GeV # Possible cuts for future tunning F.SUM(F.PT) > 1.8 * GeV, - F.MAXDOCACUT(250. * um), + F.MAXSDOCACUT(250. * um), F.MAXSDOCACHI2CUT(12.), ), CompositeCut=F.require_all( @@ -4899,21 +4900,21 @@ def lc_to_l0pipipi_dd_line(name="Hlt2Charm_LcpToL0PimPipPip_DD"): name='LcpToL0PimPipPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), ), Combination123Cut=F.require_all( F.MASS < 2240 * MeV, - F.DOCA(1, 3) < 2 * mm, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 2 * mm, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(2, 4) < 250 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(2, 4) < 250 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2201 * MeV, F.MASS, 2371 * MeV), # F.PT > None, # 1.3 * GeV # Possible cuts for future tunning # F.P > None, # 28 * GeV # Possible cuts for future tunning F.SUM(F.PT) > 1.8 * GeV, - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), F.MAXSDOCACHI2CUT(12.), ), CompositeCut=F.require_all( @@ -4947,17 +4948,17 @@ def lc_to_lkkpi_ll_line(name="Hlt2Charm_LcpToL0KmKpPip_LL"): name='Charm_Hyperons_LcpToL0KmKpPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 1775 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2265 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.MASS < 2405 * MeV, F.PT > 1.1 * GeV, F.P > 23 * GeV, @@ -4992,17 +4993,17 @@ def lc_to_lkkpi_dd_line(name="Hlt2Charm_LcpToL0KmKpPip_DD"): name='Charm_Hyperons_LcpToL0KmKpPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 1775 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), ), Combination123Cut=F.require_all( F.MASS < 2265 * MeV, - F.DOCA(1, 3) < 750 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 750 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 800 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 800 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.MASS < 2405 * MeV, F.PT > 1.3 * GeV, F.P > 23 * GeV, @@ -5036,17 +5037,17 @@ def lc_to_ximkspipi_ll_line(name="Hlt2Charm_LcpToXimKsPipPip_LLLLL"): name='Charm_Hyperons_LcpToXimKsPipPip_LLLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2125 * MeV, - F.MAXDOCACUT(250 * um), + F.MAXSDOCACUT(250 * um), ), Combination123Cut=F.require_all( F.MASS < 2265 * MeV, - F.DOCA(1, 3) < 150 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 150 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 250 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 250 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2165 * MeV, F.MASS, 2405 * MeV), F.PT > 1.1 * GeV, F.P > 23 * GeV, @@ -5083,17 +5084,17 @@ def lc_to_ximkspipi_ld_line(name="Hlt2Charm_LcpToXimKsPipPip_LLLDD"): name='Charm_Hyperons_LcpToXimKsPipPip_LLLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2125 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), Combination123Cut=F.require_all( F.MASS < 2265 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 1 * mm, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 1 * mm, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 1 * mm, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 1 * mm, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2165 * MeV, F.MASS, 2405 * MeV), F.PT > 1.2 * GeV, F.P > 24 * GeV, @@ -5129,17 +5130,17 @@ def lc_to_ximkspipi_dl_line(name="Hlt2Charm_LcpToXimKsPipPip_DDLLL"): name='Charm_Hyperons_LcpToXimKsPipPip_DDLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2125 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), ), Combination123Cut=F.require_all( F.MASS < 2265 * MeV, - F.DOCA(1, 3) < 800 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 800 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 800 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 800 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2165 * MeV, F.MASS, 2405 * MeV), F.PT > 1.2 * GeV, F.P > 24 * GeV, @@ -5176,17 +5177,17 @@ def lc_to_ximkspipi_dd_line(name="Hlt2Charm_LcpToXimKsPipPip_DDLDD"): name='Charm_Hyperons_LcpToXimKsPipPip_DDLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2125 * MeV, - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), ), Combination123Cut=F.require_all( F.MASS < 2265 * MeV, - F.DOCA(1, 3) < 750 * um, - F.DOCA(2, 3) < 1 * mm, + F.SDOCA(1, 3) < 750 * um, + F.SDOCA(2, 3) < 1 * mm, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 750 * um, - F.DOCA(2, 4) < 1 * mm, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 750 * um, + F.SDOCA(2, 4) < 1 * mm, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2165 * MeV, F.MASS, 2405 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5222,17 +5223,17 @@ def xicp_to_lkkpi_ll_line(name="Hlt2Charm_XicpToL0KmKpPip_LL"): name='Charm_Hyperons_XicpToL0KmKpPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 1957 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2300 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5265,17 +5266,17 @@ def xicp_to_lkkpi_dd_line(name="Hlt2Charm_XicpToL0KmKpPip_DD"): name='Charm_Hyperons_XicpToL0KmKpPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 1957 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.DOCA(1, 3) < 750 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 750 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 800 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 800 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2300 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 23 * GeV, @@ -5308,17 +5309,17 @@ def xicp_to_lkpipi_ll_line(name="Hlt2Charm_XicpToL0KmPipPip_LL"): name='Charm_Hyperons_XicpToL0KmPipPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2270 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5351,17 +5352,17 @@ def xicp_to_lkpipi_dd_line(name="Hlt2Charm_XicpToL0KmPipPip_DD"): name='Charm_Hyperons_XicpToL0KmPipPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.DOCA(1, 3) < 750 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 750 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 800 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 800 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2270 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 23 * GeV, @@ -5394,17 +5395,17 @@ def xicz_to_lkspipi_ll_line(name="Hlt2Charm_Xic0ToL0KsPimPip_LLLL"): name='Charm_Hyperons_Xic0ToL0KsPimPip_LLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXDOCACUT(300 * um), + F.MAXSDOCACUT(300 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 250 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 250 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 250 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2270 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5439,17 +5440,17 @@ def xicz_to_lkspipi_dl_line(name="Hlt2Charm_Xic0ToL0KsPimPip_DDLL"): name='Charm_Hyperons_Xic0ToL0KsPimPip_DDLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.DOCA(1, 3) < 600 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 600 * um, + F.SDOCA(2, 3) < 250 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 600 * um, - F.DOCA(2, 4) < 250 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 600 * um, + F.SDOCA(2, 4) < 250 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2270 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5483,17 +5484,17 @@ def xicz_to_lkspipi_ld_line(name="Hlt2Charm_Xic0ToL0KsPimPip_LLDD"): name='Charm_Hyperons_Xic0ToL0KsPimPip_LLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 800 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 800 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 800 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 800 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2270 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5528,17 +5529,17 @@ def xicz_to_xim3pi_lll_line(name="Hlt2Charm_Xic0ToXimPimPipPip_LLL"): name='Charm_Hyperons_Xic0ToXimPimPipPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5572,17 +5573,17 @@ def xicz_to_xim3pi_ddl_line(name="Hlt2Charm_Xic0ToXimPimPipPip_DDL"): name='Charm_Hyperons_Xic0ToXimPimPipPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.DOCA(1, 3) < 800 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 800 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 800 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 800 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5618,17 +5619,17 @@ def xicz_to_omkppippim_lll_line(name="Hlt2Charm_Xic0ToOmKpPimPip_LLL"): name='Charm_Hyperons_Xic0ToOmKpPimPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.MASS < 2590 * MeV, F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5663,17 +5664,17 @@ def xicz_to_omkppippim_ddl_line(name="Hlt2Charm_Xic0ToOmKpPimPip_DDL"): name='Charm_Hyperons_Xic0ToOmKpPimPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXDOCACUT(750 * um), + F.MAXSDOCACUT(750 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.DOCA(1, 3) < 800 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 800 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 800 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 800 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.MASS < 2590 * MeV, F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5709,17 +5710,17 @@ def oc_to_lkskpi_ll_line(name="Hlt2Charm_Oc0ToL0KsKmPip_LLLL"): name='Charm_Hyperons_Oc0ToL0KsKmPip_LLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2182 * MeV, - F.MAXDOCACUT(300 * um), + F.MAXSDOCACUT(300 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 250 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 250 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 250 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2470 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5755,17 +5756,17 @@ def oc_to_lkskpi_dl_line(name="Hlt2Charm_Oc0ToL0KsKmPip_DDLL"): name='Charm_Hyperons_Oc0ToL0KsKmPip_DDLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2182 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.DOCA(1, 3) < 600 * um, - F.DOCA(2, 3) < 250 * um, + F.SDOCA(1, 3) < 600 * um, + F.SDOCA(2, 3) < 250 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 600 * um, - F.DOCA(2, 4) < 250 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 600 * um, + F.SDOCA(2, 4) < 250 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2470 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5800,17 +5801,17 @@ def oc_to_lkskpi_ld_line(name="Hlt2Charm_Oc0ToL0KsKmPip_LLDD"): name='Charm_Hyperons_Oc0ToL0KsKmPip_LLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2182 * MeV, - F.MAXDOCACUT(1 * mm), + F.MAXSDOCACUT(1 * mm), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 800 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 800 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 800 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 800 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2470 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5846,17 +5847,17 @@ def oc_to_ximkpipi_lll_line(name="Hlt2Charm_Oc0ToXimKmPipPip_LLL"): name='Charm_Hyperons_Oc0ToXimKmPipPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2535 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5891,17 +5892,17 @@ def oc_to_ximkpipi_ddl_line(name="Hlt2Charm_Oc0ToXimKmPipPip_DDL"): name='Charm_Hyperons_Oc0ToXimKmPipPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2535 * MeV, - F.MAXDOCACUT(800 * um), + F.MAXSDOCACUT(800 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.DOCA(1, 3) < 1 * mm, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 1 * mm, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 1 * mm, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 1 * mm, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5936,17 +5937,17 @@ def oc_to_om3pi_lll_line(name="Hlt2Charm_Oc0ToOmPimPipPip_LLL"): name='Charm_Hyperons_Oc0ToOmPimPipPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2515 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5980,17 +5981,17 @@ def oc_to_om3pi_ddl_line(name="Hlt2Charm_Oc0ToOmPimPipPip_DDL"): name='Charm_Hyperons_Oc0ToOmPimPipPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2515 * MeV, - F.MAXDOCACUT(800 * um), + F.MAXSDOCACUT(800 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.DOCA(1, 3) < 1 * mm, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 1 * mm, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 1 * mm, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 1 * mm, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -6026,17 +6027,17 @@ def oc_to_omkppipi_lll_line(name="Hlt2Charm_Oc0ToOmKpPimPip_LLL"): name='Charm_Hyperons_Oc0ToOmKpPimPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2515 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -6071,17 +6072,17 @@ def oc_to_omkppipi_ddl_line(name="Hlt2Charm_Oc0ToOmKpPimPip_DDL"): name='Charm_Hyperons_Oc0ToOmKpPimPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2515 * MeV, - F.MAXDOCACUT(800 * um), + F.MAXSDOCACUT(800 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.DOCA(1, 3) < 1 * mm, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 1 * mm, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 1 * mm, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 1 * mm, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py index 24fd7460fdd..32b58258ae1 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py @@ -184,7 +184,7 @@ def _make_ttl_xis(): F.MASS < 1800 * MeV, F.PT > 1. * GeV, F.P > 30. * GeV, - F.MAXDOCACUT(20.0 * mm), + F.MAXSDOCACUT(20.0 * mm), F.MAXSDOCACHI2CUT(3.0), ), CompositeCut=F.require_all( @@ -212,7 +212,7 @@ def _make_ttd_xis(): F.MASS < 1800 * MeV, F.PT > 1. * GeV, F.P > 25. * GeV, - F.MAXDOCACUT(25.0 * mm), + F.MAXSDOCACUT(25.0 * mm), F.MAXSDOCACHI2CUT(3.0), ), CompositeCut=F.require_all( @@ -245,7 +245,7 @@ def xicz_to_ximpi_ttl_l_line(name="Hlt2Charm_Xic0ToXimPip_TTL_L"): F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 1. * GeV, F.P > 40. * GeV, - F.MAXDOCACUT(10 * mm), + F.MAXSDOCACUT(10 * mm), F.MAXSDOCACHI2CUT(3.), ), CompositeCut=F.require_all( @@ -285,7 +285,7 @@ def xicz_to_ximpi_ttd_l_line(name="Hlt2Charm_Xic0ToXimPip_TTD_L"): F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 1. * GeV, F.P > 40. * GeV, - F.MAXDOCACUT(10 * mm), + F.MAXSDOCACUT(10 * mm), F.MAXSDOCACHI2CUT(3.), ), CompositeCut=F.require_all( @@ -325,7 +325,7 @@ def xicz_to_ximpi_ttd_d_line(name="Hlt2Charm_Xic0ToXimPip_TTD_D"): F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 1. * GeV, F.P > 25. * GeV, - F.MAXDOCACUT(20 * mm), + F.MAXSDOCACUT(20 * mm), F.MAXSDOCACHI2CUT(3.), ), CompositeCut=F.require_all( @@ -363,14 +363,14 @@ def xicp_to_ximpipi_ttl_ll_line(name="Hlt2Charm_XicpToXimPipPip_TTL_LL"): name="Charm_Hyperons_XicpToXimPipPip_TTL_LL_{hash}", Combination12Cut=F.require_all( F.math.in_range(1460 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(20 * mm), + F.MAXSDOCACUT(20 * mm), ), CombinationCut=F.require_all( F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 1. * GeV, F.P > 40. * GeV, - F.DOCA(1, 3) < 20 * mm, - F.DOCA(2, 3) < 0.2 * mm, + F.SDOCA(1, 3) < 20 * mm, + F.SDOCA(2, 3) < 0.2 * mm, F.MAXSDOCACHI2CUT(5.), ), CompositeCut=F.require_all( @@ -408,14 +408,14 @@ def xicp_to_ximpipi_ttd_ll_line(name="Hlt2Charm_XicpToXimPipPip_TTD_LL"): name="Charm_Hyperons_XicpToXimPipPip_TTD_LL_{hash}", Combination12Cut=F.require_all( F.math.in_range(1460 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(20 * mm), + F.MAXSDOCACUT(20 * mm), ), CombinationCut=F.require_all( F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 1. * GeV, F.P > 40. * GeV, - F.DOCA(1, 3) < 20 * mm, - F.DOCA(2, 3) < 0.2 * mm, + F.SDOCA(1, 3) < 20 * mm, + F.SDOCA(2, 3) < 0.2 * mm, F.MAXSDOCACHI2CUT(5.), ), CompositeCut=F.require_all( @@ -453,14 +453,14 @@ def xicp_to_ximpipi_ttd_dd_line(name="Hlt2Charm_XicpToXimPipPip_TTD_DD"): name="Charm_Hyperons_XicpToXimPipPip_TTD_DD_{hash}", Combination12Cut=F.require_all( F.math.in_range(1460 * MeV, F.MASS, 2600 * MeV), - F.MAXDOCACUT(25 * mm), + F.MAXSDOCACUT(25 * mm), ), CombinationCut=F.require_all( F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 0.8 * GeV, F.P > 20. * GeV, - F.DOCA(1, 3) < 25 * mm, - F.DOCA(2, 3) < 1.2 * mm, + F.SDOCA(1, 3) < 25 * mm, + F.SDOCA(2, 3) < 1.2 * mm, F.MAXSDOCACHI2CUT(30.), ), CompositeCut=F.require_all( @@ -499,14 +499,14 @@ def xicz_to_lkpi_tt_ll_line(name="Hlt2Charm_Xic0ToL0KmPip_TT_LL"): name="Charm_Hyperons_Xic0ToL0KmPip_TT_LL_{hash}", Combination12Cut=F.require_all( F.math.in_range(1600 * MeV, F.MASS, 2800 * MeV), - F.MAXDOCACUT(15 * mm), + F.MAXSDOCACUT(15 * mm), ), CombinationCut=F.require_all( F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 1.5 * GeV, F.P > 40. * GeV, - F.DOCA(1, 3) < 15 * mm, - F.DOCA(2, 3) < 0.1 * mm, + F.SDOCA(1, 3) < 15 * mm, + F.SDOCA(2, 3) < 0.1 * mm, F.MAXSDOCACHI2CUT(5.), ), CompositeCut=F.require_all( @@ -544,14 +544,14 @@ def xicz_to_lkpi_tt_dd_line(name="Hlt2Charm_Xic0ToL0KmPip_TT_DD"): name="Charm_Hyperons_Xic0ToL0KmPip_TT_DD_{hash}", Combination12Cut=F.require_all( F.math.in_range(1600 * MeV, F.MASS, 2800 * MeV), - F.MAXDOCACUT(15 * mm), + F.MAXSDOCACUT(15 * mm), ), CombinationCut=F.require_all( F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 0.8 * GeV, F.P > 20. * GeV, - F.DOCA(1, 3) < 30 * mm, - F.DOCA(2, 3) < 1.2 * mm, + F.SDOCA(1, 3) < 30 * mm, + F.SDOCA(2, 3) < 1.2 * mm, F.MAXSDOCACHI2CUT(10.), ), CompositeCut=F.require_all( @@ -588,22 +588,22 @@ def lc_to_l0pipipi_tt_lll_line(name="Hlt2Charm_LcpToL0PimPipPip_TT_LLL"): name='Charm_Hyperons_LcpToL0PimPipPip_TT_LLL_{hash}', Combination12Cut=F.require_all( F.math.in_range(1400 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(50 * mm), + F.MAXSDOCACUT(50 * mm), ), Combination123Cut=F.require_all( F.math.in_range(1600 * MeV, F.MASS, 2900 * MeV), - F.DOCA(1, 2) < 30 * mm, - F.DOCA(2, 3) < 0.12 * mm, + F.SDOCA(1, 2) < 30 * mm, + F.SDOCA(2, 3) < 0.12 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 2800 * MeV), F.PT > 2 * GeV, F.P > 20 * GeV, F.SUM(F.PT) > 3. * GeV, - F.DOCA(1, 4) < 30 * mm, - F.DOCA(2, 4) < 0.12 * mm, - F.DOCA(3, 4) < 0.12 * mm, - F.MAXDOCACUT(30. * mm), + F.SDOCA(1, 4) < 30 * mm, + F.SDOCA(2, 4) < 0.12 * mm, + F.SDOCA(3, 4) < 0.12 * mm, + F.MAXSDOCACUT(30. * mm), F.MAXSDOCACHI2CUT(8.), ), CompositeCut=F.require_all( @@ -639,22 +639,22 @@ def lc_to_l0pipipi_tt_ddd_line(name="Hlt2Charm_LcpToL0PimPipPip_TT_DDD"): name='Charm_Hyperons_LcpToL0PimPipPip_TT_DDD_{hash}', Combination12Cut=F.require_all( F.math.in_range(1400 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(50 * mm), + F.MAXSDOCACUT(50 * mm), ), Combination123Cut=F.require_all( F.math.in_range(1600 * MeV, F.MASS, 2900 * MeV), - F.DOCA(1, 2) < 30 * mm, - F.DOCA(2, 3) < 0.12 * mm, + F.SDOCA(1, 2) < 30 * mm, + F.SDOCA(2, 3) < 0.12 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 2800 * MeV), F.PT > 2 * GeV, F.P > 20 * GeV, F.SUM(F.PT) > 3. * GeV, - F.DOCA(1, 4) < 30 * mm, - F.DOCA(2, 4) < 0.12 * mm, - F.DOCA(3, 4) < 0.12 * mm, - F.MAXDOCACUT(30. * mm), + F.SDOCA(1, 4) < 30 * mm, + F.SDOCA(2, 4) < 0.12 * mm, + F.SDOCA(3, 4) < 0.12 * mm, + F.MAXSDOCACUT(30. * mm), F.MAXSDOCACHI2CUT(8.), ), CompositeCut=F.require_all( @@ -691,22 +691,22 @@ def xicp_to_lkpipi_tt_lll_line(name="Hlt2Charm_XicpToL0KmPipPip_TT_LLL"): name='Charm_Hyperons_XicpToL0KmPipPip_TT_LLL_{hash}', Combination12Cut=F.require_all( F.math.in_range(1800 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(50 * mm), + F.MAXSDOCACUT(50 * mm), ), Combination123Cut=F.require_all( F.MASS < 3000 * MeV, - F.DOCA(1, 2) < 30 * mm, - F.DOCA(2, 3) < 0.12 * mm, + F.SDOCA(1, 2) < 30 * mm, + F.SDOCA(2, 3) < 0.12 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 2900 * MeV), F.PT > 2 * GeV, F.P > 20 * GeV, F.SUM(F.PT) > 3. * GeV, - F.DOCA(1, 4) < 30 * mm, - F.DOCA(2, 4) < 0.12 * mm, - F.DOCA(3, 4) < 0.12 * mm, - F.MAXDOCACUT(30. * mm), + F.SDOCA(1, 4) < 30 * mm, + F.SDOCA(2, 4) < 0.12 * mm, + F.SDOCA(3, 4) < 0.12 * mm, + F.MAXSDOCACUT(30. * mm), F.MAXSDOCACHI2CUT(8.), ), CompositeCut=F.require_all( @@ -743,22 +743,22 @@ def xicp_to_lkpipi_tt_ddd_line(name="Hlt2Charm_XicpToL0KmPipPip_TT_DDD"): name='Charm_Hyperons_XicpToL0KmPipPip_TT_DDD_{hash}', Combination12Cut=F.require_all( F.math.in_range(1800 * MeV, F.MASS, 3000 * MeV), - F.MAXDOCACUT(50 * mm), + F.MAXSDOCACUT(50 * mm), ), Combination123Cut=F.require_all( F.MASS < 3000 * MeV, - F.DOCA(1, 2) < 30 * mm, - F.DOCA(2, 3) < 0.12 * mm, + F.SDOCA(1, 2) < 30 * mm, + F.SDOCA(2, 3) < 0.12 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 2900 * MeV), F.PT > 2 * GeV, F.P > 20 * GeV, F.SUM(F.PT) > 3 * GeV, - F.DOCA(1, 4) < 30 * mm, - F.DOCA(2, 4) < 0.12 * mm, - F.DOCA(3, 4) < 0.12 * mm, - F.MAXDOCACUT(30. * mm), + F.SDOCA(1, 4) < 30 * mm, + F.SDOCA(2, 4) < 0.12 * mm, + F.SDOCA(3, 4) < 0.12 * mm, + F.MAXSDOCACUT(30. * mm), F.MAXSDOCACHI2CUT(8.), ), CompositeCut=F.require_all( @@ -794,22 +794,22 @@ def xicz_to_xim3pi_ttl_lll_line(name="Hlt2Charm_Xic0ToXimPimPipPip_TTL_LLL"): name='Charm_Hyperons_Xic0ToXimPimPipPip_TTL_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 3000 * MeV, - F.MAXDOCACUT(40 * mm), + F.MAXSDOCACUT(40 * mm), ), Combination123Cut=F.require_all( F.MASS < 3000 * MeV, - F.DOCA(1, 3) < 20 * mm, - F.DOCA(2, 3) < 0.2 * mm, + F.SDOCA(1, 3) < 20 * mm, + F.SDOCA(2, 3) < 0.2 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 3000 * MeV), F.PT > 2 * GeV, F.P > 20 * GeV, F.SUM(F.PT) > 3 * GeV, - F.DOCA(1, 4) < 20 * mm, - F.DOCA(2, 4) < 0.2 * mm, - F.DOCA(3, 4) < 0.2 * mm, - F.MAXDOCACUT(30. * mm), + F.SDOCA(1, 4) < 20 * mm, + F.SDOCA(2, 4) < 0.2 * mm, + F.SDOCA(3, 4) < 0.2 * mm, + F.MAXSDOCACUT(30. * mm), F.MAXSDOCACHI2CUT(20.), ), CompositeCut=F.require_all( @@ -846,22 +846,22 @@ def xicz_to_xim3pi_ttd_lll_line(name="Hlt2Charm_Xic0ToXimPimPipPip_TTD_LLL"): name='Charm_Hyperons_Xic0ToXimPimPipPip_TTD_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 3000 * MeV, - F.MAXDOCACUT(40 * mm), + F.MAXSDOCACUT(40 * mm), ), Combination123Cut=F.require_all( F.MASS < 3000 * MeV, - F.DOCA(1, 3) < 20 * mm, - F.DOCA(2, 3) < 0.2 * mm, + F.SDOCA(1, 3) < 20 * mm, + F.SDOCA(2, 3) < 0.2 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 3000 * MeV), F.PT > 2 * GeV, F.P > 20 * GeV, F.SUM(F.PT) > 3 * GeV, - F.DOCA(1, 4) < 20 * mm, - F.DOCA(2, 4) < 0.2 * mm, - F.DOCA(3, 4) < 0.2 * mm, - F.MAXDOCACUT(30. * mm), + F.SDOCA(1, 4) < 20 * mm, + F.SDOCA(2, 4) < 0.2 * mm, + F.SDOCA(3, 4) < 0.2 * mm, + F.MAXSDOCACUT(30. * mm), F.MAXSDOCACHI2CUT(20.), ), CompositeCut=F.require_all( @@ -898,22 +898,22 @@ def xicz_to_xim3pi_ttd_ddd_line(name="Hlt2Charm_Xic0ToXimPimPipPip_TTD_DDD"): name='Charm_Hyperons_Xic0ToXimPimPipPip_TTD_DDD_{hash}', Combination12Cut=F.require_all( F.MASS < 3000 * MeV, - F.MAXDOCACUT(40 * mm), + F.MAXSDOCACUT(40 * mm), ), Combination123Cut=F.require_all( F.MASS < 3000 * MeV, - F.DOCA(1, 3) < 30 * mm, - F.DOCA(2, 3) < 0.3 * mm, + F.SDOCA(1, 3) < 30 * mm, + F.SDOCA(2, 3) < 0.3 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 3000 * MeV), F.PT > 1 * GeV, F.P > 10 * GeV, F.SUM(F.PT) > 2 * GeV, - F.DOCA(1, 4) < 30 * mm, - F.DOCA(2, 4) < 0.3 * mm, - F.DOCA(3, 4) < 0.3 * mm, - F.MAXDOCACUT(30. * mm), + F.SDOCA(1, 4) < 30 * mm, + F.SDOCA(2, 4) < 0.3 * mm, + F.SDOCA(3, 4) < 0.3 * mm, + F.MAXSDOCACUT(30. * mm), F.MAXSDOCACHI2CUT(20.), ), CompositeCut=F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py index 54f9fd32b38..cf1282258ac 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py @@ -131,7 +131,7 @@ def make_ks_ll( ): """Make KS -> pi+ pi- from long tracks.""" comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXSDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), @@ -170,7 +170,7 @@ def make_ks_dd( ): """Make KS -> pi+ pi- from downstream tracks.""" comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), F.MAXSDOCACHI2CUT(docachi2_max), + F.MAXSDOCACUT(doca_max), F.MAXSDOCACHI2CUT(docachi2_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( @@ -221,7 +221,7 @@ def combine_lc_ks_h( Cuts generally based on Run2 Turbo lines. """ comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXSDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( @@ -273,7 +273,7 @@ def combine_lc_ks_hhh( Cuts generally based on Run2 Turbo lines. """ comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXSDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( @@ -324,7 +324,7 @@ def combine_lc_ks_ks_p( Cuts generally based on Run2 Turbo lines. """ comb_cut = F.require_all( - F.MAXDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXSDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/prod_xsec.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/prod_xsec.py index febcb6f43f7..bfeb8daa3ab 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/prod_xsec.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/prod_xsec.py @@ -237,7 +237,7 @@ def _xsec_make_dzeros_Kpi( CombinationCut=F.require_all( F.SUM(F.PT) > sum_pt_min, in_range(_D0_M - comb_m_window, F.MASS, _D0_M + comb_m_window), - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), ), CompositeCut=F.require_all( F.CHI2DOF < vchi2dof_max, @@ -292,7 +292,7 @@ def _xsec_make_dzeros_Kpipipi( CombinationCut=F.require_all( F.SUM(F.PT) > sum_pt_min, in_range(_D0_M - comb_m_window, F.MASS, _D0_M + comb_m_window), - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), F.SUM(F.MINIPCHI2(make_pvs())) > sum_mipchi2_min, ), CompositeCut=F.require_all( @@ -358,7 +358,7 @@ def _xsec_make_dplus_Kpipi( F.SUM(F.PT) > sum_pt_min, in_range(_DP_M - comb_m_window, F.MASS, _DP_M + comb_m_window), F.SUM(F.MINIPCHI2(make_pvs())) > sum_mipchi2_min, - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), ), CompositeCut=F.require_all( F.CHI2DOF < vchi2dof_max, @@ -424,7 +424,7 @@ def _xsec_make_dplus_KKpi( F.SUM(F.PT) > sum_pt_min, in_range(_DP_M - comb_m_window, F.MASS, _DS_M + comb_m_window), F.SUM(F.MINIPCHI2(make_pvs())) > sum_mipchi2_min, - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), ), CompositeCut=F.require_all( F.CHI2DOF < vchi2dof_max, @@ -802,7 +802,7 @@ def _xsec_make_lc_or_xicp_pKpi( F.SUM( F.MINIPCHI2CUT( IPChi2Cut=mipchi2_min_at_least_two, Vertices=pvs)) >= 2, - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), F.SUM(F.MINIPCHI2(pvs)) > sum_mipchi2_min, ), CompositeCut=F.require_all(F.CHI2DOF < vchi2dof_max, @@ -906,7 +906,7 @@ def _xsec_make_xic0_pkkpi( F.SUM(F.PT > comb_pt_min_at_least_two) >= 2, F.SUM(F.MINIPCHI2(pvs) > comb_mipchi2_min_at_least_one) >= 1, F.SUM(F.MINIPCHI2(pvs) > comb_mipchi2_min_at_least_two) >= 2, - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), F.SUM(F.MINIPCHI2(pvs)) > sum_mipchi2_min, #not so powerful for the rate reduction ), @@ -1248,7 +1248,7 @@ def _xsec_make_dzero_Kshh(kshort, CombinationCut=F.require_all( in_range(_D0_M - comb_m_window, F.MASS, _D0_M + comb_m_window), F.SUM(F.PT) > sum_pt_min, - F.DOCA(2, 3) < doca23_max, + F.SDOCA(2, 3) < doca23_max, ), CompositeCut=F.require_all( in_range(_D0_M - m_window, F.MASS, _D0_M + m_window), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py index b3a9194beea..f7073165a2c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py @@ -709,7 +709,7 @@ def make_ll_ks(pion1, """Returns maker for KS0 -> pi+ pi- constructed with two long pions.""" combination_code = F.require_all( in_range(mmin - 15 * MeV, F.MASS, mmax + 15 * MeV), - F.MAXDOCACUT(doca_max), F.PT > comb_pt_min) + F.MAXSDOCACUT(doca_max), F.PT > comb_pt_min) vertex_code = F.require_all( in_range(mmin, F.MASS, mmax), F.CHI2DOF < vchi2pdof_max, F.PT > pt_min, @@ -740,7 +740,7 @@ def make_dd_ks(pion1, combination_code = F.require_all( in_range(mmin - 15 * MeV, F.MASS, mmax + 15 * MeV), - F.MAXDOCACUT(doca_max), F.PT > comb_pt_min) + F.MAXSDOCACUT(doca_max), F.PT > comb_pt_min) vertex_code = F.require_all( in_range(mmin, F.MASS, mmax), F.CHI2DOF < vchi2pdof_max, F.PT > pt_min, @@ -897,7 +897,7 @@ def make_rarecharm_displaced_HadronLepton( # for LNV D->hhmumu with two seperat PID and pt cuts could directly be applied in make_rarecharm_muons and make_rarecharm_pions if needed. """ combination_code = F.require_all(F.MASS < amass, - F.MAXDOCACUT(amaxdoca_max)) + F.MAXSDOCACUT(amaxdoca_max)) vertex_code = F.require_all(F.CHI2DOF < maxVCHI2PDOF) return ParticleCombiner([leptons, hadrons], @@ -929,7 +929,7 @@ def make_rarecharm_tau(particles, pvs = make_pvs() combination_code = F.require_all(F.MASS > am_min, F.MASS < am_max, - F.MAXDOCACUT(amaxdoca_max), + F.MAXSDOCACUT(amaxdoca_max), F.PT > apt_min, F.MAX(F.MINIPCHI2(pvs)) > trkipchi2_min, F.MAX(F.PT) > pipt_min) @@ -970,7 +970,7 @@ def make_rarecharm_d02hhmumu_dzeros(dileptons, combination_code = F.require_all( F.MASS > m_min - 100 * MeV, F.MASS < m_max + 100 * MeV, F.MAX(F.PT) > amaxchild_pt_min, F.PT > apt_min, - F.MAXDOCACUT(amaxdoca_max), + F.MAXSDOCACUT(amaxdoca_max), F.MAX(F.MINIPCHI2(pvs)) > trkipchi2_min) vertex_code = F.require_all( @@ -1012,7 +1012,7 @@ def make_rarecharm_d02hhmumu_dzeros_fromB( combination_code = F.require_all(F.MASS > am_min - 100 * MeV, F.MASS < am_max + 100 * MeV, - F.MAXDOCACUT(amaxdoca_max), + F.MAXSDOCACUT(amaxdoca_max), F.MAX(F.MINIPCHI2(pvs)) > trkipchi2_min) composite_code = F.require_all(F.MASS > am_min, F.MASS < am_max, @@ -1084,7 +1084,7 @@ def make_rarecharm_d02ll_dzeros(lepton1, combination_code = F.require_all( F.MASS > m_min - 50 * MeV, F.MASS < m_max + 50 * MeV, F.MAX(F.PT) > amaxchild_pt_min, F.PT > apt_min, - F.MAXDOCACUT(amaxdoca_max), + F.MAXSDOCACUT(amaxdoca_max), F.MAX(F.BPVIPCHI2(pvs)) > maxIPChi2_min) vertex_code = F.require_all(F.MASS > m_min, F.MASS < m_max, @@ -1150,7 +1150,7 @@ def make_rarecharm_d02taue_dzeros(taus, pvs = make_pvs() combination_code = F.require_all(F.MASS < amass_max + 100 * MeV, - F.P > ap_min, F.MAXDOCACUT(amaxdoca_max)) + F.P > ap_min, F.MAXSDOCACUT(amaxdoca_max)) vertex_code = F.require_all( F.MASS < amass_max, @@ -1187,7 +1187,7 @@ def make_rarecharm_d2hll_ds(dilepton, pvs = make_pvs() combination_code = F.require_all( - F.MAXDOCACUT(amaxdoca_max), + F.MAXSDOCACUT(amaxdoca_max), in_range(m_min - 100 * MeV, F.MASS, m_max + 100 * MeV)) vertex_code = F.require_all( @@ -1218,7 +1218,7 @@ def make_rarecharm_d2hll_ds_fromB(dilepton, pvs = make_pvs() combination_code = F.require_all( - F.MAXDOCACUT(amaxdoca_max), + F.MAXSDOCACUT(amaxdoca_max), in_range(m_min - 100 * MeV, F.MASS, m_max + 100 * MeV)) vertex_code = F.require_all( @@ -1251,7 +1251,7 @@ def make_rarecharm_d2hh0ll_ds(dilepton, combination_code = F.require_all( in_range(m_min - 50 * MeV, F.MASS, - m_max + 50 * MeV)) #, F.MAXDOCACUT(amaxdoca_max)) + m_max + 50 * MeV)) #, F.MAXSDOCACUT(amaxdoca_max)) vertex_code = F.require_all( in_range(m_min, F.MASS, m_max), F.CHI2DOF < vfaspf, @@ -1288,7 +1288,7 @@ def make_rarecharm_lambdacs2pmumu(dileptons, F.MASS < m_max + 50 * MeV, F.MAX(F.PT) > amaxchild_pt_min, F.SUM(F.PT) > apt_min, - F.MAXDOCACUT(amaxdoca_max), + F.MAXSDOCACUT(amaxdoca_max), ) vertex_code = F.require_all(F.MASS > m_min, F.MASS < m_max, @@ -1326,7 +1326,7 @@ def make_rarecharm_lambdacs2pll_fromB( F.MASS < m_max + 50 * MeV, F.MAX(F.PT) > amaxchild_pt_min, F.SUM(F.PT) > apt_min, - F.MAXDOCACUT(amaxdoca_max)) + F.MAXSDOCACUT(amaxdoca_max)) vertex_code = F.require_all(F.MASS > m_min, F.MASS < m_max, F.CHI2DOF < vchi2pdof_max, @@ -1370,7 +1370,7 @@ def make_rarecharm_lambdacs2pks(protons, F.MASS < m_max + 50 * MeV, F.MAX(F.PT) > amaxchild_pt_min, F.SUM(F.PT) > apt_min, - F.MAXDOCACUT(amaxdoca_max), + F.MAXSDOCACUT(amaxdoca_max), ) vertex_code = F.require_all(F.MASS > m_min, F.MASS < m_max, @@ -1408,7 +1408,7 @@ def make_rarecharm_lambdacs2pks_fromB( F.MASS < m_max + 50 * MeV, F.MAX(F.PT) > amaxchild_pt_min, F.SUM(F.PT) > apt_min, - F.MAXDOCACUT(amaxdoca_max)) + F.MAXSDOCACUT(amaxdoca_max)) vertex_code = F.require_all(F.MASS > m_min, F.MASS < m_max, F.CHI2DOF < vchi2pdof_max, @@ -1443,10 +1443,12 @@ def make_rarecharm_ll_xic2lambdall(lambdas, pvs = make_pvs() - combination_code = F.require_all( - F.MASS < m_max + 35 * MeV, F.MASS > m_min - 35 * MeV, - F.PT > comb_pt_min, - F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min, F.MAXDOCACUT(amaxdoca_max)) + combination_code = F.require_all(F.MASS < m_max + 35 * MeV, + F.MASS > m_min - 35 * MeV, + F.PT > comb_pt_min, + F.SUM(F.PT) > sum_pt_min, + F.P > comb_p_min, + F.MAXSDOCACUT(amaxdoca_max)) vertex_code = F.require_all(F.MASS < m_max, F.MASS > m_min, F.PT > pt_min, F.P > p_min, F.CHI2DOF < vchi2pdof_max, @@ -1483,10 +1485,12 @@ def make_rarecharm_dd_xic2lambdall(lambdas, pvs = make_pvs() - combination_code = F.require_all( - F.MASS < m_max + 35 * MeV, F.MASS > m_min - 35 * MeV, - F.PT > comb_pt_min, - F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min, F.MAXDOCACUT(amaxdoca_max)) + combination_code = F.require_all(F.MASS < m_max + 35 * MeV, + F.MASS > m_min - 35 * MeV, + F.PT > comb_pt_min, + F.SUM(F.PT) > sum_pt_min, + F.P > comb_p_min, + F.MAXSDOCACUT(amaxdoca_max)) vertex_code = F.require_all(F.MASS < m_max, F.MASS > m_min, F.PT > pt_min, F.P > p_min, F.CHI2DOF < vchi2pdof_max, @@ -1517,10 +1521,12 @@ def make_rarecharm_dd_lambda2ppi(protons, vchi2pdof_max=_LAMBDA_VCHI2PDOF_MAX_PPI_DD): """Return lamdba maker decaying to DD proton and pion. """ - combination_code = F.require_all( - F.MASS < m_max + 35 * MeV, F.PT > comb_pt_min, - F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min, F.MAXDOCACUT(amaxdoca_max), - F.MAXSDOCACHI2CUT(docachi2_max)) + combination_code = F.require_all(F.MASS < m_max + 35 * MeV, + F.PT > comb_pt_min, + F.SUM(F.PT) > sum_pt_min, + F.P > comb_p_min, + F.MAXSDOCACUT(amaxdoca_max), + F.MAXSDOCACHI2CUT(docachi2_max)) vertex_code = F.require_all(F.MASS < m_max, F.PT > pt_min, F.P > p_min, F.CHI2DOF < vchi2pdof_max) @@ -1549,7 +1555,7 @@ def make_rarecharm_ll_lambda2ppi(protons, combination_code = F.require_all(F.MASS < m_max + 35 * MeV, F.PT > comb_pt_min, - F.MAXDOCACUT(amaxdoca_max)) + F.MAXSDOCACUT(amaxdoca_max)) vertex_code = F.require_all(F.MASS < m_max, F.PT > pt_min, F.CHI2DOF < vchi2pdof_max, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charmonium_to_dimuon.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charmonium_to_dimuon.py index bda9026598c..eed6bf60bf7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charmonium_to_dimuon.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charmonium_to_dimuon.py @@ -105,7 +105,7 @@ def make_charmonium_dimuon_base(name='charmonium_dimuon_base_{hash}', combination_code = F.require_all( in_range(minMass_dimuon, F.MASS, maxMass_dimuon), - F.DOCACHI2(1, 2) < maxDOCAChi2) + F.SDOCACHI2(1, 2) < maxDOCAChi2) # require that the muons come from the same vertex vertex_code = F.require_all(F.CHI2DOF < maxVertexChi2, F.PT > minPt_dimuon) @@ -148,7 +148,7 @@ def make_charmonium_samesign_dimuon_base( combination_code = F.require_all( in_range(minMass_dimuon, F.MASS, maxMass_dimuon), - F.DOCACHI2(1, 2) < maxDOCAChi2) + F.SDOCACHI2(1, 2) < maxDOCAChi2) # require that the muons come from the same vertex vertex_code = F.require_all(F.CHI2DOF < maxVertexChi2, F.PT > minPt_dimuon) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/hlt2_line_example.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/hlt2_line_example.py index f140ea0dfe1..5cb1e601d79 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/hlt2_line_example.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/hlt2_line_example.py @@ -95,13 +95,13 @@ def _pions_for_charm_and_beauty(pt_min=0.5 * GeV): def _make_lambdacs_for_beauty(protons, kaons, pions, pvs): two_body_combination_code = F.require_all( - F.MAXSDOCACHI2CUT(9.), F.MAXDOCACUT(0.1 * mm)) + F.MAXSDOCACHI2CUT(9.), F.MAXSDOCACUT(0.1 * mm)) combination_code = F.require_all( in_range(2080 * MeV, F.MASS, 2480 * MeV), # mass of the combination F.PT > 1.4 * GeV, # pT of the 3-track combination F.SUM(F.PT) > 2 * GeV, F.MAXSDOCACHI2CUT(9.), - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ) vertex_code = F.require_all( in_range(2100 * MeV, F.MASS, 2460 * MeV), # mass after the vertex fit @@ -123,7 +123,7 @@ def _make_lambdabs(lcps, bachelors, pvs, decay_descriptor): combination_code = F.require_all( in_range(5 * GeV, F.MASS, 7 * GeV), F.SUM(F.PT) > 4 * GeV, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ) vertex_code = F.require_all( F.CHI2DOF < 10., diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_femtoscopy.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_femtoscopy.py index 268ef197966..60171c6c847 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_femtoscopy.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_femtoscopy.py @@ -108,7 +108,7 @@ def _make_lll_xis(): DecayDescriptor="[Xi- -> Lambda0 pi-]cc", name='Femtoscopy_Xim_LLL_{hash}', CombinationCut=F.require_all(F.MASS < 1400. * MeV, - F.MAXDOCACUT(150. * um), + F.MAXSDOCACUT(150. * um), F.PT > 500. * MeV), CompositeCut=F.require_all(F.MASS < 1380. * MeV, F.PT > 600. * MeV, F.CHI2DOF < 9., @@ -126,7 +126,7 @@ def _make_lll_omegas(): name='Femtoscopy_Omegam_LLL_{hash}', CombinationCut=F.require_all( F.MASS < 1750. * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), F.PT > 550. * MeV, ), CompositeCut=F.require_all(F.MASS < 1730. * MeV, F.PT > 650. * MeV, @@ -154,7 +154,7 @@ def _make_correlated_pair( m_max = sqrt(msq_max) combo_cut = F.require_all( F.SUM(F.PT) > sumpt_min, F.MASS < m_max + 50. * MeV, - F.MAXDOCACUT(doca_max)) + F.MAXSDOCACUT(doca_max)) composite_cut = F.require_all(F.PT > pt_min, F.MASS < m_max, F.CHI2DOF < vtx_chi2ndof_max, F.BPVFDCHI2(pvs) < fdchi2_max) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_smog2_trackingeff.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_smog2_trackingeff.py index 514d93b9948..0e2e98df076 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_smog2_trackingeff.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_smog2_trackingeff.py @@ -89,8 +89,8 @@ def make_JPsiCombiner(particles, F.SUM(F.PT) > get_cuts['min_JPsiPT'], ) if get_cuts['max_JPsiDOCA'] is not None: - combination_cut = F.require_all(combination_cut, - F.MAXDOCACUT(get_cuts['max_JPsiDOCA'])) + combination_cut = F.require_all( + combination_cut, F.MAXSDOCACUT(get_cuts['max_JPsiDOCA'])) #additional cuts mother_cut = F.require_all( in_range(get_cuts['min_JPsimass'], F.MASS, get_cuts['max_JPsimass']), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_smog2_trackingeff_Ks.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_smog2_trackingeff_Ks.py index 451b514d43f..c3c6e2e9feb 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_smog2_trackingeff_Ks.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_smog2_trackingeff_Ks.py @@ -58,7 +58,7 @@ def make_kshort_pi_muplus_specific_charge(pions, name="KShortMuPiCombiner_{hash}"): combination_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), - F.MAXDOCACUT(comb_maxdoca), + F.MAXSDOCACUT(comb_maxdoca), ) vertex_code = F.require_all( F.END_VRHO < 100 * mm, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/builders/charm_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/builders/charm_builders.py index 593cd7c8559..870a7cb9e5e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/builders/charm_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/builders/charm_builders.py @@ -226,7 +226,7 @@ def make_charm3hadrons(name="", vertex_code = F.require_all( F.CHI2DOF < CriteriaCombination["vchi2pdof_max"]) - combination12_code = F.require_all(F.MAXDOCACUT(0.5 * mm)) + combination12_code = F.require_all(F.MAXSDOCACUT(0.5 * mm)) return ParticleCombiner( name=name, @@ -268,7 +268,7 @@ def make_charm4hadrons(name="", vertex_code = F.require_all( F.CHI2DOF < CriteriaCombination["vchi2pdof_max"]) - combination12_code = F.require_all(F.MAXDOCACUT(0.5 * mm)) + combination12_code = F.require_all(F.MAXSDOCACUT(0.5 * mm)) return ParticleCombiner( name=name, Inputs=daus, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/data_quality_PbPb.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/data_quality_PbPb.py index 4d17412df33..8d9def8a307 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/data_quality_PbPb.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/data_quality_PbPb.py @@ -97,7 +97,7 @@ def _kshort_ll_line(name="Hlt2DQ_KsToPimPip_LL"): CombinationCut=F.require_all( F.math.in_range(420 * MeV, F.MASS, 570 * MeV), F.PT > 300 * MeV, - F.MAXDOCACUT(300 * um), + F.MAXSDOCACUT(300 * um), ), CompositeCut=F.require_all( F.math.in_range(450 * MeV, F.MASS, 550 * MeV), @@ -138,7 +138,7 @@ def _lambda_ll_line(name="Hlt2DQ_L0ToPpPim_LL"): CombinationCut=F.require_all( F.MASS < 1180 * MeV, F.PT > 450 * MeV, - F.MAXDOCACUT(300 * um), + F.MAXSDOCACUT(300 * um), ), CompositeCut=F.require_all( F.math.in_range(1080 * MeV, F.MASS, 1140 * MeV), @@ -170,7 +170,7 @@ def _d0_to_kpi_line(name="Hlt2DQ_D0ToKmPip"): F.math.in_range(1685 * MeV, F.MASS, 2045 * MeV), F.PT > 1.5 * GeV, F.MAX(F.PT) > 1200 * MeV, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), CompositeCut=F.require_all( F.math.in_range(1715 * MeV, F.MASS, 2015 * MeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DsToPhiPi_PhiToMuMuTagged.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DsToPhiPi_PhiToMuMuTagged.py index 5c65afcf859..8a01f2b3e65 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DsToPhiPi_PhiToMuMuTagged.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DsToPhiPi_PhiToMuMuTagged.py @@ -54,7 +54,7 @@ def make_phis( ): combination_code = F.require_all( in_range(am_min, F.MASS, am_max), - F.DOCACHI2(1, 2) < achi2doca_max) + F.SDOCACHI2(1, 2) < achi2doca_max) mother_code = F.require_all(in_range(m_min, F.MASS, m_max)) return ParticleCombiner( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DstToD0Pi_D0ToKPi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DstToD0Pi_D0ToKPi.py index 7b45950abe3..2f2c6e46e0b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DstToD0Pi_D0ToKPi.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DstToD0Pi_D0ToKPi.py @@ -55,7 +55,7 @@ def make_d0s( combination_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.PT > apt_min, - F.MAXDOCACUT(comb_doca_max), + F.MAXSDOCACUT(comb_doca_max), ) vertex_code = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DstToD0Pi_D0ToKPiPiPi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DstToD0Pi_D0ToKPiPiPi.py index d1c79a051dd..da45c1a687d 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DstToD0Pi_D0ToKPiPiPi.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/DstToD0Pi_D0ToKPiPiPi.py @@ -75,7 +75,7 @@ def make_dzero_to_kpipipi( mipchi2_min=kpi_mipchi2_min, ) # two_body_combination_code =F.require_all( - # F.MAXDOCACUT(doca_max), F.MAXSDOCACHI2CUT(doca_chi2_max) + # F.MAXSDOCACUT(doca_max), F.MAXSDOCACHI2CUT(doca_chi2_max) # ) combination_code = F.require_all( in_range(am_min, F.MASS, am_max), @@ -84,18 +84,18 @@ def make_dzero_to_kpipipi( F.SUBCOMB(Functor=F.MASS, Indices=(1, 3)) < two_particle_veto, F.SUBCOMB(Functor=F.MASS, Indices=(1, 4)) < two_particle_veto, F.SUBCOMB(Functor=F.MASS, Indices=(1, 3, 4)) < three_particle_veto, - F.DOCA(1, 2) < doca_max, - F.DOCACHI2(1, 2) < doca_chi2_max, - F.DOCA(1, 3) < doca_max, - F.DOCACHI2(1, 3) < doca_chi2_max, - F.DOCA(1, 4) < doca_max, - F.DOCACHI2(1, 4) < doca_chi2_max, - F.DOCA(2, 3) < doca_max, - F.DOCACHI2(2, 3) < doca_chi2_max, - F.DOCA(2, 4) < doca_max, - F.DOCACHI2(2, 4) < doca_chi2_max, - F.DOCA(3, 4) < doca_max, - F.DOCACHI2(3, 4) < doca_chi2_max, + F.SDOCA(1, 2) < doca_max, + F.SDOCACHI2(1, 2) < doca_chi2_max, + F.SDOCA(1, 3) < doca_max, + F.SDOCACHI2(1, 3) < doca_chi2_max, + F.SDOCA(1, 4) < doca_max, + F.SDOCACHI2(1, 4) < doca_chi2_max, + F.SDOCA(2, 3) < doca_max, + F.SDOCACHI2(2, 3) < doca_chi2_max, + F.SDOCA(2, 4) < doca_max, + F.SDOCACHI2(2, 4) < doca_chi2_max, + F.SDOCA(3, 4) < doca_max, + F.SDOCACHI2(3, 4) < doca_chi2_max, ) composite_code = F.require_all( F.PT > pt_min, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/PhiToKK_Detached.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/PhiToKK_Detached.py index 77176bc4669..450ca024295 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/PhiToKK_Detached.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/PhiToKK_Detached.py @@ -95,7 +95,7 @@ def make_phis_tagged( combination_code = F.require_all( in_range(am_min, F.MASS, am_max), - F.DOCACHI2(1, 2) < achi2doca_max, + F.SDOCACHI2(1, 2) < achi2doca_max, ) composite_code = F.require_all( @@ -136,7 +136,7 @@ def make_phis_unbiased( combination_code = F.require_all( in_range(am_min, F.MASS, am_max), - F.DOCACHI2(1, 2) < achi2doca_max, + F.SDOCACHI2(1, 2) < achi2doca_max, F.SUM(F.PT) > comb_pt_min, F.CHILD( Index=1, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/charmonium.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/charmonium.py index 64c409ecdaf..b093cc58cf7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/charmonium.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/charmonium.py @@ -397,7 +397,7 @@ def make_jpsis( ): combination_code = F.require_all( in_range(am_min, F.MASS, am_max), - F.DOCACHI2(1, 2) < achi2doca_max) + F.SDOCACHI2(1, 2) < achi2doca_max) mother_code = F.require_all(in_range(m_min, F.MASS, m_max)) return ParticleCombiner( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/d_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/d_builders.py index 90dc9a5c865..60e5797a007 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/d_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/d_builders.py @@ -51,7 +51,7 @@ def make_dst_to_dzeropi( in_range(comb_m_min, F.MASS, comb_m_max), F.MASS - F.CHILD(1, F.MASS) > delta_mm_min, F.MASS - F.CHILD(1, F.MASS) < delta_mm_max, - F.MAXDOCACUT(comb_doca_max), + F.MAXSDOCACUT(comb_doca_max), ) vertex_code = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/neutral_pid.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/neutral_pid.py index 47f27e4b673..ef5ef2669fd 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/neutral_pid.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/pid/utils/neutral_pid.py @@ -324,7 +324,7 @@ def make_prompt_dimuons(name="pid_prompt_dimuon"): dimuon_comb_code = F.require_all(F.PT > 1. * GeV, ) dimuon_vert_code = F.require_all( - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), F.CHI2DOF < 10., F.BPVFDCHI2(pvs) < 45, F.MINIPCHI2(pvs) < 15, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/calibration.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/calibration.py index 42adb94b196..17f44927c6e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/calibration.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/calibration.py @@ -80,7 +80,7 @@ def combine_muons_for_decay_descriptor(decay_descriptor, combination_cuts = F.require_all( in_range(min_mass, F.MASS, max_mass), - F.DOCA(1, 2) < max_doca) + F.SDOCA(1, 2) < max_doca) vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max) return ParticleCombiner([filtered_muons, filtered_muons], diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py index 298048882ea..60aa3329b4e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/dimuon_no_ip.py @@ -55,7 +55,7 @@ def make_dimuons(pvs, muons = make_ismuon_long_muon() filtered_muons = filter_muons(muons, pvs, min_ipchi2, pid_mu) combination_code = require_all( - F.MAXDOCACUT(comb_maxdoca), + F.MAXSDOCACUT(comb_maxdoca), F.CHILD(1, F.PT) * F.CHILD(2, F.PT) > min_pt_prod, in_range(min_mass, F.MASS, max_mass)) vertex_code = require_all(F.CHI2DOF < vchi2pdof_max, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py index 7cd1a2db764..ffeec30eca8 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/drellyan.py @@ -96,7 +96,7 @@ def combine_muons_for_decay_descriptor(decay_descriptor, combination_cuts = F.require_all( in_range(min_mass, F.MASS, max_mass), - F.DOCA(1, 2) < max_doca) + F.SDOCA(1, 2) < max_doca) vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max) return ParticleCombiner([filtered_muons, filtered_muons], diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/Nmu_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/Nmu_builders.py index 3355a567446..14d86a52389 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/Nmu_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/Nmu_builders.py @@ -95,7 +95,7 @@ def make_generic_4lepton_LLP(dilepton1, max_DOCA=0.75): """Builds B -> X (ll) X (l'l')""" - combination_code = F.require_all(F.MAXDOCACUT(max_DOCA)) + combination_code = F.require_all(F.MAXSDOCACUT(max_DOCA)) pvs = make_pvs() vertex_code = F.require_all( F.BPVFDCHI2(pvs) > min_BFDCHI2, @@ -121,7 +121,7 @@ def make_B24lK_LLP(dilepton1, max_DOCA=0.5): """Builds B -> X (ll) X (l'l') K""" - combination_code = F.require_all(F.MAXDOCACUT(max_DOCA)) + combination_code = F.require_all(F.MAXSDOCACUT(max_DOCA)) pvs = make_pvs() vertex_code = F.require_all( F.BPVFDCHI2(pvs) > min_BFDCHI2, @@ -150,7 +150,7 @@ def make_B26l_LLP(dilepton1, max_DOCA=0.5): """Builds B -> X (ll) X (l'l') X (l''l'')""" - combination_code = F.require_all(F.MAXDOCACUT(max_DOCA)) + combination_code = F.require_all(F.MAXSDOCACUT(max_DOCA)) pvs = make_pvs() vertex_code = F.require_all( F.BPVFDCHI2(pvs) > min_BFDCHI2, @@ -177,7 +177,7 @@ def make_B26lK_LLP(dilepton1, max_DOCA=0.5): """Builds B -> X (mumu) X (mumu) X (mumu) K with long muon combinations""" - combination_code = F.require_all(F.MAXDOCACUT(max_DOCA)) + combination_code = F.require_all(F.MAXSDOCACUT(max_DOCA)) pvs = make_pvs() vertex_code = F.require_all( F.BPVFDCHI2(pvs) > min_BFDCHI2, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_hemu_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_hemu_builders.py index ffb80c424a7..d0176c918d8 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_hemu_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_hemu_builders.py @@ -62,7 +62,8 @@ def make_hh(kaons, distchi2_max=30): """hh combiner for B->hhemu, defaults set for K*(892)0""" combination_code = F.require_all( - F.DOCACHI2(1, 2) < distchi2_max, F.math.in_range(m_min, F.MASS, m_max)) + F.SDOCACHI2(1, 2) < distchi2_max, F.math.in_range( + m_min, F.MASS, m_max)) vertex_code = F.require_all(F.PT > pt_min, F.CHI2 < vtxchi2_max) return ParticleCombiner([kaons, pions], DecayDescriptor=decay_descriptor, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/omega_rare_decay_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/omega_rare_decay_builder.py index c20f59d71d9..52fb15c35e0 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/omega_rare_decay_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/omega_rare_decay_builder.py @@ -43,8 +43,8 @@ def make_xim_to_lambda_pim(pvs, Builder for Xi- -> Lambda pi-. """ combination_code = F.require_all( - F.MAXSDOCACHI2CUT(docachi2_max), in_range(comb_m_min, F.MASS, - comb_m_max), F.P > comb_p_min) + F.MAXSDOCACHI2CUT(docachi2_max), + in_range(comb_m_min, F.MASS, comb_m_max), F.P > comb_p_min) vertex_code = F.require_all( in_range(m_min, F.MASS, m_max), F.P > p_min, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py index 973132205eb..33604153e6a 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py @@ -1259,7 +1259,7 @@ def make_rd_tauons_hadronic_decay( combination12_code = F.require_all( in_range(am_2pi_min, F.MASS, am_2pi_max), F.MAXSDOCACHI2CUT(adocachi2_max), - #F.DOCA(1, 2) < adoca_max, + #F.SDOCA(1, 2) < adoca_max, ) pvs = make_pvs() @@ -1267,8 +1267,8 @@ def make_rd_tauons_hadronic_decay( in_range(am_min, F.MASS, am_max), F.SUBCOMB( Functor=in_range(am_2pi_min, F.MASS, am_2pi_max), Indices=(1, 3)), - # F.DOCA(1, 3) < adoca_max, - # F.DOCA(2, 3) < adoca_max, + # F.SDOCA(1, 3) < adoca_max, + # F.SDOCA(2, 3) < adoca_max, F.SUBCOMB(Functor=F.MAXSDOCACHI2CUT(adocachi2_max), Indices=(2, 3)), F.SUBCOMB(Functor=F.MAXSDOCACHI2CUT(adocachi2_max), Indices=(1, 3)), F.SUM(F.PT > best_pi_pt_min) >= 1, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/strange_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/strange_builders.py index 8919cabc665..8421023120e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/strange_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/strange_builders.py @@ -71,7 +71,7 @@ MIN_PID_P_OVER_K = optional_functor(lambda v: (F.PID_P - F.PID_K) >= v) MIN_PID_K = optional_functor(lambda v: F.PID_K >= v) MIN_PID_K_OVER_P = optional_functor(lambda v: (F.PID_K - F.PID_P) >= v) MIN_PID_E = optional_functor(lambda v: F.PID_E >= v) -MAX_DOCA = optional_functor(lambda v: F.MAXDOCACUT(v)) +MAX_DOCA = optional_functor(lambda v: F.MAXSDOCACUT(v)) MAX_DOCACHI2 = optional_functor(lambda v: F.MAXSDOCACHI2CUT(v)) MIN_BPVVDZ = optional_functor(lambda v, pvs: F.BPVVDZ(pvs) >= v) MAX_IPBPVVDZ_RATIO = optional_functor( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/HbToTauNu_BTracking.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/HbToTauNu_BTracking.py index f69c52e4122..44d35165252 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/HbToTauNu_BTracking.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/HbToTauNu_BTracking.py @@ -64,7 +64,7 @@ def make_x23prong_btracking(particles, combination_code = F.require_all( F.PT > 0.9 * pt_min, in_range(m_min - 50 * MeV, F.MASS, m_max + 50 * MeV), - F.MAXDOCACUT(comb_doca_max)) + F.MAXSDOCACUT(comb_doca_max)) # vertex-based selection vertex_code = F.require_all(F.PT > pt_min, in_range(m_min, F.MASS, m_max), @@ -206,7 +206,7 @@ def make_b2dpipi_d2kpipi_with_btracking(process, # combine to form full B with some additional requirements on pi+pi+ combination combination_code = F.require_all( - F.SUBCOMB(Functor=F.MAXDOCACUT(twopi_doca_max), Indices=(2, 3)), + F.SUBCOMB(Functor=F.MAXSDOCACUT(twopi_doca_max), Indices=(2, 3)), F.SUBCOMB(Functor=(F.MASS < twopi_mass_max), Indices=(2, 3)), in_range(m_min - 50 * MeV, F.MASS, m_max + 50 * MeV)) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/b_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/b_builder.py index 7b7db8a9901..b10d4be24db 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/b_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/b_builder.py @@ -102,7 +102,7 @@ def make_b2xulnu(particles, combination_code = F.require_all(in_range(comb_m_min, F.MASS, comb_m_max)) if comb_doca_max is not None: combination_code = F.require_all(combination_code, - F.MAXDOCACUT(comb_doca_max)) + F.MAXSDOCACUT(comb_doca_max)) vertex_code = F.require_all( F.CHI2DOF < vchi2pdof_max, @@ -140,7 +140,7 @@ def make_b2xtaunu(particles, if comb_doca_max is not None: combination_code = F.require_all(combination_code, - F.MAXDOCACUT(comb_doca_max)) + F.MAXSDOCACUT(comb_doca_max)) vertex_requirements = [ in_range(m_min, F.MASS, m_max), F.CHI2DOF < vchi2pdof_max, @@ -224,7 +224,7 @@ def make_b2lllnu(particles, combination_code = F.require_all(in_range(comb_m_min, F.MASS, comb_m_max)) if comb_doca_max is not None: combination_code = F.require_all(combination_code, - F.MAXDOCACUT(comb_doca_max)) + F.MAXSDOCACUT(comb_doca_max)) vertex_code = F.require_all( F.PT > pt, F.CHI2DOF < vchi2pdof_max, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py index 1cba90d387f..bffe2078341 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py @@ -397,7 +397,7 @@ def make_tauons_hadronic_decay(make_pvs=make_pvs, pions = make_prong_pions() pvs = make_pvs() combination_code = F.require_all( - in_range(comb_m_min, F.MASS, comb_m_max), F.MAXDOCACUT(comb_doca_max), + in_range(comb_m_min, F.MASS, comb_m_max), F.MAXSDOCACUT(comb_doca_max), F.SUBCOMB(Functor=F.MASS < twobody_m_max, Indices=(1, 3))) if mipchi2_min: diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/charm_hadron_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/charm_hadron_builder.py index 679c2b216e7..cff26968635 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/charm_hadron_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/charm_hadron_builder.py @@ -84,7 +84,7 @@ def make_Hc_to_nbody(particles, F.SUM(F.PT) > comb_pt_sum_min) if comb_doca_max is not None: combination_code = F.require_all(combination_code, - F.MAXDOCACUT(comb_doca_max)) + F.MAXSDOCACUT(comb_doca_max)) if comb_docachi2_max is not None: combination_code = F.require_all(combination_code, F.MAXSDOCACHI2CUT(comb_docachi2_max)) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/starterkit/bs_to_jpsiphi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/starterkit/bs_to_jpsiphi.py index a6e6e0f9174..e387ed4dd8d 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/starterkit/bs_to_jpsiphi.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/starterkit/bs_to_jpsiphi.py @@ -74,7 +74,7 @@ def bs0_to_jpsiphi_line(name="Hlt2Starterkit_Bs0ToJpsiPhi_PR"): jpsi_combination_code = F.require_all( in_range(2.7 * GeV, F.MASS, 3.4 * GeV), F.SUM(F.PT) > 0.8 * GeV, - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ) jpsi_vertex_code = F.require_all( in_range(2.8 * GeV, F.MASS, 3.3 * GeV), @@ -90,7 +90,7 @@ def bs0_to_jpsiphi_line(name="Hlt2Starterkit_Bs0ToJpsiPhi_PR"): phi_combination_code = F.require_all( F.MASS < 1100 * MeV, - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ) phi_vertex_code = F.require_all( F.MASS < 1080 * MeV, @@ -107,7 +107,7 @@ def bs0_to_jpsiphi_line(name="Hlt2Starterkit_Bs0ToJpsiPhi_PR"): bs_combination_code = F.require_all( in_range(4.9 * GeV, F.MASS, 6.3 * GeV), F.SUM(F.PT) > 3 * GeV, - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ) bs_vertex_code = F.require_all( F.CHI2DOF < 12., @@ -143,13 +143,13 @@ def bs0_to_kkmumu_line(name="Hlt2Starterkit_Bs0ToKmKpMumMup_SP"): bs_two_body_combination_code = F.require_all( in_range(2.7 * GeV, F.MASS, 3.4 * GeV), F.SUM(F.PT) > 0.8 * GeV, - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), ) - bs_three_body_combination_code = F.MAXDOCACUT(0.2 * mm) + bs_three_body_combination_code = F.MAXSDOCACUT(0.2 * mm) bs_combination_code = F.require_all( in_range(4.9 * GeV, F.MASS, 6.3 * GeV), F.SUM(F.PT) > 3 * GeV, - F.MAXDOCACUT(0.2 * mm), + F.MAXSDOCACUT(0.2 * mm), F.SUBCOMB(Functor=F.MASS < 1100 * MeV, Indices=[3, 4]), ) bs_vertex_code = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/hlt2_test.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/hlt2_test.py index 76885d51ed2..bf2130c7bf7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/hlt2_test.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/hlt2_test.py @@ -168,7 +168,7 @@ def xicz_to_lpipi_dd_line(name="Hlt2Test_Xic0ToL0PimPip_DD"): name="Test_Hyperons_Lambda_DD", CombinationCut=F.require_all( F.MASS < 1190 * MeV, - F.MAXDOCACUT(2 * mm), + F.MAXSDOCACUT(2 * mm), F.MAXSDOCACHI2CUT(12.), F.PT > 0.9 * GeV, F.P > 13 * GeV, @@ -193,11 +193,11 @@ def xicz_to_lpipi_dd_line(name="Hlt2Test_Xic0ToL0PimPip_DD"): name="Test_Hyperons_Xic0ToL0PimPip_DD", Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXDOCACUT(800 * um), + F.MAXSDOCACUT(800 * um), ), CombinationCut=F.require_all( - F.DOCA(1, 3) < 800 * um, - F.DOCA(2, 3) < 150 * um, + F.SDOCA(1, 3) < 800 * um, + F.SDOCA(2, 3) < 150 * um, F.math.in_range(2250 * MeV, F.MASS, 2590 * MeV), F.MAX(F.MINIPCHI2(pvs)) > 9., F.PT > 1.3 * GeV, @@ -238,7 +238,7 @@ def oc_to_ximkpipi_lll_line(name="Hlt2Test_Oc0ToXimKmPipPip_LLL"): name="Test_Hyperons_LambdaFromHyperon_LL", CombinationCut=F.require_all( F.MASS < 1190 * MeV, - F.MAXDOCACUT(100 * um), + F.MAXSDOCACUT(100 * um), F.PT > 450 * MeV, ), CompositeCut=F.require_all( @@ -258,7 +258,7 @@ def oc_to_ximkpipi_lll_line(name="Hlt2Test_Oc0ToXimKmPipPip_LLL"): name="Test_Hyperons_Xim_LLL", CombinationCut=F.require_all( F.MASS < 1400 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), F.PT > 500 * MeV, ), CompositeCut=F.require_all( @@ -288,17 +288,17 @@ def oc_to_ximkpipi_lll_line(name="Hlt2Test_Oc0ToXimKmPipPip_LLL"): name="Test_Hyperons_Oc0ToXimKmPipPip_LLL", Combination12Cut=F.require_all( F.MASS < 2535 * MeV, - F.MAXDOCACUT(150 * um), + F.MAXSDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.DOCA(1, 3) < 200 * um, - F.DOCA(2, 3) < 200 * um, + F.SDOCA(1, 3) < 200 * um, + F.SDOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.DOCA(1, 4) < 200 * um, - F.DOCA(2, 4) < 200 * um, - F.DOCA(3, 4) < 250 * um, + F.SDOCA(1, 4) < 200 * um, + F.SDOCA(2, 4) < 200 * um, + F.SDOCA(3, 4) < 250 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -592,7 +592,7 @@ def _make_dzeros(pvs): in_range(1685 * MeV, F.MASS, 2045 * MeV), F.PT > 2 * GeV, F.MAX(F.PT) > 1200 * MeV, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), CompositeCut=F.require_all( in_range(1715 * MeV, F.MASS, 2015 * MeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py index 72341a234f6..91fd64447a9 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/spruce_test.py @@ -74,12 +74,12 @@ def _make_ds(kaons, pvs): DecayDescriptor='[D_s+ -> K+ K- pi+]cc', Combination12Cut=F.require_all( F.MASS < 2010 * MeV, - F.DOCA(1, 2) < 0.5 * mm), + F.SDOCA(1, 2) < 0.5 * mm), CombinationCut=F.require_all( in_range(1930 * MeV, F.MASS, 2010 * MeV), F.SUM(F.PT) > 1800 * MeV, - F.DOCA(1, 3) < 0.5 * mm, - F.DOCA(2, 3) < 0.5 * mm, + F.SDOCA(1, 3) < 0.5 * mm, + F.SDOCA(2, 3) < 0.5 * mm, ), CompositeCut=F.require_all( F.CHI2DOF < 10, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/topological_b/__init__.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/topological_b/__init__.py index d1023cc7402..37ecf773621 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/topological_b/__init__.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/topological_b/__init__.py @@ -305,7 +305,7 @@ def make_filtered_two_body_particles(particles, MVACut): "TwoBody_PT": F.PT() / GeV, "TwoBody_ENDVERTEX_DOCAMAX": - F.MAXDOCA * 10, + F.MAXSDOCA * 10, "TwoBody_Mcorr": F.BPVCORRM(pvs) / GeV, "TwoBody_FDCHI2_OWNPV": @@ -363,9 +363,9 @@ def make_filtered_three_body_particles( "min_PT_final_state_tracks": (F.MIN_ELEMENT @ F.MAP(F.PT) @ F.GET_ALL_BASICS) / GeV, "TwoBody_ENDVERTEX_DOCAMAX": - F.CHILD(1, F.MAXDOCA()) * 10, + F.CHILD(1, F.MAXSDOCA()) * 10, "ThreeBody_ENDVERTEX_DOCAMAX": - F.MAXDOCA() * 10, + F.MAXSDOCA() * 10, "TwoBody_FDCHI2_OWNPV": fmath.log(F.CHILD(1, F.BPVFDCHI2(pvs))), "TwoBody_IPCHI2_OWNPV": diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/DiMuonTrackEfficiency.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/DiMuonTrackEfficiency.py index 20d6ef9f268..d1178430117 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/DiMuonTrackEfficiency.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/DiMuonTrackEfficiency.py @@ -151,8 +151,8 @@ def make_JPsiCombiner(particles, F.SUM(F.PT) > get_cuts['min_JPsiPT'], ) if get_cuts['max_JPsiDOCA'] is not None: - combination_cut = F.require_all(combination_cut, - F.MAXDOCACUT(get_cuts['max_JPsiDOCA'])) + combination_cut = F.require_all( + combination_cut, F.MAXSDOCACUT(get_cuts['max_JPsiDOCA'])) #additional cuts mother_cut = F.require_all( in_range(get_cuts['min_JPsimass'], F.MASS, get_cuts['max_JPsimass']), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/KSVeloLong.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/KSVeloLong.py index a96b89e8a49..158e72a1e03 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/KSVeloLong.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/KSVeloLong.py @@ -96,7 +96,7 @@ def make_kshort_pi_muplus_specific_charge(pions, name="KShortMuPiCombiner_{hash}"): combination_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), - F.MAXDOCACUT(comb_maxdoca), + F.MAXSDOCACUT(comb_maxdoca), ) vertex_code = F.require_all(F.END_VRHO < 100 * mm, F.END_VZ > 18 * mm, F.END_VZ < 600 * mm, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/Velo2Long_B2JpsiK_ElectronProbe.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/Velo2Long_B2JpsiK_ElectronProbe.py index b8bf40eb222..f83ad9f25f0 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/Velo2Long_B2JpsiK_ElectronProbe.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/Velo2Long_B2JpsiK_ElectronProbe.py @@ -59,7 +59,7 @@ def make_b2Jpsiee( combination_code = F.require_all( F.MASS > min_B_mass, F.MASS < max_B_mass, - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), ((F.CHILD(1, F.CHILD(1, F.PX)) + F.CHILD(2, F.PX)) * (F.CHILD(1, F.CHILD(1, F.PX)) + F.CHILD(2, F.PX)) + (F.CHILD(1, F.CHILD(1, F.PY)) + F.CHILD(2, F.PY)) * @@ -98,7 +98,7 @@ def make_TagAndProbeJpsi( ): combination_code = F.require_all( - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), F.CHILD(1, F.PT) > 450 * MeV, # force the first track to be long, F.CHILD(2, F.PT) < 450 * MeV # force the second track to be velo ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/Velo2Long_B2JpsiK_MuonProbe.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/Velo2Long_B2JpsiK_MuonProbe.py index b93e7fb9dc4..189b23620ab 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/Velo2Long_B2JpsiK_MuonProbe.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/Velo2Long_B2JpsiK_MuonProbe.py @@ -61,7 +61,7 @@ def make_b2Jpsimumu( combination_code = F.require_all( F.MASS > min_B_mass, F.MASS < max_B_mass, - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), ((F.CHILD(1, F.CHILD(1, F.PX)) + F.CHILD(2, F.PX)) * (F.CHILD(1, F.CHILD(1, F.PX)) + F.CHILD(2, F.PX)) + (F.CHILD(1, F.CHILD(1, F.PY)) + F.CHILD(2, F.PY)) * @@ -100,7 +100,7 @@ def make_TagAndProbeJpsi( ): combination_code = F.require_all( - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), F.CHILD(1, F.PT) > 450 * MeV, # force the first track to be long, F.CHILD(2, F.PT) < 450 * MeV # force the second track to be velo ) -- GitLab From 05f85040af6696dd9750a96c7138acd24d285cf1 Mon Sep 17 00:00:00 2001 From: Wouter Hulsbergen Date: Thu, 21 Mar 2024 11:38:35 +0100 Subject: [PATCH 3/9] reverted DOCA replacement for long-lived particles --- .../lines/bnoc/builders/basic_builder.py | 12 +- .../lines/charm/ccbaryon_to_hyperon_dh.py | 10 +- .../python/Hlt2Conf/lines/charm/d_to_ksh.py | 4 +- .../python/Hlt2Conf/lines/charm/hyperons.py | 733 +++++++++--------- .../python/Hlt2Conf/lines/charm/hyperonsTT.py | 8 +- .../Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py | 4 +- .../lines/rd/builders/baryonic_builders.py | 4 +- .../lines/rd/builders/rdbuilder_thor.py | 8 +- 8 files changed, 391 insertions(+), 392 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py index 25f71063b34..68ed68bc68f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py @@ -685,7 +685,7 @@ def make_bbaryon_ks0_ll( descriptor = 'KS0 -> pi+ pi-' combination_code = F.require_all( in_range(mass_min * 0.9, F.MASS, mass_max * 1.1), - F.MAXSDOCACUT(doca_max)) + F.MAXDOCACUT(doca_max)) pvs = make_pvs() vertex_code = F.require_all( in_range(mass_min, F.MASS, mass_max), F.PT > pt_min, @@ -725,7 +725,7 @@ def make_bbaryon_ks0_dd( descriptor = 'KS0 -> pi+ pi-' combination_code = F.require_all( in_range(mass_min * 0.8, F.MASS, mass_max * 1.2), - F.MAXSDOCACHI2CUT(adocachi2cut)) + F.MAXDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = F.require_all( in_range(mass_min, F.MASS, mass_max), F.CHI2DOF < vchi2pdof_max, @@ -1498,7 +1498,7 @@ def make_veryloose_lambda_LL( descriptor = '[Lambda0 -> p+ pi-]cc' combination_code = require_all( in_range(mass_window_comb_min, F.MASS, mass_window_comb_max), - F.MAXSDOCACHI2CUT(adocachi2cut)) + F.MAXDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = require_all( in_range(mass_window_min, F.MASS, mass_window_max), @@ -1551,7 +1551,7 @@ def make_loose_lambda_DD( descriptor = '[Lambda0 -> p+ pi-]cc' combination_code = require_all( in_range(mass_window_comb_min, F.MASS, mass_window_comb_max), - F.MAXSDOCACHI2CUT(adocachi2cut)) + F.MAXDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = require_all( in_range(mass_window_min, F.MASS, mass_window_max), @@ -1592,7 +1592,7 @@ def make_xim_to_lambda0pim(lambdas, pvs = make_pvs() comb_cut = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.P > comb_p_min, - F.MAXSDOCACUT(doca_max)) + F.MAXDOCACUT(doca_max)) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), F.P > p_min, F.PT > pt_min, F.CHI2DOF < vchi2pdof_max, @@ -1633,7 +1633,7 @@ def make_omegam_to_lambda0km(lambdas, pvs = make_pvs() comb_cut = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.P > comb_p_min, - F.MAXSDOCACUT(doca_max)) + F.MAXDOCACUT(doca_max)) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), F.P > p_min, F.PT > pt_min, F.CHI2DOF < vchi2pdof_max, F.CHI2DOF < vchi2pdof_max, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_hyperon_dh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_hyperon_dh.py index da1b7d7e039..2063676a965 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_hyperon_dh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/ccbaryon_to_hyperon_dh.py @@ -129,8 +129,8 @@ def make_lambdall(): protons = filter_long_protons_from_lambda() pions = filter_long_pions_from_lambda() combinationcode = F.require_all( - in_range(1085 * MeV, F.MASS, 1145 * MeV), F.MAXSDOCACHI2CUT(30.), - F.MAXSDOCACUT(0.2 * mm)) + in_range(1085 * MeV, F.MASS, 1145 * MeV), F.MAXDOCACHI2CUT(30.), + F.MAXDOCACUT(0.2 * mm)) vertexcode = F.require_all( in_range(1095 * MeV, F.MASS, 1135 * MeV), F.CHI2DOF < 9., F.BPVVDZ(pvs) > 4 * mm, in_range(-100 * mm, F.END_VZ, 500 * mm)) @@ -147,8 +147,8 @@ def make_lambdadd(): pions = filter_down_pions_from_lambda() protons = filter_down_protons_from_lambda() combinationcode = F.require_all( - in_range(1075 * MeV, F.MASS, 1160 * MeV), F.MAXSDOCACHI2CUT(30.), - F.MAXSDOCACUT(2 * mm)) + in_range(1075 * MeV, F.MASS, 1160 * MeV), F.MAXDOCACHI2CUT(30.), + F.MAXDOCACUT(2 * mm)) vertexcode = F.require_all( in_range(1095 * MeV, F.MASS, 1140 * MeV), F.CHI2DOF < 9., in_range(300 * mm, F.END_VZ, 2275 * mm)) @@ -164,7 +164,7 @@ def make_xim_to_lambdapi(lambdas, pions): """Return a Xi- -> Lambda0 pi- decay maker.""" pvs = make_pvs() combinationcode = F.require_all( - in_range(1248 * MeV, F.MASS, 1396 * MeV), F.MAXSDOCACUT(2 * mm), + in_range(1248 * MeV, F.MASS, 1396 * MeV), F.MAXDOCACUT(2 * mm), F.SUM(F.PT) > 500 * MeV) vertexcode = F.require_all( in_range(1258 * MeV, F.MASS, 1386 * MeV), F.PT > 300 * MeV, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py index 287fcc5f930..ab80703bf66 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py @@ -102,7 +102,7 @@ def make_ks_ll( ): """Make KS -> pi+ pi- from long tracks.""" comb_cut = F.require_all( - F.MAXSDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), @@ -143,7 +143,7 @@ def make_ks_dd( Make KS -> pi+ pi- from downstream tracks. """ comb_cut = F.require_all( - F.MAXSDOCACUT(doca_max), F.MAXSDOCACHI2CUT(docachi2_max), + F.MAXDOCACUT(doca_max), F.MAXDOCACHI2CUT(docachi2_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperons.py index 2f15a6bb9da..a233d70082a 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperons.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperons.py @@ -382,7 +382,7 @@ def _make_ll_kshorts(): name='Charm_Hyperons_KS0_LL_{hash}', CombinationCut=F.require_all( F.MASS > 435 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), F.MASS < 560 * MeV, F.PT > 300 * MeV, F.P > 3.5 * GeV, @@ -405,8 +405,8 @@ def _make_dd_kshorts(): DecayDescriptor="KS0 -> pi+ pi-", name='Charm_Hyperons_KS0_DD_{hash}', CombinationCut=F.require_all( - F.MAXSDOCACUT(2 * mm), - F.MAXSDOCACHI2CUT(12.), + F.MAXDOCACUT(2 * mm), + F.MAXDOCACHI2CUT(12.), F.math.in_range(425 * MeV, F.MASS, 570 * MeV), F.PT > 400 * MeV, F.P > 4.5 * GeV, @@ -429,7 +429,7 @@ def _make_ll_lambdas_for_charm(): name='Charm_Hyperons_LambdaFromC_LL_{hash}', CombinationCut=F.require_all( F.MASS < 1190 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 500 * MeV, ), CompositeCut=F.require_all( @@ -450,7 +450,7 @@ def _make_dd_lambdas(): name='Charm_Hyperons_Lambda_DD_{hash}', CombinationCut=F.require_all( F.MASS < 1150 * MeV, - F.MAXSDOCACUT(3 * mm), + F.MAXDOCACUT(3 * mm), F.PT > 500 * MeV, ), CompositeCut=F.require_all( @@ -471,7 +471,7 @@ def _make_ll_lambdas_for_hyperon(): name='Charm_Hyperons_LambdaFromHyperon_LL_{hash}', CombinationCut=F.require_all( F.MASS < 1190 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 450 * MeV, ), CompositeCut=F.require_all( @@ -492,7 +492,7 @@ def _make_lll_xis(ll_lambdas, pions, pvs): name='Charm_Hyperons_Xim_LLL_{hash}', CombinationCut=F.require_all( F.MASS < 1400 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), F.PT > 500 * MeV, ), CompositeCut=F.require_all( @@ -514,7 +514,7 @@ def _make_ddl_xis(dd_lambdas, pions, pvs): name='Charm_Hyperons_Xim_DDL_{hash}', CombinationCut=F.require_all( F.MASS < 1400 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), F.PT > 1 * GeV, F.P > 14 * GeV, ), @@ -538,7 +538,7 @@ def _make_ddd_xis(dd_lambdas, down_pions, pvs): CombinationCut=F.require_all( F.MASS < 1390 * MeV, F.PT > 600 * MeV, - F.MAXSDOCACUT(3 * mm), + F.MAXDOCACUT(3 * mm), ), CompositeCut=F.require_all( F.math.in_range(1290 * MeV, @@ -562,7 +562,7 @@ def _make_lll_omegas(ll_lambdas, kaons, pvs): name='Charm_Hyperons_Omegam_LLL_{hash}', CombinationCut=F.require_all( F.MASS < 1750 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), F.PT > 550 * MeV, ), CompositeCut=F.require_all( @@ -584,7 +584,7 @@ def _make_ddl_omegas(dd_lambdas, kaons, pvs): name='Charm_Hyperons_Omegam_DDL_{hash}', CombinationCut=F.require_all( F.MASS < 1750 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), F.PT > 1 * GeV, F.P > 14 * GeV, ), @@ -608,7 +608,7 @@ def _make_ddd_omegas(dd_lambdas, down_kaons, pvs): CombinationCut=F.require_all( F.MASS < 1750 * MeV, F.PT > 650 * MeV, - F.MAXSDOCACUT(3 * mm), + F.MAXDOCACUT(3 * mm), ), CompositeCut=F.require_all( F.math.in_range(1640 * MeV, @@ -770,7 +770,7 @@ def _make_bbaryon_to_cbaryonttrack(cbaryon, track, pvs, descriptor, suffix): name='Charm_Hyperons_XbToXcTrack_{hash}', CombinationCut=F.require_all( F.MASS < 6.4 * GeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 1.4 * GeV, F.P > 24 * GeV, ), @@ -795,7 +795,7 @@ def _make_xib0_to_xicppim(xicp, pim, pvs, suffix): CombinationCut=F.require_all( F.MASS > 5.3 * GeV, F.MASS < 6.1 * GeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 1.4 * GeV, F.P > 24 * GeV, ), @@ -820,7 +820,7 @@ def _make_bbaryon_to_cbaryond(xc, d, pvs, descriptor, suffix): name='Charm_Hyperons_XbToXcD_{hash}', CombinationCut=F.require_all( F.math.in_range(4.9 * GeV, F.MASS, 6.4 * GeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 3.8 * GeV, F.P > 28 * GeV, F.SUM(F.PT) > 4.5 * GeV, @@ -847,7 +847,7 @@ def _make_detached_lc_to_lpi_ll(ll_lambdas, pions, pvs): name='Charm_Hyperons_DetachedLcpToL0Pip_LL_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -871,7 +871,7 @@ def _make_detached_lc_to_lpi_dd(dd_lambdas, pions, pvs): name='Charm_Hyperons_DetachedLcpToL0Pip_DD_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), F.PT > 0.9 * GeV, F.P > 15 * GeV, ), @@ -894,7 +894,7 @@ def _make_detached_xicp_to_lpi_ll(ll_lambdas, pions, pvs): name='Charm_Hyperons_DetachedXicpToL0Pip_LL_{hash}', CombinationCut=F.require_all( F.math.in_range(2360 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -918,7 +918,7 @@ def _make_detached_xicp_to_lpi_dd(dd_lambdas, pions, pvs): name='Charm_Hyperons_DetachedXicpToL0Pip_DD_{hash}', CombinationCut=F.require_all( F.math.in_range(2360 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -941,7 +941,7 @@ def _make_detached_xicz_to_ximpi_lll(lll_xis, pions, pvs): name='Charm_Hyperons_DetachedXic0ToXimPip_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -965,7 +965,7 @@ def _make_detached_xicz_to_ximpi_ddl(ddl_xis, pions, pvs): name='Charm_Hyperons_DetachedXic0ToXimPip_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -989,7 +989,7 @@ def _make_detached_xicz_to_ximk_lll(lll_xis, kaons, pvs): name='Charm_Hyperons_DetachedXic0ToXimKp_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -1013,7 +1013,7 @@ def _make_detached_xicz_to_ximk_ddl(ddl_xis, kaons, pvs): name='Charm_Hyperons_DetachedXic0ToXimKp_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -1037,7 +1037,7 @@ def _make_detached_oc_to_ximk_lll(lll_xis, kaons, pvs): name='Charm_Hyperons_DetachedOc0ToXimKp_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1061,7 +1061,7 @@ def _make_detached_oc_to_ximk_ddl(ddl_xis, kaons, pvs): name='Charm_Hyperons_DetachedOc0ToXimKp_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -1085,7 +1085,7 @@ def _make_detached_oc_to_ompi_lll(lll_oms, pions, pvs): name='Charm_Hyperons_DetachedOc0ToOmPip_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 1.3 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1109,7 +1109,7 @@ def _make_detached_oc_to_ompi_ddl(ddl_oms, pions, pvs): name='Charm_Hyperons_DetachedOc0ToOmPip_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 1.3 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.3 * GeV, @@ -1133,11 +1133,11 @@ def _make_detached_xicp_to_ximpipi_lll(lll_xis, pions, pvs): name='Charm_Hyperons_DetachedXicpToXimPipPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 250 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 250 * um, + F.DOCA(2, 3) < 250 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -1162,11 +1162,11 @@ def _make_detached_xicp_to_ximpipi_ddl(ddl_xis, pions, pvs): name='Charm_Hyperons_DetachedXicpToXimPipPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 1.2 * mm, - F.SDOCA(2, 3) < 400 * um, + F.DOCA(1, 3) < 1.2 * mm, + F.DOCA(2, 3) < 400 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -1191,11 +1191,11 @@ def _make_detached_xicz_to_lkpi_ll(ll_lambdas, kaons, pions, pvs): name='Charm_Hyperons_DetachedXic0ToL0KmPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 250 * um, F.math.in_range(2360 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -1220,11 +1220,11 @@ def _make_detached_xicz_to_lkpi_dd(dd_lambdas, kaons, pions, pvs): name='Charm_Hyperons_DetachedXic0ToL0KmPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(800 * um), + F.MAXDOCACUT(800 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 1 * mm, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 1 * mm, + F.DOCA(2, 3) < 250 * um, F.math.in_range(2360 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -1297,7 +1297,7 @@ def lc_to_lpi_ll_line(name="Hlt2Charm_LcpToL0Pip_LL"): name='Charm_Hyperons_LcpToL0Pip_LL_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -1327,7 +1327,7 @@ def lc_to_lpi_dd_line(name="Hlt2Charm_LcpToL0Pip_DD"): name='Charm_Hyperons_LcpToL0Pip_DD_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1442,7 +1442,7 @@ def lc_to_lk_ll_line(name="Hlt2Charm_LcpToL0Kp_LL"): name='Charm_Hyperons_LcpToL0Kp_LL_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -1472,7 +1472,7 @@ def lc_to_lk_dd_line(name="Hlt2Charm_LcpToL0Kp_DD"): name='Charm_Hyperons_LcpToL0Kp_DD_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1501,7 +1501,7 @@ def lc_to_lk_llinclb_line(name="Hlt2Charm_LcpToL0Kp_LL_Inclb_PR"): name='Charm_Hyperons_DetachedLcpToL0Kp_LL_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -1535,7 +1535,7 @@ def lc_to_lk_ddinclb_line(name="Hlt2Charm_LcpToL0Kp_DD_Inclb_PR"): name='Charm_Hyperons_DetachedLcpToL0Kp_DD_{hash}', CombinationCut=F.require_all( F.math.in_range(2080 * MeV, F.MASS, 2405 * MeV), - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1567,7 +1567,7 @@ def xicp_to_lpi_ll_line(name="Hlt2Charm_XicpToL0Pip_LL"): name='Charm_Hyperons_XicpToL0Pip_LL_{hash}', CombinationCut=F.require_all( F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 1.3 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -1598,7 +1598,7 @@ def xicp_to_lpi_dd_line(name="Hlt2Charm_XicpToL0Pip_DD"): name='Charm_Hyperons_XicpToL0Pip_DD_{hash}', CombinationCut=F.require_all( F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), F.PT > 1.3 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2.4 * GeV, @@ -1723,7 +1723,7 @@ def xicz_to_ximpi_lll_line(name="Hlt2Charm_Xic0ToXimPip_LLL"): name='Charm_Hyperons_Xic0ToXimPip_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1756,7 +1756,7 @@ def xicz_to_ximpi_ddl_line(name="Hlt2Charm_Xic0ToXimPip_DDL"): name='Charm_Hyperons_Xic0ToXimPip_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -1887,7 +1887,7 @@ def xicz_to_ximk_lll_line(name="Hlt2Charm_Xic0ToXimKp_LLL"): name='Charm_Hyperons_Xic0ToXimKp_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -1919,7 +1919,7 @@ def xicz_to_ximk_ddl_line(name="Hlt2Charm_Xic0ToXimKp_DDL"): name='Charm_Hyperons_Xic0ToXimKp_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2056,7 +2056,7 @@ def xicz_to_omk_lll_line(name="Hlt2Charm_Xic0ToOmKp_LLL"): name='Charm_Hyperons_Xic0ToOmKp_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -2088,7 +2088,7 @@ def xicz_to_omk_ddl_line(name="Hlt2Charm_Xic0ToOmKp_DDL"): name='Charm_Hyperons_Xic0ToOmKp_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2120,7 +2120,7 @@ def xicz_to_l0ll_kshortsll_line(name="Hlt2Charm_Xic0ToL0Ks_LLLL", prescale=1): name='Charm_Hyperons_Xic0ToL0Ks_LLLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2370 * MeV, F.MASS, 2570 * MeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2154,7 +2154,7 @@ def xicz_to_l0dd_kshortsll_line(name="Hlt2Charm_Xic0ToL0Ks_DDLL", prescale=1): name='Charm_Hyperons_Xic0ToL0Ks_DDLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2370 * MeV, F.MASS, 2570 * MeV), - F.MAXSDOCACUT(2 * mm), + F.MAXDOCACUT(2 * mm), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2192,7 +2192,7 @@ def xicz_to_l0ll_kshortsdd_line(name="Hlt2Charm_Xic0ToL0Ks_LLDD", prescale=1): F.SUM(F.PT) > 2.2 * GeV, ), CompositeCut=F.require_all( - F.MAXSDOCACUT(2 * mm), + F.MAXDOCACUT(2 * mm), F.math.in_range(2390 * MeV, F.MASS, 2550 * MeV), F.PT > 1 * GeV, F.P > 24 * GeV, @@ -2220,7 +2220,7 @@ def xicz_to_l0dd_kshortsdd_line(name="Hlt2Charm_Xic0ToL0Ks_DDDD", prescale=1): name='Charm_Hyperons_Xic0ToL0Ks_DDDD_{hash}', CombinationCut=F.require_all( F.math.in_range(2370 * MeV, F.MASS, 2570 * MeV), - F.MAXSDOCACUT(5 * mm), + F.MAXDOCACUT(5 * mm), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2254,7 +2254,7 @@ def oc_to_ximpi_lll_line(name="Hlt2Charm_Oc0ToXimPip_LLL"): name='Charm_Hyperons_Oc0ToXimPip_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 15 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -2286,7 +2286,7 @@ def oc_to_ximpi_ddl_line(name="Hlt2Charm_Oc0ToXimPip_DDL"): name='Charm_Hyperons_Oc0ToXimPip_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2319,7 +2319,7 @@ def oc_to_ximk_lll_line(name="Hlt2Charm_Oc0ToXimKp_LLL"): name='Charm_Hyperons_Oc0ToXimKp_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -2351,7 +2351,7 @@ def oc_to_ximk_ddl_line(name="Hlt2Charm_Oc0ToXimKp_DDL"): name='Charm_Hyperons_Oc0ToXimKp_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2487,7 +2487,7 @@ def oc_to_ompi_lll_line(name="Hlt2Charm_Oc0ToOmPip_LLL"): name='Charm_Hyperons_Oc0ToOmPip_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 16 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -2519,7 +2519,7 @@ def oc_to_ompi_ddl_line(name="Hlt2Charm_Oc0ToOmPip_DDL"): name='Charm_Hyperons_Oc0ToOmPip_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2654,7 +2654,7 @@ def oc_to_omk_lll_line(name="Hlt2Charm_Oc0ToOmKp_LLL"): name='Charm_Hyperons_Oc0ToOmKp_LLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 0.9 * GeV, F.P > 19 * GeV, F.SUM(F.PT) > 2 * GeV, @@ -2686,7 +2686,7 @@ def oc_to_omk_ddl_line(name="Hlt2Charm_Oc0ToOmKp_DDL"): name='Charm_Hyperons_Oc0ToOmKp_DDL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2718,7 +2718,7 @@ def oc_to_l0ll_kshortsll_line(name="Hlt2Charm_Oc0ToL0Ks_LLLL", prescale=1): name='Charm_Hyperons_Oc0ToL0Ks_LLLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2752,7 +2752,7 @@ def oc_to_l0dd_kshortsll_line(name="Hlt2Charm_Oc0ToL0Ks_DDLL", prescale=1): name='Charm_Hyperons_Oc0ToL0Ks_DDLL_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(2 * mm), + F.MAXDOCACUT(2 * mm), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2785,7 +2785,7 @@ def oc_to_l0ll_kshortsdd_line(name="Hlt2Charm_Oc0ToL0Ks_LLDD", prescale=1): name='Charm_Hyperons_Oc0ToL0Ks_LLDD_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(2 * mm), + F.MAXDOCACUT(2 * mm), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2818,7 +2818,7 @@ def oc_to_l0dd_kshortsdd_line(name="Hlt2Charm_Oc0ToL0Ks_DDDD", prescale=1): name='Charm_Hyperons_Oc0ToL0Ks_DDDD_{hash}', CombinationCut=F.require_all( F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), - F.MAXSDOCACUT(5 * mm), + F.MAXDOCACUT(5 * mm), F.PT > 0.9 * GeV, F.P > 23 * GeV, F.SUM(F.PT) > 2.2 * GeV, @@ -2871,11 +2871,10 @@ def o_to_xipipi_line(name="Hlt2Charm_OmToXimPimPip_LongXim_SP"): name='Charm_Hyperons_OmToXimPimPip_{hash}', Combination12Cut=F.require_all( F.MASS < 1631 * MeV, - F.MAXSDOCACUT(250 * um), + F.MAXDOCACUT(250 * um), ), - CombinationCut=F.require_all(F.MASS < 1770 * MeV, - F.MAXSDOCACUT(250 * um), F.PT > 1 * GeV, - F.P > 16 * GeV), + CombinationCut=F.require_all(F.MASS < 1770 * MeV, F.MAXDOCACUT( + 250 * um), F.PT > 1 * GeV, F.P > 16 * GeV), CompositeCut=F.require_all( F.MASS < 1750 * MeV, F.CHI2DOF < 7., @@ -2905,12 +2904,12 @@ def lc_to_lksk_ll_line(name="Hlt2Charm_LcpToL0KsKp_LLLL"): name='Charm_Hyperons_LcpToL0KsKp_LLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 1915 * MeV, - F.MAXSDOCACUT(300 * um), + F.MAXDOCACUT(300 * um), ), CombinationCut=F.require_all( F.MASS < 2405 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 250 * um, F.PT > 1.3 * GeV, F.P > 17 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -2944,11 +2943,11 @@ def lc_to_lksk_dl_line(name="Hlt2Charm_LcpToL0KsKp_DDLL"): name='Charm_Hyperons_LcpToL0KsKp_DDLL_{hash}', Combination12Cut=F.require_all( F.MASS < 1915 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 600 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 600 * um, + F.DOCA(2, 3) < 250 * um, F.MASS < 2405 * MeV, F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -2982,11 +2981,11 @@ def lc_to_lksk_ld_line(name="Hlt2Charm_LcpToL0KsKp_LLDD"): name='Charm_Hyperons_LcpToL0KsKp_LLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 1915 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 800 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 800 * um, F.MASS < 2405 * MeV, F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3030,12 +3029,12 @@ def lcp_to_smkpi_longsm_line( name='Charm_Hyperons_LcpToSmPipPip_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), ), CombinationCut=F.require_all( F.MASS > 2165 * MeV, F.MASS < 2405 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 1.3 * GeV, F.P > 17 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -3055,7 +3054,7 @@ def lcp_to_smkpi_longsm_line( CombinationCut=F.require_all( F.MASS > 5.2 * GeV, F.MASS < 6.0 * GeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 1.4 * GeV, F.P > 24 * GeV, ), @@ -3093,11 +3092,11 @@ def lc_to_ximkpi_lll_line(name="Hlt2Charm_LcpToXimKpPip_LLL"): name='Charm_Hyperons_LcpToXimKpPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2265 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 250 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 250 * um, + F.DOCA(2, 3) < 250 * um, F.math.in_range(2165 * MeV, F.MASS, 2405 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3132,11 +3131,11 @@ def lc_to_ximkpi_ddl_line(name="Hlt2Charm_LcpToXimKpPip_DDL"): name='Charm_Hyperons_LcpToXimKpPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2265 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 1.2 * mm, - F.SDOCA(2, 3) < 400 * um, + F.DOCA(1, 3) < 1.2 * mm, + F.DOCA(2, 3) < 400 * um, F.math.in_range(2165 * MeV, F.MASS, 2405 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3171,11 +3170,11 @@ def xicp_to_lkspi_ll_line(name="Hlt2Charm_XicpToL0KsPip_LLLL"): name='Charm_Hyperons_XicpToL0KsPip_LLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(300 * um), + F.MAXDOCACUT(300 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 250 * um, F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3210,11 +3209,11 @@ def xicp_to_lkspi_dl_line(name="Hlt2Charm_XicpToL0KsPip_DDLL"): name='Charm_Hyperons_XicpToL0KsPip_DDLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 600 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 600 * um, + F.DOCA(2, 3) < 250 * um, F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3248,11 +3247,11 @@ def xicp_to_lkspi_ld_line(name="Hlt2Charm_XicpToL0KsPip_LLDD"): name='Charm_Hyperons_XicpToL0KsPip_LLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 800 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 800 * um, F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3287,11 +3286,11 @@ def xicp_to_lksk_ll_line(name="Hlt2Charm_XicpToL0KsKp_LLLL"): name='Charm_Hyperons_XicpToL0KsKp_LLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 150 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 150 * um, + F.DOCA(2, 3) < 200 * um, F.math.in_range(2295 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3326,11 +3325,11 @@ def xicp_to_lksk_dl_line(name="Hlt2Charm_XicpToL0KsKp_DDLL"): name='Charm_Hyperons_XicpToL0KsKp_DDLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 500 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 500 * um, + F.DOCA(2, 3) < 200 * um, F.math.in_range(2295 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3364,11 +3363,11 @@ def xicp_to_lksk_ld_line(name="Hlt2Charm_XicpToL0KsKp_LLDD"): name='Charm_Hyperons_XicpToL0KsKp_LLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 150 * um, - F.SDOCA(2, 3) < 500 * um, + F.DOCA(1, 3) < 150 * um, + F.DOCA(2, 3) < 500 * um, F.math.in_range(2295 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3417,12 +3416,12 @@ def xicp_to_spkpi_longsp_line( name='Charm_Hyperons_XicpToSpKmPip_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), ), CombinationCut=F.require_all( F.MASS > 2350 * MeV, F.MASS < 2590 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 1.3 * GeV, F.P > 17 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -3458,11 +3457,11 @@ def xicp_to_ximpipi_lll_line(name="Hlt2Charm_XicpToXimPipPip_LLL"): name='Charm_Hyperons_XicpToXimPipPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 250 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 250 * um, + F.DOCA(2, 3) < 250 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3496,11 +3495,11 @@ def xicp_to_ximpipi_ddl_line(name="Hlt2Charm_XicpToXimPipPip_DDL"): name='Charm_Hyperons_XicpToXimPipPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 1.2 * mm, - F.SDOCA(2, 3) < 400 * um, + F.DOCA(1, 3) < 1.2 * mm, + F.DOCA(2, 3) < 400 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3643,12 +3642,12 @@ def xicp_to_ximpipi_longxim_line( name="Charm_Hyperons_XicpToXiPipPip_XiLong", Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), ), CombinationCut=F.require_all( F.MASS > 2350 * MeV, F.MASS < 2590 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 1.3 * GeV, F.P > 17 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -3687,11 +3686,11 @@ def xicp_to_ximkpi_lll_line(name="Hlt2Charm_XicpToXimKpPip_LLL"): name='Charm_Hyperons_XicpToXimKpPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 200 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3728,11 +3727,11 @@ def xicp_to_ximkpi_ddl_line(name="Hlt2Charm_XicpToXimKpPip_DDL"): name='Charm_Hyperons_XicpToXimKpPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 1.2 * mm, - F.SDOCA(2, 3) < 400 * um, + F.DOCA(1, 3) < 1.2 * mm, + F.DOCA(2, 3) < 400 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3770,11 +3769,11 @@ def xicp_to_omkpi_lll_line(name="Hlt2Charm_XicpToOmKpPip_LLL"): name='Charm_Hyperons_XicpToOmKpPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 200 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3811,11 +3810,11 @@ def xicp_to_omkpi_ddl_line(name="Hlt2Charm_XicpToOmKpPip_DDL"): name='Charm_Hyperons_XicpToOmKpPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 1.2 * mm, - F.SDOCA(2, 3) < 400 * um, + F.DOCA(1, 3) < 1.2 * mm, + F.DOCA(2, 3) < 400 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3859,12 +3858,12 @@ def xicp_to_omkpi_longom_line( name='Charm_Hyperons_XicpToOmKpPip_OmLong_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), ), CombinationCut=F.require_all( F.MASS > 2350 * MeV, F.MASS < 2590 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), F.PT > 1.3 * GeV, F.P > 17 * GeV, F.SUM(F.PT) > 1.8 * GeV, @@ -3899,11 +3898,11 @@ def xicz_to_lpipi_ll_line(name="Hlt2Charm_Xic0ToL0PimPip_LL"): name='Charm_Hyperons_Xic0ToL0PimPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 100 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 100 * um, + F.DOCA(2, 3) < 200 * um, F.math.in_range(2250 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -3936,11 +3935,11 @@ def xicz_to_lpipi_dd_line(name="Hlt2Charm_Xic0ToL0PimPip_DD"): name='Charm_Hyperons_Xic0ToL0PimPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(800 * um), + F.MAXDOCACUT(800 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 800 * um, - F.SDOCA(2, 3) < 150 * um, + F.DOCA(1, 3) < 800 * um, + F.DOCA(2, 3) < 150 * um, F.math.in_range(2250 * MeV, F.MASS, 2590 * MeV), F.MAX(F.MINIPCHI2(pvs)) > 9., F.PT > 1.3 * GeV, @@ -3974,11 +3973,11 @@ def xicz_to_lkpi_ll_line(name="Hlt2Charm_Xic0ToL0KmPip_LL"): name='Charm_Hyperons_Xic0ToL0KmPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 150 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 150 * um, + F.DOCA(2, 3) < 250 * um, F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4012,11 +4011,11 @@ def xicz_to_lkpi_dd_line(name="Hlt2Charm_Xic0ToL0KmPip_DD"): name='Charm_Hyperons_Xic0ToL0KmPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(700 * um), + F.MAXDOCACUT(700 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 800 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 800 * um, + F.DOCA(2, 3) < 250 * um, F.math.in_range(2260 * MeV, F.MASS, 2590 * MeV), F.MAX(F.MINIPCHI2(pvs)) > 9., F.PT > 1.3 * GeV, @@ -4149,11 +4148,11 @@ def xicz_to_lkk_ll_line(name="Hlt2Charm_Xic0ToL0KmKp_LL"): name='Charm_Hyperons_Xic0ToL0KmKp_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 100 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 100 * um, + F.DOCA(2, 3) < 200 * um, F.math.in_range(2280 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4185,11 +4184,11 @@ def xicz_to_lkk_dd_line(name="Hlt2Charm_Xic0ToL0KmKp_DD"): name='Charm_Hyperons_Xic0ToL0KmKp_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 750 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 750 * um, + F.DOCA(2, 3) < 250 * um, F.math.in_range(2280 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4222,11 +4221,11 @@ def xicz_to_ximkspi_ll_line(name="Hlt2Charm_Xic0ToXimKsPip_LLLLL"): name='Charm_Hyperons_Xic0ToXimKsPip_LLLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(250 * um), + F.MAXDOCACUT(250 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 150 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 150 * um, + F.DOCA(2, 3) < 200 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4263,11 +4262,11 @@ def xicz_to_ximkspi_ld_line(name="Hlt2Charm_Xic0ToXimKsPip_LLLDD"): name='Charm_Hyperons_Xic0ToXimKsPip_LLLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 150 * um, - F.SDOCA(2, 3) < 1 * mm, + F.DOCA(1, 3) < 150 * um, + F.DOCA(2, 3) < 1 * mm, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4302,11 +4301,11 @@ def xicz_to_ximkspi_dl_line(name="Hlt2Charm_Xic0ToXimKsPip_DDLLL"): name='Charm_Hyperons_Xic0ToXimKsPip_DDLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 750 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 750 * um, + F.DOCA(2, 3) < 200 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4342,11 +4341,11 @@ def xicz_to_ximkspi_dd_line(name="Hlt2Charm_Xic0ToXimKsPip_DDLDD"): name='Charm_Hyperons_Xic0ToXimKsPip_DDLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2450 * MeV, - F.MAXSDOCACUT(2 * mm), + F.MAXDOCACUT(2 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 750 * um, - F.SDOCA(2, 3) < 1 * mm, + F.DOCA(1, 3) < 750 * um, + F.DOCA(2, 3) < 1 * mm, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4382,11 +4381,11 @@ def xicz_to_ximksk_ll_line(name="Hlt2Charm_Xic0ToXimKsKp_LLLLL"): name='Charm_Hyperons_Xic0ToXimKsKp_LLLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXSDOCACUT(250 * um), + F.MAXDOCACUT(250 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 150 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 150 * um, + F.DOCA(2, 3) < 200 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4422,11 +4421,11 @@ def xicz_to_ximksk_ld_line(name="Hlt2Charm_Xic0ToXimKsKp_LLLDD"): name='Charm_Hyperons_Xic0ToXimKsKp_LLLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 150 * um, - F.SDOCA(2, 3) < 1 * mm, + F.DOCA(1, 3) < 150 * um, + F.DOCA(2, 3) < 1 * mm, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4462,11 +4461,11 @@ def xicz_to_ximksk_dl_line(name="Hlt2Charm_Xic0ToXimKsKp_DDLLL"): name='Charm_Hyperons_Xic0ToXimKsKp_DDLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 750 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 750 * um, + F.DOCA(2, 3) < 200 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4502,11 +4501,11 @@ def xicz_to_ximksk_dd_line(name="Hlt2Charm_Xic0ToXimKsKp_DDLDD"): name='Charm_Hyperons_Xic0ToXimKsKp_DDLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXSDOCACUT(2 * mm), + F.MAXDOCACUT(2 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 750 * um, - F.SDOCA(2, 3) < 1 * mm, + F.DOCA(1, 3) < 750 * um, + F.DOCA(2, 3) < 1 * mm, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4544,11 +4543,11 @@ def oc_to_lkpi_ll_line(name="Hlt2Charm_Oc0ToL0KmPip_LL"): name='Charm_Hyperons_Oc0ToL0KmPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2675 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 150 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 150 * um, + F.DOCA(2, 3) < 250 * um, F.math.in_range(2470 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4584,11 +4583,11 @@ def oc_to_lkpi_dd_line(name="Hlt2Charm_Oc0ToL0KmPip_DD"): name='Charm_Hyperons_Oc0ToL0KmPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2675 * MeV, - F.MAXSDOCACUT(700 * um), + F.MAXDOCACUT(700 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 800 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 800 * um, + F.DOCA(2, 3) < 250 * um, F.math.in_range(2470 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4620,11 +4619,11 @@ def oc_to_lkk_ll_line(name="Hlt2Charm_Oc0ToL0KmKp_LL"): name='Charm_Hyperons_Oc0ToL0KmKp_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2320 * MeV, - F.MAXSDOCACUT(100 * um), + F.MAXDOCACUT(100 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 100 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 100 * um, + F.DOCA(2, 3) < 200 * um, F.math.in_range(2490 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4656,11 +4655,11 @@ def oc_to_lkk_dd_line(name="Hlt2Charm_Oc0ToL0KmKp_DD"): name='Charm_Hyperons_Oc0ToL0KmKp_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2320 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 750 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 750 * um, + F.DOCA(2, 3) < 250 * um, F.math.in_range(2490 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4693,11 +4692,11 @@ def oc_to_ximkspi_ll_line(name="Hlt2Charm_Oc0ToXimKsPip_LLLLL"): name='Charm_Hyperons_Oc0ToXimKsPip_LLLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2675 * MeV, - F.MAXSDOCACUT(250 * um), + F.MAXDOCACUT(250 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 150 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 150 * um, + F.DOCA(2, 3) < 200 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 17 * GeV, @@ -4732,11 +4731,11 @@ def oc_to_ximkspi_ld_line(name="Hlt2Charm_Oc0ToXimKsPip_LLLDD"): name='Charm_Hyperons_Oc0ToXimKsPip_LLLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2675 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 150 * um, - F.SDOCA(2, 3) < 1 * mm, + F.DOCA(1, 3) < 150 * um, + F.DOCA(2, 3) < 1 * mm, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4770,11 +4769,11 @@ def oc_to_ximkspi_dl_line(name="Hlt2Charm_Oc0ToXimKsPip_DDLLL"): name='Charm_Hyperons_Oc0ToXimKsPip_DDLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2675 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 750 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 750 * um, + F.DOCA(2, 3) < 200 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4809,11 +4808,11 @@ def oc_to_ximkspi_dd_line(name="Hlt2Charm_Oc0ToXimKsPip_DDLDD"): name='Charm_Hyperons_Oc0ToXimKsPip_DDLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2675 * MeV, - F.MAXSDOCACUT(2 * mm), + F.MAXDOCACUT(2 * mm), ), CombinationCut=F.require_all( - F.SDOCA(1, 3) < 750 * um, - F.SDOCA(2, 3) < 1 * mm, + F.DOCA(1, 3) < 750 * um, + F.DOCA(2, 3) < 1 * mm, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 19 * GeV, @@ -4857,20 +4856,20 @@ def lc_to_l0pipipi_ll_line(name="Hlt2Charm_LcpToL0PimPipPip_LL"): name='Charm_Hyperons_LcpToL0PimPipPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXSDOCACUT(200 * um), + F.MAXDOCACUT(200 * um), ), Combination123Cut=F.require_all( F.MASS < 2240 * MeV, - F.SDOCA(1, 3) < 250 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 250 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( F.math.in_range(2201 * MeV, F.MASS, 2371 * MeV), # F.PT > None, # 1.3 * GeV # Possible cuts for future tunning # F.P > None, # 28 * GeV # Possible cuts for future tunning F.SUM(F.PT) > 1.8 * GeV, - F.MAXSDOCACUT(250. * um), - F.MAXSDOCACHI2CUT(12.), + F.MAXDOCACUT(250. * um), + F.MAXDOCACHI2CUT(12.), ), CompositeCut=F.require_all( F.math.in_range(2211 * MeV, F.MASS, 2361 * MeV), @@ -4900,22 +4899,22 @@ def lc_to_l0pipipi_dd_line(name="Hlt2Charm_LcpToL0PimPipPip_DD"): name='LcpToL0PimPipPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2100 * MeV, - F.MAXSDOCACUT(2 * mm), + F.MAXDOCACUT(2 * mm), ), Combination123Cut=F.require_all( F.MASS < 2240 * MeV, - F.SDOCA(1, 3) < 2 * mm, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 2 * mm, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(2, 4) < 250 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(2, 4) < 250 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2201 * MeV, F.MASS, 2371 * MeV), # F.PT > None, # 1.3 * GeV # Possible cuts for future tunning # F.P > None, # 28 * GeV # Possible cuts for future tunning F.SUM(F.PT) > 1.8 * GeV, - F.MAXSDOCACUT(2 * mm), - F.MAXSDOCACHI2CUT(12.), + F.MAXDOCACUT(2 * mm), + F.MAXDOCACHI2CUT(12.), ), CompositeCut=F.require_all( F.math.in_range(2211 * MeV, F.MASS, 2361 * MeV), @@ -4948,17 +4947,17 @@ def lc_to_lkkpi_ll_line(name="Hlt2Charm_LcpToL0KmKpPip_LL"): name='Charm_Hyperons_LcpToL0KmKpPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 1775 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2265 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 200 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 200 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.MASS < 2405 * MeV, F.PT > 1.1 * GeV, F.P > 23 * GeV, @@ -4993,17 +4992,17 @@ def lc_to_lkkpi_dd_line(name="Hlt2Charm_LcpToL0KmKpPip_DD"): name='Charm_Hyperons_LcpToL0KmKpPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 1775 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), ), Combination123Cut=F.require_all( F.MASS < 2265 * MeV, - F.SDOCA(1, 3) < 750 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 750 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 800 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 800 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.MASS < 2405 * MeV, F.PT > 1.3 * GeV, F.P > 23 * GeV, @@ -5037,17 +5036,17 @@ def lc_to_ximkspipi_ll_line(name="Hlt2Charm_LcpToXimKsPipPip_LLLLL"): name='Charm_Hyperons_LcpToXimKsPipPip_LLLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2125 * MeV, - F.MAXSDOCACUT(250 * um), + F.MAXDOCACUT(250 * um), ), Combination123Cut=F.require_all( F.MASS < 2265 * MeV, - F.SDOCA(1, 3) < 150 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 150 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 250 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 250 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2165 * MeV, F.MASS, 2405 * MeV), F.PT > 1.1 * GeV, F.P > 23 * GeV, @@ -5084,17 +5083,17 @@ def lc_to_ximkspipi_ld_line(name="Hlt2Charm_LcpToXimKsPipPip_LLLDD"): name='Charm_Hyperons_LcpToXimKsPipPip_LLLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2125 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), Combination123Cut=F.require_all( F.MASS < 2265 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 1 * mm, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 1 * mm, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 200 * um, - F.SDOCA(2, 4) < 1 * mm, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 200 * um, + F.DOCA(2, 4) < 1 * mm, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2165 * MeV, F.MASS, 2405 * MeV), F.PT > 1.2 * GeV, F.P > 24 * GeV, @@ -5130,17 +5129,17 @@ def lc_to_ximkspipi_dl_line(name="Hlt2Charm_LcpToXimKsPipPip_DDLLL"): name='Charm_Hyperons_LcpToXimKsPipPip_DDLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2125 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), ), Combination123Cut=F.require_all( F.MASS < 2265 * MeV, - F.SDOCA(1, 3) < 800 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 800 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 800 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 800 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2165 * MeV, F.MASS, 2405 * MeV), F.PT > 1.2 * GeV, F.P > 24 * GeV, @@ -5177,17 +5176,17 @@ def lc_to_ximkspipi_dd_line(name="Hlt2Charm_LcpToXimKsPipPip_DDLDD"): name='Charm_Hyperons_LcpToXimKsPipPip_DDLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2125 * MeV, - F.MAXSDOCACUT(2 * mm), + F.MAXDOCACUT(2 * mm), ), Combination123Cut=F.require_all( F.MASS < 2265 * MeV, - F.SDOCA(1, 3) < 750 * um, - F.SDOCA(2, 3) < 1 * mm, + F.DOCA(1, 3) < 750 * um, + F.DOCA(2, 3) < 1 * mm, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 750 * um, - F.SDOCA(2, 4) < 1 * mm, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 750 * um, + F.DOCA(2, 4) < 1 * mm, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2165 * MeV, F.MASS, 2405 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5223,17 +5222,17 @@ def xicp_to_lkkpi_ll_line(name="Hlt2Charm_XicpToL0KmKpPip_LL"): name='Charm_Hyperons_XicpToL0KmKpPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 1957 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 200 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 200 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2300 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5266,17 +5265,17 @@ def xicp_to_lkkpi_dd_line(name="Hlt2Charm_XicpToL0KmKpPip_DD"): name='Charm_Hyperons_XicpToL0KmKpPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 1957 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.SDOCA(1, 3) < 750 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 750 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 800 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 800 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2300 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 23 * GeV, @@ -5309,17 +5308,17 @@ def xicp_to_lkpipi_ll_line(name="Hlt2Charm_XicpToL0KmPipPip_LL"): name='Charm_Hyperons_XicpToL0KmPipPip_LL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 200 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 200 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2270 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5352,17 +5351,17 @@ def xicp_to_lkpipi_dd_line(name="Hlt2Charm_XicpToL0KmPipPip_DD"): name='Charm_Hyperons_XicpToL0KmPipPip_DD_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.SDOCA(1, 3) < 750 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 750 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 800 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 800 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2270 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 23 * GeV, @@ -5395,17 +5394,17 @@ def xicz_to_lkspipi_ll_line(name="Hlt2Charm_Xic0ToL0KsPimPip_LLLL"): name='Charm_Hyperons_Xic0ToL0KsPimPip_LLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXSDOCACUT(300 * um), + F.MAXDOCACUT(300 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 250 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 200 * um, - F.SDOCA(2, 4) < 250 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 200 * um, + F.DOCA(2, 4) < 250 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2270 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5440,17 +5439,17 @@ def xicz_to_lkspipi_dl_line(name="Hlt2Charm_Xic0ToL0KsPimPip_DDLL"): name='Charm_Hyperons_Xic0ToL0KsPimPip_DDLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.SDOCA(1, 3) < 600 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 600 * um, + F.DOCA(2, 3) < 250 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 600 * um, - F.SDOCA(2, 4) < 250 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 600 * um, + F.DOCA(2, 4) < 250 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2270 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5484,17 +5483,17 @@ def xicz_to_lkspipi_ld_line(name="Hlt2Charm_Xic0ToL0KsPimPip_LLDD"): name='Charm_Hyperons_Xic0ToL0KsPimPip_LLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 800 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 800 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 200 * um, - F.SDOCA(2, 4) < 800 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 200 * um, + F.DOCA(2, 4) < 800 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2270 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5529,17 +5528,17 @@ def xicz_to_xim3pi_lll_line(name="Hlt2Charm_Xic0ToXimPimPipPip_LLL"): name='Charm_Hyperons_Xic0ToXimPimPipPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 200 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 200 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5573,17 +5572,17 @@ def xicz_to_xim3pi_ddl_line(name="Hlt2Charm_Xic0ToXimPimPipPip_DDL"): name='Charm_Hyperons_Xic0ToXimPimPipPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.SDOCA(1, 3) < 800 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 800 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 800 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 800 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2350 * MeV, F.MASS, 2590 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5619,17 +5618,17 @@ def xicz_to_omkppippim_lll_line(name="Hlt2Charm_Xic0ToOmKpPimPip_LLL"): name='Charm_Hyperons_Xic0ToOmKpPimPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 200 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 200 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.MASS < 2590 * MeV, F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5664,17 +5663,17 @@ def xicz_to_omkppippim_ddl_line(name="Hlt2Charm_Xic0ToOmKpPimPip_DDL"): name='Charm_Hyperons_Xic0ToOmKpPimPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2310 * MeV, - F.MAXSDOCACUT(750 * um), + F.MAXDOCACUT(750 * um), ), Combination123Cut=F.require_all( F.MASS < 2450 * MeV, - F.SDOCA(1, 3) < 800 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 800 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 800 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 800 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.MASS < 2590 * MeV, F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5710,17 +5709,17 @@ def oc_to_lkskpi_ll_line(name="Hlt2Charm_Oc0ToL0KsKmPip_LLLL"): name='Charm_Hyperons_Oc0ToL0KsKmPip_LLLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2182 * MeV, - F.MAXSDOCACUT(300 * um), + F.MAXDOCACUT(300 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 250 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 200 * um, - F.SDOCA(2, 4) < 250 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 200 * um, + F.DOCA(2, 4) < 250 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2470 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5756,17 +5755,17 @@ def oc_to_lkskpi_dl_line(name="Hlt2Charm_Oc0ToL0KsKmPip_DDLL"): name='Charm_Hyperons_Oc0ToL0KsKmPip_DDLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2182 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.SDOCA(1, 3) < 600 * um, - F.SDOCA(2, 3) < 250 * um, + F.DOCA(1, 3) < 600 * um, + F.DOCA(2, 3) < 250 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 600 * um, - F.SDOCA(2, 4) < 250 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 600 * um, + F.DOCA(2, 4) < 250 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2470 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5801,17 +5800,17 @@ def oc_to_lkskpi_ld_line(name="Hlt2Charm_Oc0ToL0KsKmPip_LLDD"): name='Charm_Hyperons_Oc0ToL0KsKmPip_LLDD_{hash}', Combination12Cut=F.require_all( F.MASS < 2182 * MeV, - F.MAXSDOCACUT(1 * mm), + F.MAXDOCACUT(1 * mm), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 800 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 800 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 200 * um, - F.SDOCA(2, 4) < 800 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 200 * um, + F.DOCA(2, 4) < 800 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2470 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5847,17 +5846,17 @@ def oc_to_ximkpipi_lll_line(name="Hlt2Charm_Oc0ToXimKmPipPip_LLL"): name='Charm_Hyperons_Oc0ToXimKmPipPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2535 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 200 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 200 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5892,17 +5891,17 @@ def oc_to_ximkpipi_ddl_line(name="Hlt2Charm_Oc0ToXimKmPipPip_DDL"): name='Charm_Hyperons_Oc0ToXimKmPipPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2535 * MeV, - F.MAXSDOCACUT(800 * um), + F.MAXDOCACUT(800 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.SDOCA(1, 3) < 1 * mm, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 1 * mm, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 1 * mm, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 1 * mm, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5937,17 +5936,17 @@ def oc_to_om3pi_lll_line(name="Hlt2Charm_Oc0ToOmPimPipPip_LLL"): name='Charm_Hyperons_Oc0ToOmPimPipPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2515 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 200 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 200 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -5981,17 +5980,17 @@ def oc_to_om3pi_ddl_line(name="Hlt2Charm_Oc0ToOmPimPipPip_DDL"): name='Charm_Hyperons_Oc0ToOmPimPipPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2515 * MeV, - F.MAXSDOCACUT(800 * um), + F.MAXDOCACUT(800 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.SDOCA(1, 3) < 1 * mm, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 1 * mm, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 1 * mm, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 1 * mm, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -6027,17 +6026,17 @@ def oc_to_omkppipi_lll_line(name="Hlt2Charm_Oc0ToOmKpPimPip_LLL"): name='Charm_Hyperons_Oc0ToOmKpPimPip_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 2515 * MeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.SDOCA(1, 3) < 200 * um, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 200 * um, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 200 * um, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 200 * um, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, @@ -6072,17 +6071,17 @@ def oc_to_omkppipi_ddl_line(name="Hlt2Charm_Oc0ToOmKpPimPip_DDL"): name='Charm_Hyperons_Oc0ToOmKpPimPip_DDL_{hash}', Combination12Cut=F.require_all( F.MASS < 2515 * MeV, - F.MAXSDOCACUT(800 * um), + F.MAXDOCACUT(800 * um), ), Combination123Cut=F.require_all( F.MASS < 2675 * MeV, - F.SDOCA(1, 3) < 1 * mm, - F.SDOCA(2, 3) < 200 * um, + F.DOCA(1, 3) < 1 * mm, + F.DOCA(2, 3) < 200 * um, ), CombinationCut=F.require_all( - F.SDOCA(1, 4) < 1 * mm, - F.SDOCA(2, 4) < 200 * um, - F.SDOCA(3, 4) < 250 * um, + F.DOCA(1, 4) < 1 * mm, + F.DOCA(2, 4) < 200 * um, + F.DOCA(3, 4) < 250 * um, F.math.in_range(2575 * MeV, F.MASS, 2815 * MeV), F.PT > 1.3 * GeV, F.P > 28 * GeV, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py index 32b58258ae1..c75c62ce861 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py @@ -184,8 +184,8 @@ def _make_ttl_xis(): F.MASS < 1800 * MeV, F.PT > 1. * GeV, F.P > 30. * GeV, - F.MAXSDOCACUT(20.0 * mm), - F.MAXSDOCACHI2CUT(3.0), + F.MAXDOCACUT(20.0 * mm), + F.MAXDOCACHI2CUT(3.0), ), CompositeCut=F.require_all( F.MASS < 1700 * MeV, @@ -212,8 +212,8 @@ def _make_ttd_xis(): F.MASS < 1800 * MeV, F.PT > 1. * GeV, F.P > 25. * GeV, - F.MAXSDOCACUT(25.0 * mm), - F.MAXSDOCACHI2CUT(3.0), + F.MAXDOCACUT(25.0 * mm), + F.MAXDOCACHI2CUT(3.0), ), CompositeCut=F.require_all( F.MASS < 1700 * MeV, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py index cf1282258ac..7a79d2b823e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py @@ -131,7 +131,7 @@ def make_ks_ll( ): """Make KS -> pi+ pi- from long tracks.""" comb_cut = F.require_all( - F.MAXSDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), + F.MAXDOCACUT(doca_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), @@ -170,7 +170,7 @@ def make_ks_dd( ): """Make KS -> pi+ pi- from downstream tracks.""" comb_cut = F.require_all( - F.MAXSDOCACUT(doca_max), F.MAXSDOCACHI2CUT(docachi2_max), + F.MAXDOCACUT(doca_max), F.MAXDOCACHI2CUT(docachi2_max), in_range(comb_m_min, F.MASS, comb_m_max), F.PT > comb_pt_min, F.SUM(F.PT) > sum_pt_min, F.P > comb_p_min) vertex_cut = F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_builders.py index 9d4b3eaa732..ac986d24dbd 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_builders.py @@ -70,7 +70,7 @@ def make_xim_to_lambda_pi( """ comb_cut = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.P > comb_p_min, - F.MAXSDOCACHI2CUT(docachi2_max)) + F.MAXDOCACHI2CUT(docachi2_max)) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), F.P > p_min, F.CHI2DOF < vchi2pdof_max, F.BPVVDZ(pvs) > bpvvdz_min) @@ -106,7 +106,7 @@ def make_omegam_to_lambda_k( """ comb_cut = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.P > comb_p_min, - F.MAXSDOCACHI2CUT(docachi2_max)) + F.MAXDOCACHI2CUT(docachi2_max)) vertex_cut = F.require_all( in_range(m_min, F.MASS, m_max), F.P > p_min, F.CHI2DOF < vchi2pdof_max, F.BPVVDZ(pvs) > bpvvdz_min) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py index 33604153e6a..d8991b0dd87 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py @@ -505,7 +505,7 @@ def make_rd_ks0_lls( descriptor = 'KS0 -> pi+ pi-' combination_code = F.require_all( F.ABS_DELTA_MASS("KS0") < mass_window_comb, - F.MAXSDOCACHI2CUT(adocachi2cut)) + F.MAXDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = F.require_all( F.ABS_DELTA_MASS("KS0") < mass_window, F.PT > pt_min, @@ -546,7 +546,7 @@ def make_rd_ks0_dds( descriptor = 'KS0 -> pi+ pi-' combination_code = F.require_all( F.ABS_DELTA_MASS("KS0") < mass_window_comb, - F.MAXSDOCACHI2CUT(adocachi2cut)) + F.MAXDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = F.require_all( F.ABS_DELTA_MASS("KS0") < mass_window, F.CHI2DOF < vchi2pdof_max, @@ -596,7 +596,7 @@ def make_rd_lambda_lls( descriptor = '[Lambda0 -> p+ pi-]cc' combination_code = F.require_all( F.ABS_DELTA_MASS("Lambda0") < mass_window_comb, - F.MAXSDOCACHI2CUT(adocachi2cut)) + F.MAXDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = F.require_all( F.ABS_DELTA_MASS("Lambda0") < mass_window, F.CHI2DOF < vchi2pdof_max, @@ -647,7 +647,7 @@ def make_rd_lambda_dds( descriptor = '[Lambda0 -> p+ pi-]cc' combination_code = F.require_all( F.ABS_DELTA_MASS("Lambda0") < mass_window_comb, - F.MAXSDOCACHI2CUT(adocachi2cut)) + F.MAXDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = F.require_all( F.ABS_DELTA_MASS("Lambda0") < mass_window, F.CHI2DOF < vchi2pdof_max, -- GitLab From b6380c65e5b4b27c657007c03ba67af7cd248dfa Mon Sep 17 00:00:00 2001 From: Wouter Hulsbergen Date: Fri, 22 Mar 2024 23:08:09 +0100 Subject: [PATCH 4/9] removed MAXDOCACHI2CUT in D0->K*gamma combiner --- .../bandq/builders/jpsi_to_lmdlmd_lines.py | 8 +- .../Hlt2Conf/lines/charm/d0_to_hhgamma.py | 1 - .../python/Hlt2Conf/lines/charm/d0_to_kshh.py | 8 +- .../lines/charm/detection_asymmetry_lines.py | 2 +- .../python/Hlt2Conf/lines/charm/hyperonsTT.py | 164 +++++++++--------- .../Hlt2Conf/lines/charm/rare_charm_makers.py | 6 +- .../ift/hlt2_ift_smog2_trackingeff_Ks.py | 2 +- .../dilepton_mva_builder.py | 2 +- .../rd/builders/omega_rare_decay_builder.py | 6 +- .../lines/rd/builders/rdbuilder_thor.py | 5 +- .../semileptonic/builders/base_builder.py | 4 +- .../Hlt2Conf/lines/trackeff/KSVeloLong.py | 2 +- 12 files changed, 103 insertions(+), 107 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/jpsi_to_lmdlmd_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/jpsi_to_lmdlmd_lines.py index 70d56e13a05..06e499c58a5 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/jpsi_to_lmdlmd_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/jpsi_to_lmdlmd_lines.py @@ -43,8 +43,8 @@ def make_lambdall(): p_min=9. * GeV, pid=F.require_all(F.PID_P > 5., (F.PID_P - F.PID_K) > 0.)) combinationcode = F.require_all( - in_range(1095 * MeV, F.MASS, 1140 * MeV), F.MAXSDOCACHI2CUT(4.), - F.PT > 500. * MeV, F.MAXSDOCACUT(0.12 * mm)) + in_range(1095 * MeV, F.MASS, 1140 * MeV), F.MAXDOCACHI2CUT(4.), + F.PT > 500. * MeV, F.MAXDOCACUT(0.12 * mm)) vertexcode = F.require_all( in_range(1105 * MeV, F.MASS, 1130 * MeV), F.CHI2DOF < 5., in_range(-100 * mm, F.END_VZ, 500 * mm), @@ -76,8 +76,8 @@ def make_lambdadd(): p_min=8. * GeV, pid=F.require_all(F.PID_P > 5., (F.PID_P - F.PID_K) > 0.)) combinationcode = F.require_all( - in_range(1085 * MeV, F.MASS, 1145 * MeV), F.MAXSDOCACHI2CUT(4.), - F.PT > 600. * MeV, F.MAXSDOCACUT(4.0 * mm)) + in_range(1085 * MeV, F.MASS, 1145 * MeV), F.MAXDOCACHI2CUT(4.), + F.PT > 600. * MeV, F.MAXDOCACUT(4.0 * mm)) vertexcode = F.require_all( in_range(1105 * MeV, F.MASS, 1130 * MeV), F.CHI2DOF < 5., in_range(300 * mm, F.END_VZ, 2275 * mm), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py index 201cf42b470..0c0e9f1c275 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py @@ -144,7 +144,6 @@ def make_dzeros(particle1, particle2, descriptor, name): name=name, CombinationCut=F.require_all( in_range(1610 * MeV, F.MASS, 2130 * MeV), - F.MAXSDOCACHI2CUT(10.), F.SUM(F.PT) > 0 * MeV, ), CompositeCut=F.require_all( diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_kshh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_kshh.py index 6cedd2df807..1ea6500428c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_kshh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_kshh.py @@ -175,7 +175,7 @@ def make_kshort_ll(): in_range(435 * MeV, F.MASS, 560 * MeV), F.PT > 300 * MeV, F.P > 3.5 * GeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), CompositeCut=F.require_all( in_range(455 * MeV, F.MASS, 540 * MeV), @@ -200,8 +200,8 @@ def make_kshort_dd(): F.PT > 400 * MeV, F.P > 4.5 * GeV, F.SUM(F.PT) > 500 * MeV, - F.MAXSDOCACUT(2 * mm), - F.MAXSDOCACHI2CUT(12.), + F.MAXDOCACUT(2 * mm), + F.MAXDOCACHI2CUT(12.), ), CompositeCut=F.require_all( in_range(435 * MeV, F.MASS, 560 * MeV), @@ -223,7 +223,7 @@ def make_kshort_ll_lowbias(): in_range(435 * MeV, F.MASS, 560 * MeV), F.PT > 200 * MeV, F.P > 2.5 * GeV, - F.MAXSDOCACUT(150 * um), + F.MAXDOCACUT(150 * um), ), CompositeCut=F.require_all( in_range(455 * MeV, F.MASS, 540 * MeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/detection_asymmetry_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/detection_asymmetry_lines.py index 2a1d811ef5d..9743859e88e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/detection_asymmetry_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/detection_asymmetry_lines.py @@ -131,7 +131,7 @@ def make_kshorts_to_pipi(pions_plus, """ combination_cuts = F.require_all( in_range(am_min, F.MASS, am_max), F.PT > pt_min, - F.MIN(F.PT) > child_pt_min, F.MAXSDOCACUT(doca_max)) + F.MIN(F.PT) > child_pt_min, F.MAXDOCACUT(doca_max)) vertex_cuts = F.require_all(F.CHI2DOF < vchi2pdof_max, in_range(mass_min, F.MASS, mass_max), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py index c75c62ce861..33b65b32b72 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperonsTT.py @@ -245,8 +245,8 @@ def xicz_to_ximpi_ttl_l_line(name="Hlt2Charm_Xic0ToXimPip_TTL_L"): F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 1. * GeV, F.P > 40. * GeV, - F.MAXSDOCACUT(10 * mm), - F.MAXSDOCACHI2CUT(3.), + F.MAXDOCACUT(10 * mm), + F.MAXDOCACHI2CUT(3.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -285,8 +285,8 @@ def xicz_to_ximpi_ttd_l_line(name="Hlt2Charm_Xic0ToXimPip_TTD_L"): F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 1. * GeV, F.P > 40. * GeV, - F.MAXSDOCACUT(10 * mm), - F.MAXSDOCACHI2CUT(3.), + F.MAXDOCACUT(10 * mm), + F.MAXDOCACHI2CUT(3.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -325,8 +325,8 @@ def xicz_to_ximpi_ttd_d_line(name="Hlt2Charm_Xic0ToXimPip_TTD_D"): F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 1. * GeV, F.P > 25. * GeV, - F.MAXSDOCACUT(20 * mm), - F.MAXSDOCACHI2CUT(3.), + F.MAXDOCACUT(20 * mm), + F.MAXDOCACHI2CUT(3.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -363,15 +363,15 @@ def xicp_to_ximpipi_ttl_ll_line(name="Hlt2Charm_XicpToXimPipPip_TTL_LL"): name="Charm_Hyperons_XicpToXimPipPip_TTL_LL_{hash}", Combination12Cut=F.require_all( F.math.in_range(1460 * MeV, F.MASS, 2600 * MeV), - F.MAXSDOCACUT(20 * mm), + F.MAXDOCACUT(20 * mm), ), CombinationCut=F.require_all( F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 1. * GeV, F.P > 40. * GeV, - F.SDOCA(1, 3) < 20 * mm, - F.SDOCA(2, 3) < 0.2 * mm, - F.MAXSDOCACHI2CUT(5.), + F.DOCA(1, 3) < 20 * mm, + F.DOCA(2, 3) < 0.2 * mm, + F.MAXDOCACHI2CUT(5.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -408,15 +408,15 @@ def xicp_to_ximpipi_ttd_ll_line(name="Hlt2Charm_XicpToXimPipPip_TTD_LL"): name="Charm_Hyperons_XicpToXimPipPip_TTD_LL_{hash}", Combination12Cut=F.require_all( F.math.in_range(1460 * MeV, F.MASS, 2600 * MeV), - F.MAXSDOCACUT(20 * mm), + F.MAXDOCACUT(20 * mm), ), CombinationCut=F.require_all( F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 1. * GeV, F.P > 40. * GeV, - F.SDOCA(1, 3) < 20 * mm, - F.SDOCA(2, 3) < 0.2 * mm, - F.MAXSDOCACHI2CUT(5.), + F.DOCA(1, 3) < 20 * mm, + F.DOCA(2, 3) < 0.2 * mm, + F.MAXDOCACHI2CUT(5.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -453,15 +453,15 @@ def xicp_to_ximpipi_ttd_dd_line(name="Hlt2Charm_XicpToXimPipPip_TTD_DD"): name="Charm_Hyperons_XicpToXimPipPip_TTD_DD_{hash}", Combination12Cut=F.require_all( F.math.in_range(1460 * MeV, F.MASS, 2600 * MeV), - F.MAXSDOCACUT(25 * mm), + F.MAXDOCACUT(25 * mm), ), CombinationCut=F.require_all( F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 0.8 * GeV, F.P > 20. * GeV, - F.SDOCA(1, 3) < 25 * mm, - F.SDOCA(2, 3) < 1.2 * mm, - F.MAXSDOCACHI2CUT(30.), + F.DOCA(1, 3) < 25 * mm, + F.DOCA(2, 3) < 1.2 * mm, + F.MAXDOCACHI2CUT(30.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -499,15 +499,15 @@ def xicz_to_lkpi_tt_ll_line(name="Hlt2Charm_Xic0ToL0KmPip_TT_LL"): name="Charm_Hyperons_Xic0ToL0KmPip_TT_LL_{hash}", Combination12Cut=F.require_all( F.math.in_range(1600 * MeV, F.MASS, 2800 * MeV), - F.MAXSDOCACUT(15 * mm), + F.MAXDOCACUT(15 * mm), ), CombinationCut=F.require_all( F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 1.5 * GeV, F.P > 40. * GeV, - F.SDOCA(1, 3) < 15 * mm, - F.SDOCA(2, 3) < 0.1 * mm, - F.MAXSDOCACHI2CUT(5.), + F.DOCA(1, 3) < 15 * mm, + F.DOCA(2, 3) < 0.1 * mm, + F.MAXDOCACHI2CUT(5.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -544,15 +544,15 @@ def xicz_to_lkpi_tt_dd_line(name="Hlt2Charm_Xic0ToL0KmPip_TT_DD"): name="Charm_Hyperons_Xic0ToL0KmPip_TT_DD_{hash}", Combination12Cut=F.require_all( F.math.in_range(1600 * MeV, F.MASS, 2800 * MeV), - F.MAXSDOCACUT(15 * mm), + F.MAXDOCACUT(15 * mm), ), CombinationCut=F.require_all( F.math.in_range(2270 * MeV, F.MASS, 3000 * MeV), F.PT > 0.8 * GeV, F.P > 20. * GeV, - F.SDOCA(1, 3) < 30 * mm, - F.SDOCA(2, 3) < 1.2 * mm, - F.MAXSDOCACHI2CUT(10.), + F.DOCA(1, 3) < 30 * mm, + F.DOCA(2, 3) < 1.2 * mm, + F.MAXDOCACHI2CUT(10.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -588,23 +588,23 @@ def lc_to_l0pipipi_tt_lll_line(name="Hlt2Charm_LcpToL0PimPipPip_TT_LLL"): name='Charm_Hyperons_LcpToL0PimPipPip_TT_LLL_{hash}', Combination12Cut=F.require_all( F.math.in_range(1400 * MeV, F.MASS, 3000 * MeV), - F.MAXSDOCACUT(50 * mm), + F.MAXDOCACUT(50 * mm), ), Combination123Cut=F.require_all( F.math.in_range(1600 * MeV, F.MASS, 2900 * MeV), - F.SDOCA(1, 2) < 30 * mm, - F.SDOCA(2, 3) < 0.12 * mm, + F.DOCA(1, 2) < 30 * mm, + F.DOCA(2, 3) < 0.12 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 2800 * MeV), F.PT > 2 * GeV, F.P > 20 * GeV, F.SUM(F.PT) > 3. * GeV, - F.SDOCA(1, 4) < 30 * mm, - F.SDOCA(2, 4) < 0.12 * mm, - F.SDOCA(3, 4) < 0.12 * mm, - F.MAXSDOCACUT(30. * mm), - F.MAXSDOCACHI2CUT(8.), + F.DOCA(1, 4) < 30 * mm, + F.DOCA(2, 4) < 0.12 * mm, + F.DOCA(3, 4) < 0.12 * mm, + F.MAXDOCACUT(30. * mm), + F.MAXDOCACHI2CUT(8.), ), CompositeCut=F.require_all( F.math.in_range(2150 * MeV, F.MASS, 2700 * MeV), @@ -639,23 +639,23 @@ def lc_to_l0pipipi_tt_ddd_line(name="Hlt2Charm_LcpToL0PimPipPip_TT_DDD"): name='Charm_Hyperons_LcpToL0PimPipPip_TT_DDD_{hash}', Combination12Cut=F.require_all( F.math.in_range(1400 * MeV, F.MASS, 3000 * MeV), - F.MAXSDOCACUT(50 * mm), + F.MAXDOCACUT(50 * mm), ), Combination123Cut=F.require_all( F.math.in_range(1600 * MeV, F.MASS, 2900 * MeV), - F.SDOCA(1, 2) < 30 * mm, - F.SDOCA(2, 3) < 0.12 * mm, + F.DOCA(1, 2) < 30 * mm, + F.DOCA(2, 3) < 0.12 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 2800 * MeV), F.PT > 2 * GeV, F.P > 20 * GeV, F.SUM(F.PT) > 3. * GeV, - F.SDOCA(1, 4) < 30 * mm, - F.SDOCA(2, 4) < 0.12 * mm, - F.SDOCA(3, 4) < 0.12 * mm, - F.MAXSDOCACUT(30. * mm), - F.MAXSDOCACHI2CUT(8.), + F.DOCA(1, 4) < 30 * mm, + F.DOCA(2, 4) < 0.12 * mm, + F.DOCA(3, 4) < 0.12 * mm, + F.MAXDOCACUT(30. * mm), + F.MAXDOCACHI2CUT(8.), ), CompositeCut=F.require_all( F.math.in_range(2150 * MeV, F.MASS, 2700 * MeV), @@ -691,23 +691,23 @@ def xicp_to_lkpipi_tt_lll_line(name="Hlt2Charm_XicpToL0KmPipPip_TT_LLL"): name='Charm_Hyperons_XicpToL0KmPipPip_TT_LLL_{hash}', Combination12Cut=F.require_all( F.math.in_range(1800 * MeV, F.MASS, 3000 * MeV), - F.MAXSDOCACUT(50 * mm), + F.MAXDOCACUT(50 * mm), ), Combination123Cut=F.require_all( F.MASS < 3000 * MeV, - F.SDOCA(1, 2) < 30 * mm, - F.SDOCA(2, 3) < 0.12 * mm, + F.DOCA(1, 2) < 30 * mm, + F.DOCA(2, 3) < 0.12 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 2900 * MeV), F.PT > 2 * GeV, F.P > 20 * GeV, F.SUM(F.PT) > 3. * GeV, - F.SDOCA(1, 4) < 30 * mm, - F.SDOCA(2, 4) < 0.12 * mm, - F.SDOCA(3, 4) < 0.12 * mm, - F.MAXSDOCACUT(30. * mm), - F.MAXSDOCACHI2CUT(8.), + F.DOCA(1, 4) < 30 * mm, + F.DOCA(2, 4) < 0.12 * mm, + F.DOCA(3, 4) < 0.12 * mm, + F.MAXDOCACUT(30. * mm), + F.MAXDOCACHI2CUT(8.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -743,23 +743,23 @@ def xicp_to_lkpipi_tt_ddd_line(name="Hlt2Charm_XicpToL0KmPipPip_TT_DDD"): name='Charm_Hyperons_XicpToL0KmPipPip_TT_DDD_{hash}', Combination12Cut=F.require_all( F.math.in_range(1800 * MeV, F.MASS, 3000 * MeV), - F.MAXSDOCACUT(50 * mm), + F.MAXDOCACUT(50 * mm), ), Combination123Cut=F.require_all( F.MASS < 3000 * MeV, - F.SDOCA(1, 2) < 30 * mm, - F.SDOCA(2, 3) < 0.12 * mm, + F.DOCA(1, 2) < 30 * mm, + F.DOCA(2, 3) < 0.12 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 2900 * MeV), F.PT > 2 * GeV, F.P > 20 * GeV, F.SUM(F.PT) > 3 * GeV, - F.SDOCA(1, 4) < 30 * mm, - F.SDOCA(2, 4) < 0.12 * mm, - F.SDOCA(3, 4) < 0.12 * mm, - F.MAXSDOCACUT(30. * mm), - F.MAXSDOCACHI2CUT(8.), + F.DOCA(1, 4) < 30 * mm, + F.DOCA(2, 4) < 0.12 * mm, + F.DOCA(3, 4) < 0.12 * mm, + F.MAXDOCACUT(30. * mm), + F.MAXDOCACHI2CUT(8.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -794,23 +794,23 @@ def xicz_to_xim3pi_ttl_lll_line(name="Hlt2Charm_Xic0ToXimPimPipPip_TTL_LLL"): name='Charm_Hyperons_Xic0ToXimPimPipPip_TTL_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 3000 * MeV, - F.MAXSDOCACUT(40 * mm), + F.MAXDOCACUT(40 * mm), ), Combination123Cut=F.require_all( F.MASS < 3000 * MeV, - F.SDOCA(1, 3) < 20 * mm, - F.SDOCA(2, 3) < 0.2 * mm, + F.DOCA(1, 3) < 20 * mm, + F.DOCA(2, 3) < 0.2 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 3000 * MeV), F.PT > 2 * GeV, F.P > 20 * GeV, F.SUM(F.PT) > 3 * GeV, - F.SDOCA(1, 4) < 20 * mm, - F.SDOCA(2, 4) < 0.2 * mm, - F.SDOCA(3, 4) < 0.2 * mm, - F.MAXSDOCACUT(30. * mm), - F.MAXSDOCACHI2CUT(20.), + F.DOCA(1, 4) < 20 * mm, + F.DOCA(2, 4) < 0.2 * mm, + F.DOCA(3, 4) < 0.2 * mm, + F.MAXDOCACUT(30. * mm), + F.MAXDOCACHI2CUT(20.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -846,23 +846,23 @@ def xicz_to_xim3pi_ttd_lll_line(name="Hlt2Charm_Xic0ToXimPimPipPip_TTD_LLL"): name='Charm_Hyperons_Xic0ToXimPimPipPip_TTD_LLL_{hash}', Combination12Cut=F.require_all( F.MASS < 3000 * MeV, - F.MAXSDOCACUT(40 * mm), + F.MAXDOCACUT(40 * mm), ), Combination123Cut=F.require_all( F.MASS < 3000 * MeV, - F.SDOCA(1, 3) < 20 * mm, - F.SDOCA(2, 3) < 0.2 * mm, + F.DOCA(1, 3) < 20 * mm, + F.DOCA(2, 3) < 0.2 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 3000 * MeV), F.PT > 2 * GeV, F.P > 20 * GeV, F.SUM(F.PT) > 3 * GeV, - F.SDOCA(1, 4) < 20 * mm, - F.SDOCA(2, 4) < 0.2 * mm, - F.SDOCA(3, 4) < 0.2 * mm, - F.MAXSDOCACUT(30. * mm), - F.MAXSDOCACHI2CUT(20.), + F.DOCA(1, 4) < 20 * mm, + F.DOCA(2, 4) < 0.2 * mm, + F.DOCA(3, 4) < 0.2 * mm, + F.MAXDOCACUT(30. * mm), + F.MAXDOCACHI2CUT(20.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), @@ -898,23 +898,23 @@ def xicz_to_xim3pi_ttd_ddd_line(name="Hlt2Charm_Xic0ToXimPimPipPip_TTD_DDD"): name='Charm_Hyperons_Xic0ToXimPimPipPip_TTD_DDD_{hash}', Combination12Cut=F.require_all( F.MASS < 3000 * MeV, - F.MAXSDOCACUT(40 * mm), + F.MAXDOCACUT(40 * mm), ), Combination123Cut=F.require_all( F.MASS < 3000 * MeV, - F.SDOCA(1, 3) < 30 * mm, - F.SDOCA(2, 3) < 0.3 * mm, + F.DOCA(1, 3) < 30 * mm, + F.DOCA(2, 3) < 0.3 * mm, ), CombinationCut=F.require_all( F.math.in_range(2000 * MeV, F.MASS, 3000 * MeV), F.PT > 1 * GeV, F.P > 10 * GeV, F.SUM(F.PT) > 2 * GeV, - F.SDOCA(1, 4) < 30 * mm, - F.SDOCA(2, 4) < 0.3 * mm, - F.SDOCA(3, 4) < 0.3 * mm, - F.MAXSDOCACUT(30. * mm), - F.MAXSDOCACHI2CUT(20.), + F.DOCA(1, 4) < 30 * mm, + F.DOCA(2, 4) < 0.3 * mm, + F.DOCA(3, 4) < 0.3 * mm, + F.MAXDOCACUT(30. * mm), + F.MAXDOCACHI2CUT(20.), ), CompositeCut=F.require_all( F.math.in_range(2300 * MeV, F.MASS, 2800 * MeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py index f7073165a2c..5c9545b760c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py @@ -709,7 +709,7 @@ def make_ll_ks(pion1, """Returns maker for KS0 -> pi+ pi- constructed with two long pions.""" combination_code = F.require_all( in_range(mmin - 15 * MeV, F.MASS, mmax + 15 * MeV), - F.MAXSDOCACUT(doca_max), F.PT > comb_pt_min) + F.MAXDOCACUT(doca_max), F.PT > comb_pt_min) vertex_code = F.require_all( in_range(mmin, F.MASS, mmax), F.CHI2DOF < vchi2pdof_max, F.PT > pt_min, @@ -740,7 +740,7 @@ def make_dd_ks(pion1, combination_code = F.require_all( in_range(mmin - 15 * MeV, F.MASS, mmax + 15 * MeV), - F.MAXSDOCACUT(doca_max), F.PT > comb_pt_min) + F.MAXDOCACUT(doca_max), F.PT > comb_pt_min) vertex_code = F.require_all( in_range(mmin, F.MASS, mmax), F.CHI2DOF < vchi2pdof_max, F.PT > pt_min, @@ -897,7 +897,7 @@ def make_rarecharm_displaced_HadronLepton( # for LNV D->hhmumu with two seperat PID and pt cuts could directly be applied in make_rarecharm_muons and make_rarecharm_pions if needed. """ combination_code = F.require_all(F.MASS < amass, - F.MAXSDOCACUT(amaxdoca_max)) + F.MAXDOCACUT(amaxdoca_max)) vertex_code = F.require_all(F.CHI2DOF < maxVCHI2PDOF) return ParticleCombiner([leptons, hadrons], diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_smog2_trackingeff_Ks.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_smog2_trackingeff_Ks.py index c3c6e2e9feb..451b514d43f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_smog2_trackingeff_Ks.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/ift/hlt2_ift_smog2_trackingeff_Ks.py @@ -58,7 +58,7 @@ def make_kshort_pi_muplus_specific_charge(pions, name="KShortMuPiCombiner_{hash}"): combination_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), - F.MAXSDOCACUT(comb_maxdoca), + F.MAXDOCACUT(comb_maxdoca), ) vertex_code = F.require_all( F.END_VRHO < 100 * mm, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_detached_dilepton/dilepton_mva_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_detached_dilepton/dilepton_mva_builder.py index 4df2602d67f..bd158a2f63f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_detached_dilepton/dilepton_mva_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/inclusive_detached_dilepton/dilepton_mva_builder.py @@ -41,7 +41,7 @@ def make_neutral_lls(name="rd_neutral_mesons_lls_{hash}", mipchi2dvprimary_min=pi_ipchi2_min, pid=None) descriptor = 'KS0 -> pi+ pi-' - combination_code = F.require_all(F.MAXSDOCACHI2CUT(adocachi2cut)) + combination_code = F.require_all(F.MAXDOCACHI2CUT(adocachi2cut)) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvvdchi2_min) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/omega_rare_decay_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/omega_rare_decay_builder.py index 52fb15c35e0..6ef1ed2cd86 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/omega_rare_decay_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/omega_rare_decay_builder.py @@ -43,8 +43,8 @@ def make_xim_to_lambda_pim(pvs, Builder for Xi- -> Lambda pi-. """ combination_code = F.require_all( - F.MAXSDOCACHI2CUT(docachi2_max), - in_range(comb_m_min, F.MASS, comb_m_max), F.P > comb_p_min) + F.MAXDOCACHI2CUT(docachi2_max), in_range(comb_m_min, F.MASS, + comb_m_max), F.P > comb_p_min) vertex_code = F.require_all( in_range(m_min, F.MASS, m_max), F.P > p_min, @@ -101,7 +101,7 @@ def make_omega_to_xi_dip(pvs, """ combination_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), F.P > comb_p_min, - F.MAXSDOCACHI2CUT(docachi2_max)) + F.MAXDOCACHI2CUT(docachi2_max)) vertex_code = F.require_all( in_range(m_min, F.MASS, m_max), F.P > p_min, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py index d8991b0dd87..f512b7de90e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py @@ -1125,7 +1125,7 @@ def make_rd_detached_dimuon(name="rd_detached_dimuon_{hash}", combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.PT > pt_dimuon_min, - F.MAXSDOCACHI2CUT(adocachi2cut_max)) + F.MAXDOCACHI2CUT(adocachi2cut_max)) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvvdchi2_min) @@ -1259,7 +1259,6 @@ def make_rd_tauons_hadronic_decay( combination12_code = F.require_all( in_range(am_2pi_min, F.MASS, am_2pi_max), F.MAXSDOCACHI2CUT(adocachi2_max), - #F.SDOCA(1, 2) < adoca_max, ) pvs = make_pvs() @@ -1267,8 +1266,6 @@ def make_rd_tauons_hadronic_decay( in_range(am_min, F.MASS, am_max), F.SUBCOMB( Functor=in_range(am_2pi_min, F.MASS, am_2pi_max), Indices=(1, 3)), - # F.SDOCA(1, 3) < adoca_max, - # F.SDOCA(2, 3) < adoca_max, F.SUBCOMB(Functor=F.MAXSDOCACHI2CUT(adocachi2_max), Indices=(2, 3)), F.SUBCOMB(Functor=F.MAXSDOCACHI2CUT(adocachi2_max), Indices=(1, 3)), F.SUM(F.PT > best_pi_pt_min) >= 1, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py index bffe2078341..cc3984e2e70 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py @@ -470,7 +470,7 @@ def make_ks0_ll( descriptor = 'KS0 -> pi+ pi-' combination_code = F.require_all( in_range(_K0_M - mass_window_comb, F.MASS, _K0_M + mass_window_comb), - F.MAXSDOCACHI2CUT(adocachi2cut_max)) + F.MAXDOCACHI2CUT(adocachi2cut_max)) pvs = make_pvs() vertex_code = F.require_all( in_range(_K0_M - mass_window, F.MASS, _K0_M + mass_window), @@ -511,7 +511,7 @@ def make_ks0_dd( descriptor = 'KS0 -> pi+ pi-' combination_code = F.require_all( in_range(_K0_M - mass_window_comb, F.MASS, _K0_M + mass_window_comb), - F.MAXSDOCACHI2CUT(adocachi2cut_max)) + F.MAXDOCACHI2CUT(adocachi2cut_max)) pvs = make_pvs() vertex_code = F.require_all( in_range(_K0_M - mass_window, F.MASS, _K0_M + mass_window), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/KSVeloLong.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/KSVeloLong.py index 158e72a1e03..a96b89e8a49 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/KSVeloLong.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/KSVeloLong.py @@ -96,7 +96,7 @@ def make_kshort_pi_muplus_specific_charge(pions, name="KShortMuPiCombiner_{hash}"): combination_code = F.require_all( in_range(comb_m_min, F.MASS, comb_m_max), - F.MAXSDOCACUT(comb_maxdoca), + F.MAXDOCACUT(comb_maxdoca), ) vertex_code = F.require_all(F.END_VRHO < 100 * mm, F.END_VZ > 18 * mm, F.END_VZ < 600 * mm, -- GitLab From dd3c501a0267cab6fe4f836f93134b0eeb5165b3 Mon Sep 17 00:00:00 2001 From: Wouter Hulsbergen Date: Thu, 28 Mar 2024 12:53:07 +0100 Subject: [PATCH 5/9] do not apply doca functor between photon and hadron in d_to_hhhgamma --- Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhhgamma.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhhgamma.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhhgamma.py index 73b567e6314..f042691ac72 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhhgamma.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhhgamma.py @@ -77,9 +77,9 @@ def _make_d2hhhgamma(h1, h2, h3, gamma, descriptor, name): F.MAXSDOCACHI2CUT(10.), F.MASS < m_max + 20 * MeV - _PION_M, ), + Combination123Cut=F.MAXSDOCACHI2CUT(10.), CombinationCut=F.require_all( in_range(1680 * MeV, F.MASS, m_max + 20 * MeV), - F.MAXSDOCACHI2CUT(10.), F.SUM(F.PT) > 500 * MeV, ), CompositeCut=F.require_all( -- GitLab From 553502742d6d595a5f54ac911563b9ec617b0269 Mon Sep 17 00:00:00 2001 From: Wouter Hulsbergen Date: Thu, 28 Mar 2024 14:53:38 +0100 Subject: [PATCH 6/9] update bnoc.make_omega0 to not cut on the doca between a pi0 and a charged pion --- .../python/Hlt2Conf/lines/bnoc/builders/basic_builder.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py index 68ed68bc68f..a3d47f61e93 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py @@ -1134,7 +1134,8 @@ def make_omega0(name='BNOC_Omega0_Combiner_{hash}', combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > asumpt_min, - F.SUM(F.P) > asump_min, F.MAXSDOCACUT(adoca12_max)) + F.SUM(F.P) > asump_min) + combination12_code = F.MAXSDOCACUT(adoca12_max) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min) @@ -1146,6 +1147,7 @@ def make_omega0(name='BNOC_Omega0_Combiner_{hash}', name=name, DecayDescriptor=descriptor, CombinationCut=combination_code, + Combination12Cut=combination12_code, CompositeCut=vertex_code) @@ -1186,7 +1188,8 @@ def make_omega0_fake(name='BNOC_Omega0_Combiner_fake_{hash}', combination_code = F.require_all( in_range(am_min, F.MASS, am_max), F.SUM(F.PT) > asumpt_min, - F.SUM(F.P) > asump_min, F.MAXSDOCACUT(adoca12_max)) + F.SUM(F.P) > asump_min) + combination12_code = F.MAXSDOCACUT(adoca12_max) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min) @@ -1198,6 +1201,7 @@ def make_omega0_fake(name='BNOC_Omega0_Combiner_fake_{hash}', name=name, DecayDescriptor=descriptor, CombinationCut=combination_code, + Combination12Cut=combination12_code, CompositeCut=vertex_code) -- GitLab From c5427577555f2d33d438347677093028fe749200 Mon Sep 17 00:00:00 2001 From: Wouter Hulsbergen Date: Thu, 28 Mar 2024 16:06:24 +0100 Subject: [PATCH 7/9] replace MomentumCombiner by ParticleAdder --- .../Hlt2Conf/lines/rd/builders/baryonic_radiative_builders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_radiative_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_radiative_builders.py index fb147246279..7ed7217f949 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_radiative_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_radiative_builders.py @@ -178,7 +178,7 @@ def make_rd_lb_to_lgamma_LL(Lambda, return ParticleCombiner( Inputs=[Lambda, gamma], DecayDescriptor="[Lambda_b0 -> Lambda0 gamma]cc", - ParticleCombiner="MomentumCombiner", + ParticleCombiner="ParticleAdder", CombinationCut=combination_cut, CompositeCut=vertex_cut, name=name) -- GitLab From 0aaf93734d60982d90e69a0e5833d7ab15cdbf5c Mon Sep 17 00:00:00 2001 From: Wouter Hulsbergen Date: Wed, 8 May 2024 17:19:35 +0200 Subject: [PATCH 8/9] revert SDOCA change for DiMuonTrackEfficiency --- .../python/Hlt2Conf/lines/trackeff/DiMuonTrackEfficiency.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/DiMuonTrackEfficiency.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/DiMuonTrackEfficiency.py index d1178430117..20d6ef9f268 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/DiMuonTrackEfficiency.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/DiMuonTrackEfficiency.py @@ -151,8 +151,8 @@ def make_JPsiCombiner(particles, F.SUM(F.PT) > get_cuts['min_JPsiPT'], ) if get_cuts['max_JPsiDOCA'] is not None: - combination_cut = F.require_all( - combination_cut, F.MAXSDOCACUT(get_cuts['max_JPsiDOCA'])) + combination_cut = F.require_all(combination_cut, + F.MAXDOCACUT(get_cuts['max_JPsiDOCA'])) #additional cuts mother_cut = F.require_all( in_range(get_cuts['min_JPsimass'], F.MASS, get_cuts['max_JPsimass']), -- GitLab From 6e72b127e478dd92e646b5844e5b128598959a12 Mon Sep 17 00:00:00 2001 From: Wouter Hulsbergen Date: Wed, 8 May 2024 20:09:47 +0200 Subject: [PATCH 9/9] fixed a few remaining DOCA<-->SDOCA --- .../Hlt2Conf/lines/bandq/builders/qqbar_to_hadrons.py | 8 ++++---- .../python/Hlt2Conf/lines/bnoc/builders/b_builder.py | 2 +- .../python/Hlt2Conf/lines/bnoc/builders/basic_builder.py | 4 ++-- .../python/Hlt2Conf/lines/charm/cbaryon_spectroscopy.py | 4 ++-- Hlt/Hlt2Conf/python/Hlt2Conf/lines/commissioning.py | 2 +- .../Hlt2Conf/lines/semileptonic/builders/base_builder.py | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/qqbar_to_hadrons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/qqbar_to_hadrons.py index 1dbf7a40886..abbef00e407 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/qqbar_to_hadrons.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/qqbar_to_hadrons.py @@ -98,7 +98,7 @@ def make_ccbar_to_hadrons_detached_fourbody( #add more 12, 23, 34... cuts than pvs = make_pvs() combination_code = F.require_all( - in_range(am_min, F.MASS, am_max), F.MAXDOCACHI2CUT(maxdoca_max), + in_range(am_min, F.MASS, am_max), F.MAXSDOCACHI2CUT(maxdoca_max), (F.PT > apt_min), (F.CHILD(1, F.PT) + F.CHILD(2, F.PT) + F.CHILD( 3, F.PT) + F.CHILD(4, F.PT) > sum_pt_min), (F.CHILD(1, F.BPVIPCHI2()) + F.CHILD(2, F.BPVIPCHI2()) + F.CHILD( @@ -110,11 +110,11 @@ def make_ccbar_to_hadrons_detached_fourbody( #add more 12, 23, 34... cuts than combination12_code = F.require_all( F.MASS < am_max - 2 * _MASS_MIN_LIGHTHADRON, - F.DOCACHI2(1, 2) < maxdoca_max) + F.SDOCACHI2(1, 2) < maxdoca_max) combination123_code = F.require_all( F.MASS < am_max - _MASS_MIN_LIGHTHADRON, - F.DOCACHI2(1, 2) < maxdoca_max, - F.DOCACHI2(2, 3) < maxdoca_max) + F.SDOCACHI2(1, 2) < maxdoca_max, + F.SDOCACHI2(2, 3) < maxdoca_max) return ParticleCombiner( name=name, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/b_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/b_builder.py index c1f4f1a25e0..8cf28b252dc 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/b_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/b_builder.py @@ -1123,7 +1123,7 @@ def make_BToEtaKaon( if asumpt_min is not None: combination_code &= F.SUM(F.PT) > asumpt_min if adoca12_max is not None: - combination_code &= F.DOCA(1, 2) < adoca12_max + combination_code &= F.SDOCA(1, 2) < adoca12_max pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py index a3d47f61e93..bafe3d38788 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py @@ -861,7 +861,7 @@ def make_kstarplus_LL(name='BNOC_KstarPlus_LL_Combiner_{hash}', descriptor = '[K*(892)+ -> KS0 pi+]cc' combination_code = F.require_all( in_range(am_min - 10 * MeV, F.MASS, am_max + 10 * MeV), - F.SUM(F.PT) > asumpt_min, F.MAXDOCACUT(adoca12_max)) + F.SUM(F.PT) > asumpt_min, F.MAXSDOCACUT(adoca12_max)) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min, @@ -895,7 +895,7 @@ def make_kstarplus_DD(name='BNOC_KstarPlus_DD_Combiner_{hash}', descriptor = '[K*(892)+ -> KS0 pi+]cc' combination_code = F.require_all( in_range(am_min - 10 * MeV, F.MASS, am_max + 10 * MeV), - F.SUM(F.PT) > asumpt_min, F.MAXDOCACUT(adoca12_max)) + F.SUM(F.PT) > asumpt_min, F.MAXSDOCACUT(adoca12_max)) pvs = make_pvs() vertex_code = F.require_all(F.CHI2DOF < vchi2pdof_max, F.BPVFDCHI2(pvs) > bpvfdchi2_min, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_spectroscopy.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_spectroscopy.py index b6d4c60042d..70292785c59 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_spectroscopy.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_spectroscopy.py @@ -189,7 +189,7 @@ def _make_lc_or_xicp_pKpi( # F.MIN(F.MINIPCHI2(pvs)) > mintree_mipchi2_min, F.MAX(F.MINIPCHI2(pvs)) > maxtree_mipchi2_min, - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), ), CompositeCut=F.require_all( F.PT > pt_min, F.math.in_range(m_min, F.MASS, m_max), @@ -293,7 +293,7 @@ def _make_xic0_pkkpi( F.MASS, comb_m_max, ), - F.MAXDOCACUT(doca_max), + F.MAXSDOCACUT(doca_max), F.SUM(F.PT) > comb_sum_pt_min, F.SUM(F.MINIPCHI2(pvs) > comb_mipchi2_min_at_least_one) >= 1, F.SUM(F.MINIPCHI2(pvs) > comb_mipchi2_min_at_least_two) >= 2, diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/commissioning.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/commissioning.py index 87976e4ad46..5214210dd5b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/commissioning.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/commissioning.py @@ -268,7 +268,7 @@ def _d0_to_kpi_line(name="Hlt2Commissioning_D0ToKmPip_Hlt1D2KPiTOS"): F.math.in_range(1685 * MeV, F.MASS, 2045 * MeV), F.PT > 2 * GeV, F.MAX(F.PT) > 1200 * MeV, - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACUT(0.1 * mm), ), CompositeCut=F.require_all( F.math.in_range(1715 * MeV, F.MASS, 2015 * MeV), diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py index cc3984e2e70..578b0b9aa85 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/builders/base_builder.py @@ -564,7 +564,7 @@ def make_lambda_ll( combination_code = F.require_all( in_range(_Lambda0_M - mass_window_comb, F.MASS, _Lambda0_M + mass_window_comb), - F.MAXSDOCACHI2CUT(adocachi2cut_max)) + F.MAXDOCACHI2CUT(adocachi2cut_max)) pvs = make_pvs() vertex_code = F.require_all( in_range(_Lambda0_M - mass_window, F.MASS, _Lambda0_M + mass_window), @@ -617,7 +617,7 @@ def make_lambda_dd( combination_code = F.require_all( in_range(_Lambda0_M - mass_window_comb, F.MASS, _Lambda0_M + mass_window_comb), - F.MAXSDOCACHI2CUT(adocachi2cut_max)) + F.MAXDOCACHI2CUT(adocachi2cut_max)) pvs = make_pvs() vertex_code = F.require_all( in_range(_Lambda0_M - mass_window, F.MASS, _Lambda0_M + mass_window), -- GitLab