Commit 4e1d310f authored by Eduardo Rodrigues's avatar Eduardo Rodrigues
Browse files

Adapt CombineNode arguments to snake_case convention

parent afba5eb7
Pipeline #2357511 passed with stage
in 29 seconds
############################################################################### ###############################################################################
# (c) Copyright 2019-2020 CERN for the benefit of the LHCb Collaboration # # (c) Copyright 2019-2021 CERN for the benefit of the LHCb Collaboration #
# # # #
# This software is distributed under the terms of the GNU General Public # # This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". # # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
...@@ -60,8 +60,8 @@ def run_allen_in_moore_with_tuples(options, ...@@ -60,8 +60,8 @@ def run_allen_in_moore_with_tuples(options,
allen_node = CompositeNode( allen_node = CompositeNode(
name='Allen_running', name='Allen_running',
children=[make_allen_dec_reports()], children=[make_allen_dec_reports()],
combineLogic=NodeLogic.NONLAZY_OR, combine_logic=NodeLogic.NONLAZY_OR,
forceOrder=False) force_order=False)
top_cf_node = add_efficiency_tuples_allen( top_cf_node = add_efficiency_tuples_allen(
allen_node, descriptor_template=descriptor_template) allen_node, descriptor_template=descriptor_template)
config.update(configure(options, top_cf_node, public_tools=public_tools)) config.update(configure(options, top_cf_node, public_tools=public_tools))
...@@ -132,9 +132,9 @@ def add_efficiency_tuples_allen(allen_node, descriptor_template=None): ...@@ -132,9 +132,9 @@ def add_efficiency_tuples_allen(allen_node, descriptor_template=None):
return CompositeNode( return CompositeNode(
'with_efficiency_tuples', 'with_efficiency_tuples',
combineLogic=NodeLogic.NONLAZY_AND, combine_logic=NodeLogic.NONLAZY_AND,
children=[allen_node] + nodes, children=[allen_node] + nodes,
forceOrder=True) force_order=True)
def run_moore_with_tuples(options, descriptor_template=None, public_tools=[]): def run_moore_with_tuples(options, descriptor_template=None, public_tools=[]):
...@@ -170,7 +170,7 @@ def add_efficiency_tuples(moore_cf, descriptor_template=None): ...@@ -170,7 +170,7 @@ def add_efficiency_tuples(moore_cf, descriptor_template=None):
# Make sure that Hlt__RoutingBitsWriter is called for every event # Make sure that Hlt__RoutingBitsWriter is called for every event
# TODO add a "flagging mode" option to be used in moore_control_flow # TODO add a "flagging mode" option to be used in moore_control_flow
moore_cf.combineLogic = NodeLogic.NONLAZY_AND moore_cf.combine_logic = NodeLogic.NONLAZY_AND
# Get the creator of HltDecReports # Get the creator of HltDecReports
# TODO find a less fragile way to obtain that # TODO find a less fragile way to obtain that
...@@ -235,9 +235,9 @@ def add_efficiency_tuples(moore_cf, descriptor_template=None): ...@@ -235,9 +235,9 @@ def add_efficiency_tuples(moore_cf, descriptor_template=None):
return CompositeNode( return CompositeNode(
'with_efficiency_tuples', 'with_efficiency_tuples',
combineLogic=NodeLogic.NONLAZY_AND, combine_logic=NodeLogic.NONLAZY_AND,
children=[moore_cf] + nodes, children=[moore_cf] + nodes,
forceOrder=True) force_order=True)
def parse_descriptor_template(template): def parse_descriptor_template(template):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment