diff --git a/Hlt/Hlt2Conf/options/hlt2_line_example.py b/Hlt/Hlt2Conf/options/hlt2_line_example.py index 7a20c63ecc3b86ce60fa90ba148a4a6247766eb9..221f2aa01bc094e41448c787f27727784bac3e1e 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 c13e83bb61caa95e0a0d80c780418b59e8255294..4430814e741a78440eff7a446dd750b2914f10fb 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 @@ -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: @@ -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 45951fa0ba8e0d57bc41269f6968dc27f707db65..06a7a24fee2e4b9a3eb4a280bb067763b183cfea 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: @@ -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 46efd58d2d4bcd9839a926e2c15ef007c3e9be0c..e8a62695df016495054e2b982e8a156655f31cdf 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 62f414b57e66c255d9352990a6a0eeae62406f4a..0d2e38329f971e8547a36bb93f5ec9a153b19c15 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/b_to_LcX_TT_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/b_to_LcX_TT_lines.py index 87a0e17b74e5e88e8c01deb32535b1d0a720dfa2..75163810b901ff1a2c5b8d373fbd21f19817c62b 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 32a4259914072db870c4501adaaadc133beaface..a4b86ec9842b6cf76a8dfb4acebd6ee4d81ce962 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/c_hadrons.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/c_hadrons.py index c4db864c9d24d709a631ef79b895422c53d4c8c2..cb7555ecf3e104c7a0bcf574905b7cb5fe1bb808 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 d5cbad1fb60f56951dc2189b13138032e99dab94..29d066a42058b5ea0f320c04388894d9b91587fb 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 e1c872fa530b58fe576783d31167af187172d34a..bb6ecf1d66cb335cf54aafb20f21ec8cfcd603f1 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/ppmumu_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/ppmumu_lines.py index 39e837ac1835de49a701a2b627d4b14f47964a0b..b1218a01f4f5cd1da620ca35a2f4c2b9d9c39eee 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 5df4b8522c67e216326ad6f6554b20f4aec54d2a..abbef00e407a8ac6d500959d959f5494b0dc82bc 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( @@ -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, @@ -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 f2ed2b50b8f36fff9d8af49558fe448afb3e68cd..8cf28b252dcd920c4d818fb9a999341d6fed6060 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() @@ -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: @@ -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( @@ -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, @@ -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])) @@ -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 5da66cae4564b6cc10b8b7ac0dbe335ede391118..bafe3d387880ffecd7d1ff2a6caa9999a35fa011 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/basic_builder.py @@ -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) @@ -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, @@ -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,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.MAXDOCACUT(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.MAXDOCACUT(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) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/combiners.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/bnoc/builders/combiners.py index 4f6e4ccab8a7036badfad794941caffb95487587..2ccfc7e03c622923fbc7e5c6fd2d3cc6a6d69a96 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_spectroscopy.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_spectroscopy.py index b6d4c60042dc488b53862477bee05c66f2eea526..70292785c5928a4e224d480a3dcbfef2fed66269 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/charm/cbaryon_to_ph0_btag.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_ph0_btag.py index e675c23ddf03df6a947afafffdb830288b84e8d9..1bfc4c327cea1c610d10da39fff47e049e389f89 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), @@ -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 67afaa9c38779077ed22e096f77554461fdfcaa1..3f2e838965d731f3f4a8f9ce82bd501becae45f1 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), @@ -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_pk.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_pk.py index 5712f7e47e0aa9035835c91c472c04ca6e8eecb7..656f6686888c54efb1d019337e1691a1ed3cd6e3 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 835961986ef70f0f9178700563559102d3bfecb4..7e51f84cd3e2d6890c37792d37af7861bebd76b4 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_sl.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_to_sl.py @@ -309,8 +309,8 @@ def make_lambdall(): name='Charm_CBaryonToSl_make_lambdall_{hash}', CombinationCut=F.require_all( F.MASS < 1160 * MeV, - F.MAXDOCACUT(0.2 * mm), - F.MAXDOCACHI2CUT(16.), + F.MAXSDOCACUT(0.2 * mm), + F.MAXSDOCACHI2CUT(16.), F.SUM(F.PT) > 500 * MeV, ), CompositeCut=F.require_all( @@ -333,8 +333,8 @@ def make_lambdadd(): name='Charm_CBaryonToSl_make_lambdadd_{hash}', CombinationCut=F.require_all( F.MASS < 1180 * MeV, - F.MAXDOCACUT(2 * mm), - F.MAXDOCACHI2CUT(16.), + F.MAXSDOCACUT(2 * mm), + F.MAXSDOCACHI2CUT(16.), F.SUM(F.PT) > 500 * MeV, ), CompositeCut=F.require_all( @@ -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 afb20786fc16ce6f33f296a536332a4ebed83263..61cda5a902bbf65d15bd1545007dedc706ee05fd 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.MAXDOCACHI2CUT(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 187a99a58ffce7d0ed4570f1609b19e88086e200..79c783a91a1f4bae1941e99ffdeb767cc62469be 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 9a4e1f20b008e32e56bfa0b1e5ec8db5f0b7e96c..2063676a9658404db5933dd5c52aa04b65deefce 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 @@ -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 a00af225c66f1e9b3fe8a9edb90b8ba29ed7cbbd..50f1584d0813bad5dcd7be6d53f5632bb6e6bb75 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, ) @@ -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 bbf9c3c678daa1ca81094e68b7c40eb76e8fe907..44a34571e52226bad61b11c3416471b40afe537b 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 ca01d3a3c8ca1926bc0cc8ff83e018ce3e2ca4d8..0c0e9f1c27546b628c2ec8298fc72f95c2decb17 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhgamma.py @@ -83,8 +83,8 @@ def _make_phi2kk(): name="Charm_D0Tohhgamma_PhiToKpKm", CombinationCut=F.require_all( F.MASS < 2150 * MeV, - F.MAXDOCACHI2CUT(10.), - F.DOCA(1, 2) < 200 * um, + F.MAXSDOCACHI2CUT(10.), + F.SDOCA(1, 2) < 200 * um, F.SUM(F.PT) > 0 * MeV, ), CompositeCut=F.require_all( @@ -103,8 +103,8 @@ def make_rho2pipi(): name="Charm_D0Tohhgamma_Rho0ToPipPim", CombinationCut=F.require_all( F.MASS < 2150 * MeV, - F.MAXDOCACHI2CUT(10.), - F.DOCA(1, 2) < 200 * um, + F.MAXSDOCACHI2CUT(10.), + F.SDOCA(1, 2) < 200 * um, F.SUM(F.PT) > 0 * MeV, ), CompositeCut=F.require_all( @@ -124,8 +124,8 @@ def make_kstar2kpi(): name="Charm_D0Tohhgamma_Kst0bToKmPip", CombinationCut=F.require_all( F.MASS < 2150 * MeV, - F.MAXDOCACHI2CUT(10.), - F.DOCA(1, 2) < 200 * um, + F.MAXSDOCACHI2CUT(10.), + F.SDOCA(1, 2) < 200 * um, F.SUM(F.PT) > 0 * MeV, ), CompositeCut=F.require_all( @@ -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.MAXDOCACHI2CUT(10.), 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 3624da2827e18799aa86a7f8f35d638e00cd3927..07f2ade9fe41c395d4f6164a22204915664b66d2 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 f1546b6fd68552d08217e68ec4b4a4c7cf104e1e..ca08b0ae4d448b89e91c32706147d0dc2a189c89 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhpi0.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hhpi0.py @@ -94,8 +94,8 @@ def _make_hh_pair(particle1, combination_code = F.require_all(*combination_cut_list, F.MASS < comb_m_max, - F.MAXDOCACHI2CUT(docachi2_max), - F.DOCA(1, 2) < doca_max) + F.MAXSDOCACHI2CUT(docachi2_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_hlnux.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hlnux.py index 844958e4046d0b8fd3b0c30e1cb5d52a6050af68..4dbace302addd8adede5119a82a38f91015a929c 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/d_to_etah.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_etah.py index 99a0e0322060c0048d1354b2f6a4fdebc7c87c4e..da24942882b596e716653a78c7bc73f3fe8bfca8 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 9ed8495a5a02a990e63e04d0263169416f630342..f8c2462536041f7a2c3958278ce54a7bc664b0eb 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_hhhgamma.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_hhhgamma.py index 19a7d837c7e3f447da6b537b5d06e02024fdf57f..f042691ac729fb46c994bfe4d3806672c25d0c21 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, ), + Combination123Cut=F.MAXSDOCACHI2CUT(10.), CombinationCut=F.require_all( in_range(1680 * MeV, F.MASS, m_max + 20 * MeV), - F.MAXDOCACHI2CUT(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 b970bb508a13bd997cf5e5e5dffaf434d86dd15e..ab80703bf660276ebd9776ae14d2bf92f7f8d96b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d_to_ksh.py @@ -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 65f59d0fa7aaa18e4319d44dbd6d2ad2c559ab5d..9743859e88e5421eb83c186caa664235fd24bb31 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/detection_asymmetry_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/detection_asymmetry_lines.py @@ -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 b8926a799970dc564b0f2b6f7608b182029f2c4a..639bba7ea285115126e9357fb601cd7ad092c07a 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dsstar_to_dspipi.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dsstar_to_dspipi.py @@ -82,8 +82,8 @@ 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.MAXDOCACUT(0.27 * mm), + F.MAXSDOCACHI2CUT(18.0), + F.MAXSDOCACUT(0.27 * mm), ), CompositeCut=F.require_all( in_range(1890 * MeV, F.MASS, 2040 * MeV), @@ -103,10 +103,10 @@ 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.DOCA(1, 2) < 0.30 * mm, - F.DOCA(1, 3) < 0.30 * mm, - F.DOCA(2, 3) < 0.65 * mm, + F.MAXSDOCACHI2CUT(15.0), + 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), @@ -125,10 +125,10 @@ 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.DOCA(1, 2) < 0.30 * mm, - F.DOCA(1, 3) < 0.30 * mm, - F.DOCA(2, 3) < 0.65 * mm, + F.MAXSDOCACHI2CUT(15.0), + 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 548a737bd694461bd8bca59e607a8aff482e46d5..cff89c3b052d7220deb9a051615cead3faab404d 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 b28c6c6717405788ba85aa64a3cf55e92b801f6f..7da27f72f8c05284cab635d229c5cd8b6d7528e3 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 32205a4af1ba1f8339d1c597ad25c6d6dc84ce89..f385d86d11e955f4276dfe7dc3907be6c934eaa2 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/lc_to_ksh_kshhh.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/lc_to_ksh_kshhh.py index 7aa4af070344dd176605e35d195bb4b8e185fe3e..7a79d2b823ed1dd85b48d310ee143afd44679f53 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 @@ -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 febcb6f43f766823954f08a55bf821012f5f3682..bfeb8daa3ab72b7d7332fceed93b48ae6a8be81d 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 fec88aa5eeed470df39dab64f56967ad55585348..5c9545b760c84ff6df9e9109f186469a9f4020dd 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py @@ -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.MAXDOCACHI2CUT(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, @@ -1603,7 +1609,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 cb4698125207c386fff624fb95337e85ffcbae60..79edd43b6b07c4b0831c09e70d696b65bb474ff5 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/charmonium_to_dimuon.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charmonium_to_dimuon.py index bda9026598c277953e5524d636d3d7f4568023ab..eed6bf60bf7fb3fcd0a8b20d36c33194b16b2dd6 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/commissioning.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/commissioning.py index 87976e4ad4697f978044a1d8b1368410f063b366..5214210dd5b838d5aeef4b8831e5ca3e5ffccb62 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/hlt2_line_example.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/hlt2_line_example.py index fd865f8d9a77bcf6cdf9d5fb6619ca7a81b4fb72..5cb1e601d79b21acde2f8ff9e1e14a9c03a256f1 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.MAXDOCACHI2CUT(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.MAXDOCACHI2CUT(9.), - F.MAXDOCACUT(0.1 * mm), + F.MAXSDOCACHI2CUT(9.), + 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 268ef197966c8952f878d7a564b11e19b6c274cb..60171c6c847aad3b32178d0d7fed2c09b6e1edcc 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 514d93b994890b5cf3ba1bca317b07f63400b022..0e2e98df0765b0dc400ce351b598182195dcea73 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/iftPbPb/builders/charm_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/iftPbPb/builders/charm_builders.py index 5cda840e5d7f29314df6a79e944cd452f7e8c735..870a7cb9e5e978b43b3adcb29f314179121927de 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,11 +222,11 @@ 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"]) - combination12_code = F.require_all(F.MAXDOCACUT(0.5 * mm)) + combination12_code = F.require_all(F.MAXSDOCACUT(0.5 * mm)) return ParticleCombiner( name=name, @@ -263,12 +263,12 @@ 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( 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/jets/topobits.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/jets/topobits.py index eb22be381908f2bf9d9d3a02b699b639365a774b..8f34c27d312e05593f4bc96ab854ed6ffaf3bbd2 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/monitoring/data_quality_PbPb.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/data_quality_PbPb.py index 4d17412df331b38c3139f1b229b25e9b7ec144bb..8d9def8a3075a273cae1c0b66ed4b33f783396ab 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 5c65afcf859b6293adbf394fac82d008151ec5bb..8a01f2b3e65d2dbe2de47d1da45fc872afe2a1f7 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 7b45950abe382d9dea39a703f09f009d602e65df..2f2c6e46e0b4965a9fd531f1248cf2ec62981ca3 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 14313dc3a8fe80f134ecb1b45f369ae22e0c6736..da45c1a687dbdbf158bb640d1d13689c6e710a98 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.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 77176bc46693d4897828e499b27c272c60557518..450ca0242955c5794ae865d1deb94d6d961abfb3 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 927823b0774c3e41b0bb4cd97d195863c7e3d112..b093cc58cf7a0ad0252095262111489a7979d57c 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), ) @@ -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 90dc9a5c86572fa9a7703b96cd039e063d177b6d..60e5797a00757fc97d578e94d6b61edb9312294d 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 bbb70b45b3540b12cff3c0e35191d1c293c767b1..ef5ef2669fd0333b8ab8c2bbe097cf5a18dfabef 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, ) @@ -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, @@ -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/calibration.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/calibration.py index 42adb94b196ad9c9756341e5345d677bb954820f..17f44927c6e59acc44432540c8951b4516c7f29d 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 298048882ea36e1dee8e313a38b84f377688e969..60aa3329b4e5a026e554ab394d0dc1db6a0bb295 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 7cd1a2db764024873d90cb9321937c510b7cbb78..ffeec30eca8f9a5fe6230eb48853d366e3025079 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/qee/qee_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py index 0cd780cf62d229bb3371f389b1cac70b4b720fa3..996e89fb12392d96cea5bbc00b00a73b243c0b93 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 6010719a21a38b837679fad9f9277b439616efd1..294cab3c0df661cd8178692d426d76c8f91b8def 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/Nmu_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/Nmu_builders.py index 3355a56744658e2474276f8f22bc0f7711ba8b44..14d86a523899f82482717cef6c08d0b8f7e9f6fa 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 ffb80c424a77c6d133c7b299fb3c556174a435eb..d0176c918d8f0baa018a8d6170ef8d5a762bcdf9 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/b_to_v0ll_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_v0ll_builder.py index 0fdd740bd6c9f54a329899e255291dd8b534b5e0..23207ee4aaf677011749241feedb67b15be8ef0f 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 b795bc87bf934f2823276ebb44240a7ef0927473..99cc29a680bf0437184d2fe59c9f985965fbd067 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 6e38d056df598591b447585a4c0d7af32cc8f5e7..ac986d24dbdaab4a5937a482db86e563f061932e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_builders.py @@ -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/baryonic_radiative_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_radiative_builders.py index fb147246279b8a99e3b6f9dcb4fbb58f2cf02be7..7ed7217f949de68b694ac2b15fb9bfecd741ab0d 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) 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 b6bd5b0ec1a501b506cc408b3b98f3106f38faa5..2e29d4d1919a1cd4b9956d5b98293e08a6bc27a0 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 95b08d6d0861d1a726e121332526aabe405a7105..c2dde10c381afb275ebd9f80987de90180aa337b 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 a9f2484db0b3b4044f0450396272da3b0709d076..f512b7de90edfaef5fc9e3556639745c0f0cb207 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rdbuilder_thor.py @@ -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( @@ -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.DOCA(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.DOCA(1, 3) < adoca_max, - # F.DOCA(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 2bf5583d39c4d27f1a24f8d2337be4fdc21ad291..8421023120e6b11c88636a0dfe981ac44fd71b40 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/strange_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/strange_builders.py @@ -71,8 +71,8 @@ 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_DOCACHI2 = optional_functor(lambda v: F.MAXDOCACHI2CUT(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( lambda v, pvs: F.MINIP(pvs) / F.BPVVDZ(pvs) < v) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/HbToTauNu_BTracking.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/semileptonic/HbToTauNu_BTracking.py index f69c52e4122745a16f8be89f12773cbbdf56e3df..44d35165252da209adb881af03f3a4b5a0c8a59b 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 41791840acebc8e489abfe2d3504e13665e9eced..b10d4be24db88b8a62f7c0d9225a6a4e75d76d96 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), @@ -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 8c46e43c77f4520d9bbc4c1418564188708073a5..578b0b9aa85396a9ddfb2845f947569fce0754ad 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 27cb93f9c880f6b2e239a3b60b1a16559da44769..cff269686353e1ae965219c85e585c152146b51c 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,10 +84,10 @@ 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.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 a4e5d977495dfff4442d00ab3c52563be94df7b5..eebedb0f95f11274b34bbeaae4e9458373377c7a 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/starterkit/bs_to_jpsiphi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/starterkit/bs_to_jpsiphi.py index a6e6e0f9174ef6724faf9bad98737d751f474ceb..e387ed4dd8de0543b02f38b1d612f0bcc6a1250e 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 b74c5ed2597da3fbec8fb9357c1219b70379b7af..bf2130c7bf774075e8c506f46354e15ace3f8813 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/hlt2_test.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/test/hlt2_test.py @@ -168,8 +168,8 @@ 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.MAXDOCACHI2CUT(12.), + F.MAXSDOCACUT(2 * mm), + F.MAXSDOCACHI2CUT(12.), F.PT > 0.9 * GeV, F.P > 13 * GeV, F.SUM(F.PT) > 1 * 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, @@ -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), @@ -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 72341a234f6b4b4a70e62ee4625c6d1e4fac3ba0..91fd64447a9e637773bdd8303ef41ea39734da3c 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 d1023cc7402b2f7d77a06eb15d513fa741e50a40..37ecf7736213a2031f4686c70850f3985abbda25 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/Velo2Long_B2JpsiK_ElectronProbe.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/trackeff/Velo2Long_B2JpsiK_ElectronProbe.py index b8bf40eb2225f521a6ad59541620eabac0cbafc6..f83ad9f25f0d7e4d16cb7ff8ce7a3e1be9624b4c 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 b93e7fb9dc4478fe00d1dbc6e2865e206c93b651..189b23620abf2895a4cbc2802ca945c4ca448fa5 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 ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/standard_particles.py b/Hlt/Hlt2Conf/python/Hlt2Conf/standard_particles.py index 6f8b1d11a1e5dc9ac1e8ae2d196a90cb55a7d2a0..8837358e7d6da6c8ee739c4384fc5bc3e543fbd1 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 95f22e416eb4e3c18ac336e9d6574d8aedbc8f4a..f6d3bf65a972d74ad9fa35c1ed88e7bcc91fa334 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 9e825a706689dbb7e7897601562190f922b21465..73bf81316b1a2d0e53b9a877a33ad29fc6ae819b 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, )