remove line suffix for !1730

Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/d0_to_hlnux.py

@@ -13,47 +13,47 @@ All lines are tagged with D*(2010)+ -> D0 pi+ decays.
 
 3-body lines:
 ---------------------
-    D0 -> K- e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmEpNu_OS_Line)
-    D0 -> K- e- nu (Hlt2Charm_DstpToD0Pip_D0ToKmEmNu_SS_Line)
-    D0 -> K- mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmMupNu_OS_Line)
-    D0 -> K- mu- nu (Hlt2Charm_DstpToD0Pip_D0ToKmMumNu_SS_Line)
-    D0 -> pi- e+ nu (Hlt2Charm_DstpToD0Pip_D0ToPimEpNu_OS_Line)
-    D0 -> pi- e- nu (Hlt2Charm_DstpToD0Pip_D0ToPimEmNu_SS_Line)
-    D0 -> pi- mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToPimMupNu_OS_Line)
-    D0 -> pi- mu- nu (Hlt2Charm_DstpToD0Pip_D0ToPimMumNu_SS_Line)
-
-    D0 -> K+ e- nu (Hlt2Charm_DstpToD0Pip_D0ToKpEmNu_WS_Line)
-    D0 -> K+ mu- nu (Hlt2Charm_DstpToD0Pip_D0ToKpMumNu_WS_Line)
+    D0 -> K- e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmEpNu_OS)
+    D0 -> K- e- nu (Hlt2Charm_DstpToD0Pip_D0ToKmEmNu_SS)
+    D0 -> K- mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmMupNu_OS)
+    D0 -> K- mu- nu (Hlt2Charm_DstpToD0Pip_D0ToKmMumNu_SS)
+    D0 -> pi- e+ nu (Hlt2Charm_DstpToD0Pip_D0ToPimEpNu_OS)
+    D0 -> pi- e- nu (Hlt2Charm_DstpToD0Pip_D0ToPimEmNu_SS)
+    D0 -> pi- mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToPimMupNu_OS)
+    D0 -> pi- mu- nu (Hlt2Charm_DstpToD0Pip_D0ToPimMumNu_SS)
+
+    D0 -> K+ e- nu (Hlt2Charm_DstpToD0Pip_D0ToKpEmNu_WS)
+    D0 -> K+ mu- nu (Hlt2Charm_DstpToD0Pip_D0ToKpMumNu_WS)
 
 5-body lines:
 ---------------------
-    D0 -> K- Pi- Pi+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmPimPipEpNu_Line)
-    D0 -> K- Pi+ Pi+ e- nu (Hlt2Charm_DstpToD0Pip_D0ToKmPipPipEmNu_KLepSS_Line)
-    D0 -> K- Pi- Pi+ e- nu / D0 -> K- Pi+ Pi+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmPimPipEmNu_SS_Line)
-    D0 -> K- Pi- Pi+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmPimPipMupNu_Line)
-    D0 -> K- Pi+ Pi+ mu- nu (Hlt2Charm_DstpToD0Pip_D0ToKmPipPipMumNu_KLepSS_Line)
-    D0 -> K- Pi- Pi+ mu- nu / D0 -> K- Pi+ Pi+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmPimPipMumNu_SS_Line)
-
-    D0 -> K- K+ Pi- e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpPimEpNu_Line)
-    D0 -> K- K+ Pi+ e- nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpPipEmNu_KLepSS_Line)
-    D0 -> K- K+ Pi- e- nu / D0 -> K- K+ Pi+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpPimEmNu_SS_Line)
-    D0 -> K- K+ Pi- mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpPimMupNu_Line)
-    D0 -> K- K+ Pi+ mu- nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpPipMumNu_KLepSS_Line)
-    D0 -> K- K+ Pi- mu- nu / D0 -> K- Pi+ Pi+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpPimMumNu_SS_Line)
-
-    D0 -> K- K- K+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKmKpEpNu_KLepRS_Line)
-    D0 -> K- K+ K+ e- nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpKpEmNu_KLepWS_Line)
-    D0 -> K- K- K+ e- nu / D0 -> K- K+ K+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKmKpEmNu_KLepSS_Line)
-    D0 -> K- K- K+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKmKpMupNu_KLepRS_Line)
-    D0 -> K- K+ K+ mu- nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpKpMumNu_KLepWS_Line)
-    D0 -> K- K- K+ mu- nu / D0 -> K- K+ K+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKmKpMumNu_KLepSS_Line)
-
-    D0 -> pi- pi- pi+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToPimPimPipEpNu_PiLepRS_Line)
-    D0 -> pi- pi+ pi+ e- nu (Hlt2Charm_DstpToD0Pip_D0ToPimPiPimEmNu_PiLepWS_Line)
-    D0 -> pi- pi- pi+ e- nu / D0 -> pi- pi+ pi+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToPimPimPipEmNu_PiLepSS_Line)
-    D0 -> pi- pi- pi+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToPimPimPipMupNu_PiLepRS_Line)
-    D0 -> pi- pi+ pi+ mu- nu (Hlt2Charm_DstpToD0Pip_D0ToPimPipPiPMumNu_PiLepWS_Line), background
-    D0 -> pi- pi- pi+ mu- nu / D0 -> pi- pi+ pi+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToPimPimPipMumNu_PiLepSS_Line)
+    D0 -> K- Pi- Pi+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmPimPipEpNu)
+    D0 -> K- Pi+ Pi+ e- nu (Hlt2Charm_DstpToD0Pip_D0ToKmPipPipEmNu_KLepSS)
+    D0 -> K- Pi- Pi+ e- nu / D0 -> K- Pi+ Pi+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmPimPipEmNu_SS)
+    D0 -> K- Pi- Pi+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmPimPipMupNu)
+    D0 -> K- Pi+ Pi+ mu- nu (Hlt2Charm_DstpToD0Pip_D0ToKmPipPipMumNu_KLepSS)
+    D0 -> K- Pi- Pi+ mu- nu / D0 -> K- Pi+ Pi+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmPimPipMumNu_SS)
+
+    D0 -> K- K+ Pi- e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpPimEpNu)
+    D0 -> K- K+ Pi+ e- nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpPipEmNu_KLepSS)
+    D0 -> K- K+ Pi- e- nu / D0 -> K- K+ Pi+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpPimEmNu_SS)
+    D0 -> K- K+ Pi- mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpPimMupNu)
+    D0 -> K- K+ Pi+ mu- nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpPipMumNu_KLepSS)
+    D0 -> K- K+ Pi- mu- nu / D0 -> K- Pi+ Pi+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpPimMumNu_SS)
+
+    D0 -> K- K- K+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKmKpEpNu_KLepRS)
+    D0 -> K- K+ K+ e- nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpKpEmNu_KLepWS)
+    D0 -> K- K- K+ e- nu / D0 -> K- K+ K+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKmKpEmNu_KLepSS)
+    D0 -> K- K- K+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKmKpMupNu_KLepRS)
+    D0 -> K- K+ K+ mu- nu (Hlt2Charm_DstpToD0Pip_D0ToKmKpKpMumNu_KLepWS)
+    D0 -> K- K- K+ mu- nu / D0 -> K- K+ K+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToKmKmKpMumNu_KLepSS)
+
+    D0 -> pi- pi- pi+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToPimPimPipEpNu_PiLepRS)
+    D0 -> pi- pi+ pi+ e- nu (Hlt2Charm_DstpToD0Pip_D0ToPimPiPimEmNu_PiLepWS)
+    D0 -> pi- pi- pi+ e- nu / D0 -> pi- pi+ pi+ e+ nu (Hlt2Charm_DstpToD0Pip_D0ToPimPimPipEmNu_PiLepSS)
+    D0 -> pi- pi- pi+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToPimPimPipMupNu_PiLepRS)
+    D0 -> pi- pi+ pi+ mu- nu (Hlt2Charm_DstpToD0Pip_D0ToPimPipPiPMumNu_PiLepWS), background
+    D0 -> pi- pi- pi+ mu- nu / D0 -> pi- pi+ pi+ mu+ nu (Hlt2Charm_DstpToD0Pip_D0ToPimPimPipMumNu_PiLepSS)
 
 TODO: Incorporation of Partial Reco BDT from Run2
 """
@@ -1102,7 +1102,7 @@ def _build_my_dstar(dzs, decay):
 
 
 @register_line_builder(all_lines)
-def dst_to_d0pi_d02kenu_os(name="Hlt2Charm_DstpToD0Pip_D0ToKmEpNu_OS_Line"):
+def dst_to_d0pi_d02kenu_os(name="Hlt2Charm_DstpToD0Pip_D0ToKmEpNu_OS"):
     """Opposite-sign D -> K e nu."""
     dz = _make_d0_part_reco_ke_os()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1110,7 +1110,7 @@ def dst_to_d0pi_d02kenu_os(name="Hlt2Charm_DstpToD0Pip_D0ToKmEpNu_OS_Line"):
 
 
 @register_line_builder(all_lines)
-def dst_to_d0pi_d02kenu_ss(name="Hlt2Charm_DstpToD0Pip_D0ToKmEmNu_SS_Line"):
+def dst_to_d0pi_d02kenu_ss(name="Hlt2Charm_DstpToD0Pip_D0ToKmEmNu_SS"):
     """Same-sign D -> K e background."""
     dz = _make_d0_part_reco_ke_ss()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1118,7 +1118,7 @@ def dst_to_d0pi_d02kenu_ss(name="Hlt2Charm_DstpToD0Pip_D0ToKmEmNu_SS_Line"):
 
 
 @register_line_builder(all_lines)
-def dst_to_d0pi_d02kenu_ws(name="Hlt2Charm_DstpToD0Pip_D0ToKpEmNu_WS_Line"):
+def dst_to_d0pi_d02kenu_ws(name="Hlt2Charm_DstpToD0Pip_D0ToKpEmNu_WS"):
     """Wrong-sign D -> K e background."""
     dz = _make_d0_part_reco_ke_os()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)- -> D0 pi-]cc")
@@ -1126,7 +1126,7 @@ def dst_to_d0pi_d02kenu_ws(name="Hlt2Charm_DstpToD0Pip_D0ToKpEmNu_WS_Line"):
 
 
 @register_line_builder(all_lines)
-def dst_to_d0pi_d02kmunu_os(name="Hlt2Charm_DstpToD0Pip_D0ToKmMupNu_OS_Line"):
+def dst_to_d0pi_d02kmunu_os(name="Hlt2Charm_DstpToD0Pip_D0ToKmMupNu_OS"):
     """Opposite-sign D -> K mu nu."""
     dz = _make_d0_part_reco_kmu_os()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1134,7 +1134,7 @@ def dst_to_d0pi_d02kmunu_os(name="Hlt2Charm_DstpToD0Pip_D0ToKmMupNu_OS_Line"):
 
 
 @register_line_builder(all_lines)
-def dst_to_d0pi_d02kmunu_ss(name="Hlt2Charm_DstpToD0Pip_D0ToKmMumNu_SS_Line"):
+def dst_to_d0pi_d02kmunu_ss(name="Hlt2Charm_DstpToD0Pip_D0ToKmMumNu_SS"):
     """Same-sign D -> K mu background."""
     dz = _make_d0_part_reco_kmu_ss()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1142,7 +1142,7 @@ def dst_to_d0pi_d02kmunu_ss(name="Hlt2Charm_DstpToD0Pip_D0ToKmMumNu_SS_Line"):
 
 
 @register_line_builder(all_lines)
-def dst_to_d0pi_d02kmunu_ws(name="Hlt2Charm_DstpToD0Pip_D0ToKpMumNu_WS_Line"):
+def dst_to_d0pi_d02kmunu_ws(name="Hlt2Charm_DstpToD0Pip_D0ToKpMumNu_WS"):
     """Wrong-sign D -> K mu background."""
     dz = _make_d0_part_reco_kmu_os()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)- -> D0 pi-]cc")
@@ -1155,7 +1155,7 @@ def dst_to_d0pi_d02kmunu_ws(name="Hlt2Charm_DstpToD0Pip_D0ToKpMumNu_WS_Line"):
 
 
 @register_line_builder(all_lines)
-def dst_to_d0pi_d02pienu_os(name="Hlt2Charm_DstpToD0Pip_D0ToPimEpNu_OS_Line"):
+def dst_to_d0pi_d02pienu_os(name="Hlt2Charm_DstpToD0Pip_D0ToPimEpNu_OS"):
     """Opposite-sign D -> pi e nu."""
     dz = _make_d0_part_reco_pie_os()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1163,7 +1163,7 @@ def dst_to_d0pi_d02pienu_os(name="Hlt2Charm_DstpToD0Pip_D0ToPimEpNu_OS_Line"):
 
 
 @register_line_builder(all_lines)
-def dst_to_d0pi_d02pienu_ss(name="Hlt2Charm_DstpToD0Pip_D0ToPimEmNu_SS_Line"):
+def dst_to_d0pi_d02pienu_ss(name="Hlt2Charm_DstpToD0Pip_D0ToPimEmNu_SS"):
     """Same-sign D -> pi e background."""
     dz = _make_d0_part_reco_pie_ss()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1172,7 +1172,7 @@ def dst_to_d0pi_d02pienu_ss(name="Hlt2Charm_DstpToD0Pip_D0ToPimEmNu_SS_Line"):
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02pimunu_os(
-        name="Hlt2Charm_DstpToD0Pip_D0ToPimMupNu_OS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToPimMupNu_OS"):
     """Opposite-sign D -> pi mu nu."""
     dz = _make_d0_part_reco_pimu_os()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1181,7 +1181,7 @@ def dst_to_d0pi_d02pimunu_os(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02pimunu_ss(
-        name="Hlt2Charm_DstpToD0Pip_D0ToPimMumNu_SS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToPimMumNu_SS"):
     """Same-sign D -> pi mu background."""
     dz = _make_d0_part_reco_pimu_ss()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1195,7 +1195,7 @@ def dst_to_d0pi_d02pimunu_ss(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kpipienu_os(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmPimPipEpNu_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmPimPipEpNu"):
     """D0 -> K- Pi+ Pi- e+ nu."""
     dz = _make_d0_part_reco_kpipie_os()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1204,7 +1204,7 @@ def dst_to_d0pi_d02kpipienu_os(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kpipienu_klep_ss(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmPipPipEmNu_KLepSS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmPipPipEmNu_KLepSS"):
     """D0 -> K- Pi+ Pi+ e- nu SS channel."""
     dz = _make_d0_part_reco_kpipie_KLepSS()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1213,7 +1213,7 @@ def dst_to_d0pi_d02kpipienu_klep_ss(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kpipienu_ss(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmPimPipEmNu_SS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmPimPipEmNu_SS"):
     """D0 -> K- Pi+ Pi- e- nu / D0 -> K- Pi+ Pi+ e+ nu SS channel."""
     dz1 = _make_d0_part_reco_kpipie_SS1()
     dz2 = _make_d0_part_reco_kpipie_SS2()
@@ -1224,7 +1224,7 @@ def dst_to_d0pi_d02kpipienu_ss(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kpipimunu_os(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmPimPipMupNu_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmPimPipMupNu"):
     """D0 -> K- Pi+ Pi- Mu+ nu."""
     dz = _make_d0_part_reco_kpipimu_os()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1233,7 +1233,7 @@ def dst_to_d0pi_d02kpipimunu_os(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kpipimunu_klep_ss(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmPipPipMumNu_KLepSS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmPipPipMumNu_KLepSS"):
     """D0 -> K- Pi+ Pi+ mu- nu SS channel."""
     dz = _make_d0_part_reco_kpipimu_KLepSS()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1242,7 +1242,7 @@ def dst_to_d0pi_d02kpipimunu_klep_ss(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kpipimunu_ss(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmPimPipMumNu_SS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmPimPipMumNu_SS"):
     """D0 -> K- Pi+ Pi- mu- nu / D0 -> K- Pi+ Pi+ mu+ nu SS channel."""
     dz1 = _make_d0_part_reco_kpipimu_SS1()
     dz2 = _make_d0_part_reco_kpipimu_SS2()
@@ -1258,7 +1258,7 @@ def dst_to_d0pi_d02kpipimunu_ss(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kkpienu_os(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpPimEpNu_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpPimEpNu"):
     """D0 -> K- K+ Pi- e+ nu."""
     dz = _make_d0_part_reco_kkpie_os()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1267,7 +1267,7 @@ def dst_to_d0pi_d02kkpienu_os(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kkpienu_klep_ss(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpPipEmNu_KLepSS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpPipEmNu_KLepSS"):
     """D0 -> K- K+ Pi+ e- nu SS channel."""
     dz = _make_d0_part_reco_kkpie_KLepSS()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1276,7 +1276,7 @@ def dst_to_d0pi_d02kkpienu_klep_ss(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kkpienu_ss(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpPimEmNu_SS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpPimEmNu_SS"):
     """D0 -> K- K+ Pi- mu- nu / D0 -> K- K+ Pi+ mu+ nu SS channel."""
     dz1 = _make_d0_part_reco_kkpie_SS1()
     dz2 = _make_d0_part_reco_kkpie_SS2()
@@ -1287,7 +1287,7 @@ def dst_to_d0pi_d02kkpienu_ss(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kkpimunu_os(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpPimMupNu_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpPimMupNu"):
     """D0 -> K- K+ Pi- e+ nu."""
     dz = _make_d0_part_reco_kkpimu_os()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1296,7 +1296,7 @@ def dst_to_d0pi_d02kkpimunu_os(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kkpimunu_klep_ss(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpPipMumNu_KLepSS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpPipMumNu_KLepSS"):
     """D0 -> K- K+ Pi+ mu- nu SS channel."""
     dz = _make_d0_part_reco_kkpimu_KLepSS()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1305,7 +1305,7 @@ def dst_to_d0pi_d02kkpimunu_klep_ss(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kkpimunu_ss(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpPimMumNu_SS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpPimMumNu_SS"):
     """D0 -> K- K+ Pi- mu- nu / D0 -> K- K+ Pi+ mu+ nu SS channel."""
     dz1 = _make_d0_part_reco_kkpimu_SS1()
     dz2 = _make_d0_part_reco_kkpimu_SS2()
@@ -1321,7 +1321,7 @@ def dst_to_d0pi_d02kkpimunu_ss(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kkkenu_rs(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmKmKpEpNu_KLepRS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmKmKpEpNu_KLepRS"):
     """D0 -> K- K+ K- e+ nu."""
     dz = _make_d0_part_reco_kkke_neutral()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1330,7 +1330,7 @@ def dst_to_d0pi_d02kkkenu_rs(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kkkenu_ws(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpKpEmNu_KLepWS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpKpEmNu_KLepWS"):
     """D0 -> K- K+ K+ e- nu."""
     dz = _make_d0_part_reco_kkke_neutral()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)- -> D0 pi-]cc")
@@ -1339,7 +1339,7 @@ def dst_to_d0pi_d02kkkenu_ws(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kkkenu_klep_ss(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmKmKpEmNu_KLepSS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmKmKpEmNu_KLepSS"):
     """D0 -> K- K+ K+/- e+/- nu SS channel
     allows explicit reconstruction of
     D*+ -> D0 Pi with
@@ -1361,7 +1361,7 @@ def dst_to_d0pi_d02kkkenu_klep_ss(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kkkmunu_rs(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmKmKpMupNu_KLepRS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmKmKpMupNu_KLepRS"):
     """D0 -> K- K+ K- mu+ nu."""
     dz = _make_d0_part_reco_kkkmu_neutral()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1370,7 +1370,7 @@ def dst_to_d0pi_d02kkkmunu_rs(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kkkmunu_ws(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpKpMumNu_KLepWS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmKpKpMumNu_KLepWS"):
     """D0 -> K- K+ K+ mu- nu."""
     dz = _make_d0_part_reco_kkkmu_neutral()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)- -> D0 pi-]cc")
@@ -1379,7 +1379,7 @@ def dst_to_d0pi_d02kkkmunu_ws(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d02kkkmunu_klep_ss(
-        name="Hlt2Charm_DstpToD0Pip_D0ToKmKmKpMumNu_KLepSS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToKmKmKpMumNu_KLepSS"):
     """D0 -> K- K+ K+/- mu+/- nu SS channel."""
     dz = _make_d0_part_reco_kkkmu_charged()
     # Merger takes into account possible background, which is just oppositely tagged signal
@@ -1396,7 +1396,7 @@ def dst_to_d0pi_d02kkkmunu_klep_ss(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d023pienu_rs(
-        name="Hlt2Charm_DstpToD0Pip_D0ToPimPimPipEpNu_PiLepRS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToPimPimPipEpNu_PiLepRS"):
     """D0 -> Pi- Pi+ Pi- e+ nu, i.e. the only physical charge combo."""
     dz = _make_d0_part_reco_3pie_neutral()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1405,7 +1405,7 @@ def dst_to_d0pi_d023pienu_rs(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d023pienu_ws(
-        name="Hlt2Charm_DstpToD0Pip_D0ToPimPiPimEmNu_PiLepWS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToPimPiPimEmNu_PiLepWS"):
     """D0 -> Pi- Pi+ Pi- e+ nu, i.e. the only physical charge combo."""
     dz = _make_d0_part_reco_3pie_neutral()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)- -> D0 pi-]cc")
@@ -1414,7 +1414,7 @@ def dst_to_d0pi_d023pienu_ws(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d023pienu_klep_ss(
-        name="Hlt2Charm_DstpToD0Pip_D0ToPimPimPipEmNu_PiLepSS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToPimPimPipEmNu_PiLepSS"):
     """D0 -> Pi- Pi+ Pi+ e+ nu SS channel."""
     dz = _make_d0_part_reco_3pie_charged()
     # Merger takes into account possible background, which is just oppositely tagged signal
@@ -1426,7 +1426,7 @@ def dst_to_d0pi_d023pienu_klep_ss(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d023pimunu_rs(
-        name="Hlt2Charm_DstpToD0Pip_D0ToPimPimPipMupNu_PiLepRS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToPimPimPipMupNu_PiLepRS"):
     """D0 -> pi- pi+ pi- mu+ nu."""
     dz = _make_d0_part_reco_3pimu_neutral()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)+ -> D0 pi+]cc")
@@ -1435,7 +1435,7 @@ def dst_to_d0pi_d023pimunu_rs(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d023pimunu_klep_ws(
-        name="Hlt2Charm_DstpToD0Pip_D0ToPimPipPiPMumNu_PiLepWS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToPimPipPiPMumNu_PiLepWS"):
     """D0 -> K- K+ K+ mu- nu SS channel."""
     dz = _make_d0_part_reco_3pimu_neutral()
     dst_to_d0pi = _build_my_dstar(dz, "[D*(2010)- -> D0 pi-]cc")
@@ -1444,7 +1444,7 @@ def dst_to_d0pi_d023pimunu_klep_ws(
 
 @register_line_builder(all_lines)
 def dst_to_d0pi_d023pimunu_klep_ss(
-        name="Hlt2Charm_DstpToD0Pip_D0ToPimPimPipMumNu_PiLepSS_Line"):
+        name="Hlt2Charm_DstpToD0Pip_D0ToPimPimPipMumNu_PiLepSS"):
     """D0 -> K- K+ K+ mu- nu SS channel."""
     dz = _make_d0_part_reco_3pimu_charged()
     # Merger takes into account possible background, which is just oppositely tagged signal