Skip to content
Snippets Groups Projects
Commit 8d769898 authored by Walter Lampl's avatar Walter Lampl
Browse files

AtlasSemantics.py: Invert the merging direction

parent 487b5a39
No related branches found
No related tags found
9 merge requests!69091Fix correlated smearing bug in JER in JetUncertainties in 22.0,!58791DataQualityConfigurations: Modify L1Calo config for web display,!51674Fixing hotSpotInHIST for Run3 HIST,!50012RecExConfig: Adjust log message levels from GetRunNumber and GetLBNumber,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!46538Draft: Added missing xAOD::TrigConfKeys from DESDM_MCP,!46514TGC Digitization: Implementation of signal propagation time between the sensor edge and ASD,!46444AtlasSemantics.py: Invert the merging direction
......@@ -27,7 +27,7 @@ class AppendListSemantics(GaudiConfig2.semantics.SequenceSemantics):
def __init__(self, cpp_type, name=None):
super(AppendListSemantics, self).__init__(cpp_type, name)
def merge(self,a,b):
def merge(self,b,a):
a.extend(b)
return a
......@@ -67,7 +67,7 @@ class VarHandleArraySematics(GaudiConfig2.semantics.PropertySemantics):
super(VarHandleArraySematics,self).__init__(cpp_type, name)
pass
def merge(self,aa,bb):
def merge(self,bb,aa):
for b in bb:
if b not in aa:
aa.append(b)
......@@ -84,7 +84,7 @@ class ToolHandleSemantics(GaudiConfig2.semantics.PropertySemantics):
super(ToolHandleSemantics, self).__init__(cpp_type,name)
def merge(self,a,b):
def merge(self,b,a):
#Deal with 'None'
if a is None or a=='': return b
if b is None or b=='': return a
......@@ -159,7 +159,7 @@ class PublicHandleArraySemantics(GaudiConfig2.semantics.PropertySemantics):
return copy.copy(value)
def merge(self,aa,bb):
def merge(self,bb,aa):
for b in bb:
if b not in aa:
aa.append(b)
......@@ -185,7 +185,7 @@ class ToolHandleArraySemantics(GaudiConfig2.semantics.PropertySemantics):
value=PrivateToolHandleArray(value)
return value
def merge(self,a,b):
def merge(self,b,a):
for bTool in b:
try:
#If a tool with that name exists in a, we'll merge it
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment