harder SDOCA (0.25) in make_fourbody, add phi builder fix in standard_particles.py

Hlt/Hlt2Conf/python/Hlt2Conf/lines/b_to_open_charm/builders/basic_builder.py

@@ -397,12 +397,12 @@ def _make_fourbody(particles,
                    name="B2OCFourBodyCombiner_{hash}",
                    make_pvs=make_pvs,
                    asumpt_min=1800 * MeV,
-                   adoca12_max=0.5 * mm,
-                   adoca13_max=0.5 * mm,
-                   adoca14_max=0.5 * mm,
-                   adoca23_max=0.5 * mm,
-                   adoca24_max=0.5 * mm,
-                   adoca34_max=0.5 * mm,
+                   adoca12_max=0.25 * mm,
+                   adoca13_max=0.25 * mm,
+                   adoca14_max=0.25 * mm,
+                   adoca23_max=0.25 * mm,
+                   adoca24_max=0.25 * mm,
+                   adoca34_max=0.25 * mm,
                    vchi2pdof_max=10,
                    bpvvdchi2_min=36,
                    bpvipchi2_min=0,
@@ -464,12 +464,12 @@ def make_fourbody(particles,
                   name="B2OCFourBodyFilter",
                   make_pvs=make_pvs,
                   asumpt_min=1800 * MeV,
-                  adoca12_max=0.5 * mm,
-                  adoca13_max=0.5 * mm,
-                  adoca14_max=0.5 * mm,
-                  adoca23_max=0.5 * mm,
-                  adoca24_max=0.5 * mm,
-                  adoca34_max=0.5 * mm,
+                  adoca12_max=0.25 * mm,
+                  adoca13_max=0.25 * mm,
+                  adoca14_max=0.25 * mm,
+                  adoca23_max=0.25 * mm,
+                  adoca24_max=0.25 * mm,
+                  adoca34_max=0.25 * mm,
                   vchi2pdof_max=10,
                   bpvvdchi2_min=36,
                   bpvipchi2_min=0,

Hlt/Hlt2Conf/python/Hlt2Conf/standard_particles.py

@@ -546,7 +546,7 @@ def filter_leptons_loose(particles,
 
 #Basic dilepton builders
 @configurable
-def make_detached_dielectron(name='make_detached_dielectron_{hash}',
+def make_detached_dielectron(name='std_make_detached_dielectron_{hash}',
                              pv_maker=make_pvs,
                              opposite_sign=True,
                              dilepton_ID='J/psi(1S)',
@@ -710,7 +710,7 @@ def make_detached_dielectron_with_brem(
 
 
 @configurable
-def make_detached_mue(name='make_detached_mue_{hash}',
+def make_detached_mue(name='std_make_detached_mue_{hash}',
                       opposite_sign=True,
                       dilepton_ID='J/psi(1S)',
                       pv_maker=make_pvs,
@@ -762,7 +762,7 @@ def make_detached_mue(name='make_detached_mue_{hash}',
 
 
 @configurable
-def make_detached_mue_with_brem(name='make_detached_mue_with_brem_{hash}',
+def make_detached_mue_with_brem(name='std_make_detached_mue_with_brem_{hash}',
                                 opposite_sign=True,
                                 dilepton_ID='J/psi(1S)',
                                 pv_maker=make_pvs,
@@ -819,7 +819,7 @@ def make_detached_mue_with_brem(name='make_detached_mue_with_brem_{hash}',
 
 
 @configurable
-def make_detached_mumu(name='make_detached_mumu_{hash}',
+def make_detached_mumu(name='std_make_detached_mumu_{hash}',
                        opposite_sign=True,
                        dilepton_ID='J/psi(1S)',
                        pv_maker=make_pvs,
@@ -861,7 +861,7 @@ def make_detached_mumu(name='make_detached_mumu_{hash}',
 
 
 @configurable
-def make_dimuon_base(name='DiMuonBaseCombiner_{hash}',
+def make_dimuon_base(name='std_DiMuonBaseCombiner_{hash}',
                      maxVCHI2PDOF=25,
                      pt=None,
                      pid_mu=None,
@@ -892,7 +892,7 @@ def make_dimuon_base(name='DiMuonBaseCombiner_{hash}',
 
 
 @configurable
-def make_mass_constrained_jpsi2mumu(name='MassConstrJpsi2MuMuMaker_{hash}',
+def make_mass_constrained_jpsi2mumu(name='std_MassConstrJpsi2MuMuMaker_{hash}',
                                     jpsi_maker=make_dimuon_base,
                                     nominal_mass=masses['J/psi(1S)'],
                                     pid_mu=0,
@@ -916,15 +916,29 @@ def make_mass_constrained_jpsi2mumu(name='MassConstrJpsi2MuMuMaker_{hash}',
 
 
 @configurable
-def make_phi2kk(am_max=1100. * MeV,
-                adoca_chi2=30,
+def make_phi2kk(pv_maker=make_pvs,
+                am_max=1060. * MeV,
+                asumpt_min=500 * MeV,
+                kaon_p_min=2500 * MeV,
+                kaon_pt_min=250 * MeV,
+                kaon_pidk_min=-5,
+                adoca12_max=0.3 * mm,
                 vchi2=25.0,
-                name='make_phi2kk_{hash}'):
-    kaons = make_long_kaons()
+                mipchi2_min=None,
+                name='std_make_phi2kk_{hash}'):
+    pvs = pv_maker()
+    kaons = ParticleFilter(
+        make_has_rich_long_kaons(),
+        F.FILTER(
+            F.require_all(F.P > kaon_p_min, F.PT > kaon_pt_min,
+                          F.PID_K > kaon_pidk_min)))
     descriptors = 'phi(1020) -> K+ K-'
-    combination_code = F.require_all(F.MASS < am_max,
-                                     F.MAXDOCACHI2CUT(float(adoca_chi2)))
-    vertex_code = F.require_all(F.CHI2 < vchi2)
+    combination_code = F.require_all(F.MASS < 1.1 * am_max,
+                                     F.SUM(F.PT) > asumpt_min,
+                                     F.DOCA(1, 2) < adoca12_max)
+    vertex_code = F.require_all(F.MASS < am_max, F.CHI2 < vchi2)
+    if mipchi2_min is not None:
+        vertex_code &= F.MINIPCHI2(pvs) > mipchi2_min
     return ParticleCombiner(
         Inputs=[kaons, kaons],
         name=name,
@@ -987,7 +1001,7 @@ def make_up_protons_for_V0():
 def _make_V0LL(particles,
                descriptors,
                pv_maker=make_pvs,
-               name='make_V0LL_{hash}',
+               name='std_make_V0LL_{hash}',
                nominal_mass=masses['KS0'],
                am_dmass=50 * MeV,
                m_dmass=35 * MeV,
@@ -1021,7 +1035,7 @@ def _make_V0LL(particles,
 def _make_V0DD(particles,
                descriptors,
                pv_maker=make_pvs,
-               name='make_V0DD_{hash}',
+               name='std_make_V0DD_{hash}',
                nominal_mass=masses['KS0'],
                am_dmass=80 * MeV,
                m_dmass=64 * MeV,
@@ -1049,7 +1063,7 @@ def _make_V0DD(particles,
 def _make_V0LD_UL(particles,
                   descriptors,
                   pv_maker=make_pvs,
-                  name='make_V0LD_{hash}',
+                  name='std_make_V0LD_{hash}',
                   nominal_mass=masses['KS0'],
                   am_dmass=80 * MeV,
                   m_dmass=64 * MeV,