Merge branch 'erodrigu-api' into 'master'

Adapt PyConf API to snake_case convention

See merge request !507

Phys/DaVinci/python/DaVinci/config.py

@@ -50,8 +50,8 @@ class DVSelection(namedtuple('DVSelection',
         node = CompositeNode(
             name,
             tuple(algs),
-            combineLogic=NodeLogic.LAZY_AND,
-            forceOrder=True)
+            combine_logic=NodeLogic.LAZY_AND,
+            force_order=True)
         if extra_outputs is None:
             extra_outputs = []
         return super(DVSelection, cls).__new__(cls, node,
@@ -85,24 +85,24 @@ class DVSelection(namedtuple('DVSelection',
         return self.output_producer is not None
 
 
-def dv_node(name, algs, logic=NodeLogic.NONLAZY_OR, forceOrder=False):
+def dv_node(name, algs, logic=NodeLogic.NONLAZY_OR, force_order=False):
     return CompositeNode(
-        name, combineLogic=logic, children=algs, forceOrder=forceOrder)
+        name, combine_logic=logic, children=algs, force_order=force_order)
 
 
 def davinci_control_flow(options, dvsels=[]):
     options.finalize()
     dec = CompositeNode(
         'dv_decision',
-        combineLogic=NodeLogic.NONLAZY_OR,
+        combine_logic=NodeLogic.NONLAZY_OR,
         children=[dvsel.node for dvsel in dvsels],
-        forceOrder=False)
+        force_order=False)
 
     return CompositeNode(
         'davinci',
-        combineLogic=NodeLogic.NONLAZY_OR,
+        combine_logic=NodeLogic.NONLAZY_OR,
         children=[dec],
-        forceOrder=True)
+        force_order=True)
 
 
 def run_davinci(options, dvsels=[], public_tools=[]):

Phys/DaVinci/tests/dummy_no_davinci.py

@@ -18,7 +18,7 @@ from PyConf.control_flow import CompositeNode
 
 from DaVinci.config import options
 
-dummy = CompositeNode("Dummy", children=[], forceOrder=True)
+dummy = CompositeNode("Dummy", children=[], force_order=True)
 
 # Basic input-like metadata required even though there is no input data
 options.input_type = "ROOT"