Update option file for lhcb integration tests

Update option files for testing the turbo/spruce steps in the LHCbIntegration Moore-DaVinci chain. To be merged with LHCbIntegrationTests!28 (merged).

DaVinciTests/python/DaVinciTests/option_davinci_for_spruce.py

@@ -11,6 +11,7 @@
 """
 Read the output of an Sprucing job with the new DaVinci configuration.
 """
+import Functors as F
 from FunTuple import FunctorCollection
 from FunTuple import FunTuple_Particles as Funtuple
 import FunTuple.functorcollections as FC
@@ -20,10 +21,8 @@ from PyConf.reading import get_particles
 
 
 def main(options: Options):
-    line_B0DsK = 'SpruceB2OC_BdToDsmK_DsmToHHH_FEST'
-    line_B0Dspi = 'SpruceB2OC_BdToDsmPi_DsmToKpKmPim'
-    bd2dsk_line = get_particles(f"/Event/Spruce/{line_B0DsK}/Particles")
-    bd2dspi_line = get_particles(f"/Event/Spruce/{line_B0Dspi}/Particles")
+    line_bd2dsk = 'SpruceB2OC_BdToDsmK_DsmToHHH_FEST'
+    data_bd2dsk = get_particles(f"/Event/Spruce/{line_bd2dsk}/Particles")
 
     fields_dsk = {
         'B0': "[B0 -> D_s- K+]CC",
@@ -31,16 +30,9 @@ def main(options: Options):
         'Kp': "[B0 -> D_s- ^K+]CC"
     }
 
-    fields_dspi = {
-        'B0': "[B0 -> D_s- pi+]CC",
-        'Ds': "[B0 -> ^D_s- pi+]CC",
-        'pip': "[B0 -> D_s- ^pi+]CC",
-    }
-
     variables = FunctorCollection({
-        'LOKI_MAXPT': 'TRACK_MAX_PT',
-        'LOKI_Muonp_PT': 'CHILD(PT, 1)',
-        'LOKI_Muonm_PT': 'CHILD(PT, 2)',
+        'LOKI_daug1_PT': F.CHILD(1, F.PT),
+        'LOKI_daug2_PT': F.CHILD(2, F.PT),
     })
 
     variables_extra = FunctorCollection({
@@ -60,39 +52,17 @@ def main(options: Options):
         'Kp': variables_extra
     }
 
-    variables_dspi = {
-        'ALL': variables_all,  #adds variables to all fields
-        'B0': variables,
-        'Ds': variables_extra,
-        'pip': variables_extra,
-    }
-
-    loki_preamble = ['TRACK_MAX_PT = MAXTREE(ISBASIC & HASTRACK, PT, -1)']
-
-    tuple_B0DsK = Funtuple(
+    tuple_bd2dsk = Funtuple(
         name="B0DsK_Tuple",
         tuple_name="DecayTree",
         fields=fields_dsk,
         variables=variables_dsk,
-        loki_preamble=loki_preamble,
-        inputs=bd2dsk_line)
-
-    tuple_B0Dspi = Funtuple(
-        name="B0Dspi_Tuple",
-        tuple_name="DecayTree",
-        fields=fields_dspi,
-        variables=variables_dspi,
-        loki_preamble=loki_preamble,
-        inputs=bd2dspi_line)
+        inputs=data_bd2dsk)
 
-    filter_B0DsK = add_filter(options, "HDRFilter_B0DsK",
-                              f"HLT_PASS('{line_B0DsK}')")
-    filter_B0Dspi = add_filter(options, "HDRFilter_B0Dspi",
-                               f"HLT_PASS('{line_B0Dspi}')")
+    filter_bd2dsk = add_filter("HDRFilter_B0DsK", f"HLT_PASS('{line_bd2dsk}')")
 
     algs = {
-        "B0DsK": [filter_B0DsK, tuple_B0DsK],
-        "B0Dspi": [filter_B0Dspi, tuple_B0Dspi]
+        "B0DsK": [filter_bd2dsk, tuple_bd2dsk],
     }
 
     return make_config(options, algs)