Merge branch 'remove_event_field' into 'master'

Remove special field EVENT, add parameter event_variables to FunTuple

See merge request lhcb/DaVinci!669

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_collections.py

@@ -72,8 +72,6 @@ variables = {
     "D0": field_vars,
     "Kminus": field_vars,
     "piplus": field_vars,
-    #special field name "EVENT" (like "ALL")
-    "EVENT": evt_vars,
 }
 
 my_tuple = Funtuple(
@@ -81,6 +79,7 @@ my_tuple = Funtuple(
     tuple_name="DecayTree",
     fields=fields,
     variables=variables,
+    event_variables=evt_vars,
     inputs=d02kpi_data)
 
 

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_hlt2.py

@@ -119,16 +119,13 @@ def main():
     #see linked issue here: https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/654#note_5320732
     evt_variables.pop('Sel')
 
-    #Add them to a special branch called "EVENT"
-    # (currently two special branches exist: "EVENT" and "ALL")
-    variables["EVENT"] = evt_variables
-
     #define FunTuple instance
     my_tuple = Funtuple(
         name="Tuple",
         tuple_name="DecayTree",
         fields=fields,
         variables=variables,
+        event_variables=evt_variables,
         inputs=d02kpi_data)
 
     return {"UserAlgs": [my_filter, my_tuple]}, []