BandQ: spruce lines with neutrals

Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/builders/Bc_lines.py

@@ -216,7 +216,11 @@ def make_BcToDs1Gamma(name='bandq_BcToDs1Gamma_{hash}'):
     line_alg = b_hadrons.make_withneutrals_bc(
         name=name,
         particles=[Ds1, gamma],
-        descriptor="[B_c+ -> D_s1(2536)+ gamma]cc")
+        descriptor="[B_c+ -> D_s1(2536)+ gamma]cc",
+        am_min=5500 * MeV,
+        am_max=6750 * MeV,
+        m_min=5550 * MeV,
+        m_max=6700 * MeV)
     return line_alg
 
 
@@ -227,5 +231,9 @@ def make_BcToDs1GammaWS(name='bandq_BcToDs1GammaWS_{hash}'):
     line_alg = b_hadrons.make_withneutrals_bc(
         name=name,
         particles=[Ds1, gamma],
-        descriptor="[B_c+ -> D_s1(2536)+ gamma]cc")
+        descriptor="[B_c+ -> D_s1(2536)+ gamma]cc",
+        am_min=5500 * MeV,
+        am_max=6750 * MeV,
+        m_min=5550 * MeV,
+        m_max=6700 * MeV)
     return line_alg

Hlt/Hlt2Conf/python/Hlt2Conf/lines/bandq/spruce_bandq.py

@@ -14,13 +14,14 @@ Booking of B&Q sprucing lines, notice PROCESS = 'spruce'
 Output:
 updated dictionary of sprucing_lines
 
-Comment out lines related to neutral particles and downstream tracks for now
 """
 from Moore.config import SpruceLine, register_line_builder
 
 from PyConf import configurable
 from Hlt2Conf.lines.bandq.builders import b_to_jpsiX_lines, b_to_etacX_lines, xibc_lines, Bc_lines, qqbar_to_hadrons, dimuon_sprucing_lines
 from Hlt2Conf.lines.bandq.builders.prefilters import make_prefilters
+from Hlt2Conf.lines.bandq.builders.helper import psis_list
+from Hlt2Conf.lines.bandq.builders import bx
 
 PROCESS = 'spruce'
 sprucing_lines = {}
@@ -606,54 +607,58 @@ def BuToKpKmPip_sprucing_line(name='SpruceBandQ_BuToKpKmPip', prescale=1):
 #comment out lines related to neutral particles and downstream tracks for now
 ######################################################
 
-#@register_line_builder(sprucing_lines)
-#@configurable
-#def XibToJpsiXi_sprucing_line(name='SpruceBandQ_XibToJpsiXi', prescale=1):
-#    """Xi_b- -> Xi- J/psi(1S)"""
-#    line_alg = b_to_jpsiX_lines.make_XibToJpsiXi_JpsiToMuMu()
-#    return SpruceLine(
-#        name=name, algs=make_prefilters() + [line_alg], prescale=prescale)
-
-#@register_line_builder(sprucing_lines)
-#@configurable
-#def XibToJpsiXiPi_sprucing_line(name='SpruceBandQ_XibToJpsiXiPi',
-#                                prescale=1):
-#    """Xi_b0 -> Xi- J/psi(1S) pi+"""
-#    line_alg = b_to_jpsiX_lines.make_XibToJpsiXiPi_JpsiToMuMu()
-#    return SpruceLine(
-#        name=name, algs=make_prefilters() + [line_alg], prescale=prescale)
-
-#@register_line_builder(sprucing_lines)
-#@configurable
-#def OmegabToJpsiOmega_sprucing_line(name='SpruceBandQ_OmegabToJpsiOmega',
-#                                    prescale=1):
-#    """Omega_b- -> Omega- J/psi(1S)"""
-#    line_alg = b_to_jpsiX_lines.make_OmegabToJpsiOmega_JpsiToMuMu()
-#    return SpruceLine(
-#        name=name, algs=make_prefilters() + [line_alg], prescale=prescale)
-
-#@register_line_builder(sprucing_lines)
-#@configurable
-#def BcToDs1Gamma_sprucing_line(name='SpruceBandQ_BcToDs1Gamma',
-#                               prescale=1):
-#    """B_c+ -> D_s1(2536)+ gamma"""
-#    line_alg = Bc_lines.make_BcToDs1Gamma()
-#    return SpruceLine(
-#        name=name, algs=make_prefilters() + [line_alg], prescale=prescale)
-
-#@register_line_builder(sprucing_lines)
-#@configurable
-#def BcToDs1GammaWS_sprucing_line(name='SpruceBandQ_BcToDs1GammaWS',
-#                                 prescale=0.3):
-#    """B_c+ -> D_s1(2536)+ gamma wrong sign D_s1 decay"""
-#    line_alg = Bc_lines.make_BcToDs1GammaWS()
-#    return SpruceLine(
-#        name=name, algs=make_prefilters() + [line_alg], prescale=prescale)
+
+@register_line_builder(sprucing_lines)
+@configurable
+def XibToJpsiXi_sprucing_line(name='SpruceBandQ_XibToJpsiXi', prescale=1):
+    """Xi_b- -> Xi- J/psi(1S)"""
+    line_alg = b_to_jpsiX_lines.make_XibToJpsiXi_JpsiToMuMu(process=PROCESS)
+    return SpruceLine(
+        name=name, algs=make_prefilters() + [line_alg], prescale=prescale)
+
+
+@register_line_builder(sprucing_lines)
+@configurable
+def XibToJpsiXiPi_sprucing_line(name='SpruceBandQ_XibToJpsiXiPi', prescale=1):
+    """Xi_b0 -> Xi- J/psi(1S) pi+"""
+    line_alg = b_to_jpsiX_lines.make_XibToJpsiXiPi_JpsiToMuMu(process=PROCESS)
+    return SpruceLine(
+        name=name, algs=make_prefilters() + [line_alg], prescale=prescale)
+
+
+@register_line_builder(sprucing_lines)
+@configurable
+def OmegabToJpsiOmega_sprucing_line(name='SpruceBandQ_OmegabToJpsiOmega',
+                                    prescale=1):
+    """Omega_b- -> Omega- J/psi(1S)"""
+    line_alg = b_to_jpsiX_lines.make_OmegabToJpsiOmega_JpsiToMuMu(
+        process=PROCESS)
+    return SpruceLine(
+        name=name, algs=make_prefilters() + [line_alg], prescale=prescale)
+
+
+@register_line_builder(sprucing_lines)
+@configurable
+def BcToDs1Gamma_sprucing_line(name='SpruceBandQ_BcToDs1Gamma', prescale=1):
+    """B_c+ -> D_s1(2536)+ gamma"""
+    line_alg = Bc_lines.make_BcToDs1Gamma()
+    return SpruceLine(
+        name=name, algs=make_prefilters() + [line_alg], prescale=prescale)
+
+
+@register_line_builder(sprucing_lines)
+@configurable
+def BcToDs1GammaWS_sprucing_line(name='SpruceBandQ_BcToDs1GammaWS',
+                                 prescale=0.3):
+    """B_c+ -> D_s1(2536)+ gamma wrong sign D_s1 decay"""
+    line_alg = Bc_lines.make_BcToDs1GammaWS()
+    return SpruceLine(
+        name=name, algs=make_prefilters() + [line_alg], prescale=prescale)
+
 
 ####################################################
 ## automatic creation of Hb -> psi + hadrons lines
 ###################################################
-from Hlt2Conf.lines.bandq.builders.helper import psis_list
 
 
 def make_spruce_lines(make_fun,
@@ -917,7 +922,6 @@ make_spruce_lines(
 ####################################################
 ## automatic creation of prompt X->B+hadrons lines
 ###################################################
-from Hlt2Conf.lines.bandq.builders import bx
 
 BX_mother_id = "Upsilon(4S)"