From 3115a9e6cc70d078d0f43a6ff3a680201a499c16 Mon Sep 17 00:00:00 2001 From: Sebastien Ponce Date: Thu, 25 Jul 2024 11:19:22 +0200 Subject: [PATCH 1/2] Added some hashes to Moore code to avoid collision of names in functor cache builds --- .../Hlt2Conf/lines/charm/cbaryon_spectroscopy.py | 2 +- .../python/Hlt2Conf/lines/charm/d0_to_hh.py | 16 ++++++++-------- .../Hlt2Conf/lines/charm/dsstar_to_dspipi.py | 2 +- .../Hlt2Conf/lines/charm/dst_to_dee_makers.py | 8 ++++---- .../python/Hlt2Conf/lines/charm/taggers.py | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_spectroscopy.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_spectroscopy.py index 70292785c59..da31f1cc02e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_spectroscopy.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/cbaryon_spectroscopy.py @@ -169,7 +169,7 @@ def _make_lc_or_xicp_pKpi( ], DecayDescriptor=decay_descriptor, name= - f"Charm_Spec_{'Lcp' if 'Lambda_c+' in decay_descriptor else 'Xicp'}_PpKmPip", + f"Charm_Spec_{'Lcp' if 'Lambda_c+' in decay_descriptor else 'Xicp'}_PpKmPip_{{hash}}", CombinationCut=F.require_all( F.math.in_range( comb_m_min, 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 44a34571e52..e283fe887cf 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hh.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hh.py @@ -158,13 +158,13 @@ def make_dzeros(particle1, particle2, descriptor): descriptor (string): Decay descriptor to be reconstructed. """ if descriptor == "[D0 -> K- pi+]cc": - name = 'Charm_D0ToHH_BuilderD0ToKmPip' + name = 'Charm_D0ToHH_BuilderD0ToKmPip_{hash}' elif descriptor == "D0 -> K- K+": - name = 'Charm_D0ToHH_BuilderD0ToKmKp' + name = 'Charm_D0ToHH_BuilderD0ToKmKp_{hash}' elif descriptor == "D0 -> pi- pi+": - name = 'Charm_D0ToHH_BuilderD0ToPimPip' + name = 'Charm_D0ToHH_BuilderD0ToPimPip_{hash}' elif descriptor == "[D0 -> K+ pi-]cc": - name = 'Charm_D0ToHH_BuilderD0ToKpPim' + name = 'Charm_D0ToHH_BuilderD0ToKpPim_{hash}' else: raise RuntimeError( "charm.b_to_d0mu_d0_to_hh.make_dzeros_for_b called with unsupported decay descriptor." @@ -473,13 +473,13 @@ def make_charm_kaons_for_b(): def make_dzeros_for_b(particle1, particle2, descriptor): if descriptor == "[D0 -> K- pi+]cc": - name = 'Charm_D0ToHH_SL_BuilderD0ToKmPip' + name = 'Charm_D0ToHH_SL_BuilderD0ToKmPip_{hash}' elif descriptor == "D0 -> K- K+": - name = 'Charm_D0ToHH_SL_BuilderD0ToKmKp' + name = 'Charm_D0ToHH_SL_BuilderD0ToKmKp_{hash}' elif descriptor == "D0 -> pi- pi+": - name = 'Charm_D0ToHH_SL_BuilderD0ToPimPip' + name = 'Charm_D0ToHH_SL_BuilderD0ToPimPip_{hash}' elif descriptor == "[D0 -> K+ pi-]cc": - name = 'Charm_D0ToHH_SL_BuilderD0ToKpPim' + name = 'Charm_D0ToHH_SL_BuilderD0ToKpPim_{hash}' else: raise RuntimeError( "charm.b_to_d0mu_d0_to_hh.make_dzeros_for_b called with unsupported decay descriptor." 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 639bba7ea28..b18792b382c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dsstar_to_dspipi.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/dsstar_to_dspipi.py @@ -78,7 +78,7 @@ def make_dss(particle1, particle2, particle3): return ParticleCombiner( [particle1, particle2, particle3], DecayDescriptor="[D_s+ -> K- K+ pi+]cc", - name='Charm_Dsstar2dspipi_BuilderDsToKmKpPip', + name='Charm_Dsstar2dspipi_BuilderDsToKmKpPip_{hash}', CombinationCut=F.require_all( in_range(1885 * MeV, F.MASS, 2045 * MeV), F.PT > 4.0 * GeV, 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 3518c31a1d2..00389ade851 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 @@ -348,7 +348,7 @@ def make_dzeros_for_hh(particle1, particle2, descriptor): descriptor (string): Decay descriptor to be reconstructed. """ if descriptor == "[D0 -> K- pi+]cc": - name = 'Charm_D0ToHH_BuilderD0ToKmPip' + name = 'Charm_D0ToHH_BuilderD0ToKmPip_{hash}' else: raise RuntimeError( f"charm.dst_to_dee.make_dzeros_for_hh called with unsupported decay descriptor '{descriptor}'" @@ -380,7 +380,7 @@ def make_untight_dzeros_for_hh(particle1, particle2, descriptor): descriptor (string): Decay descriptor to be reconstructed. """ if descriptor == "[D0 -> K- pi+]cc": - name = 'Charm_D0ToHH_BuilderD0ToKmPip_untight' + name = 'Charm_D0ToHH_BuilderD0ToKmPip_untight_{hash}' else: raise RuntimeError( f"charm.dst_to_dee.make_dzeros_for_hh called with unsupported decay descriptor '{descriptor}'" @@ -414,7 +414,7 @@ def make_dzeros_for_hhhh(particle1, particle2, particle3, particle4, TODO: F.BPVLTIME tunning """ if descriptor == '[D0 -> K- pi- pi+ pi+]cc': - name = "Charm_D0ToHHHH_BuilderD0ToKmPimPipPip" + name = "Charm_D0ToHHHH_BuilderD0ToKmPimPipPip_{hash}" else: raise RuntimeError( f"charm.dst_to_dee.make_dzeros_for_hhhh called with unsupported decay descriptor '{descriptor}'" @@ -462,7 +462,7 @@ def make_untight_dzeros_for_hhhh(particle1, particle2, particle3, particle4, TODO: F.BPVLTIME tunning """ if descriptor == '[D0 -> K- pi- pi+ pi+]cc': - name = "Charm_D0ToHHHH_BuilderD0ToKmPimPipPip_untight" + name = "Charm_D0ToHHHH_BuilderD0ToKmPimPipPip_untight_{hash}" else: raise RuntimeError( f"charm.dst_to_dee.make_dzeros_for_hhhh called with unsupported decay descriptor '{descriptor}'" diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/taggers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/taggers.py index 79edd43b6b0..b3a60c59545 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/taggers.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/taggers.py @@ -140,17 +140,17 @@ def make_dstars(dzeros, self_conjugate_d0_decay, d0_name=None, for_b=False): if self_conjugate_d0_decay: dstarp = _make_dstar_from_descriptor( dzeros, "D*(2010)+ -> D0 pi+", - f"Charm_Taggers_DstpBuilder{'ForB' if for_b else ''}For{d0_name}", + f"Charm_Taggers_DstpBuilder{'ForB' if for_b else ''}For{d0_name}_{{hash}}", for_b) dstarm = _make_dstar_from_descriptor( dzeros, "D*(2010)- -> D0 pi-", - f"Charm_Taggers_DstmBuilder{'ForB' if for_b else ''}For{d0_name}", + f"Charm_Taggers_DstmBuilder{'ForB' if for_b else ''}For{d0_name}_{{hash}}", for_b) return ParticleContainersMerger([dstarp, dstarm]) else: return _make_dstar_from_descriptor( dzeros, "[D*(2010)+ -> D0 pi+]cc", - f"Charm_Taggers_DstBuilder{'ForB' if for_b else ''}For{d0_name}", + f"Charm_Taggers_DstBuilder{'ForB' if for_b else ''}For{d0_name}_{{hash}}", for_b) -- GitLab From e0a3de4e4dbd9266ba7b381340875cbc664da14f Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Mon, 29 Jul 2024 01:03:11 +0200 Subject: [PATCH 2/2] HACK: Avoid F.MUONLLMU - F.MUONLLBG --- Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py index 243943bc423..c763df31658 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py @@ -417,7 +417,7 @@ def filter_ttrack_muons_for_high_mass( muons = make_muons() filter_code_high_mass = F.require_all( F.GHOSTPROB < ghostprob_max, - (F.MUONLLMU - F.MUONLLBG) > muondll_mu_min, + # (F.MUONLLMU - F.MUONLLBG) > muondll_mu_min, F.MUONCHI2CORR < muonchi2_max, F.PT > pt_min, F.P > p_min, F.NFTHITS @ F.TRACK > track_min, F.CHI2 < chi2_max, F.PID_MU > pid_mu_min, F.PID_K < pid_k_max, F.PID_P < pid_p_max, -- GitLab