diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index 114b96ec209c627b52646181c2e4264452e0ffd8..68ca87c691571319e3310da25ba299a684eb161b 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -908,7 +908,7 @@ def __setProperties( destConfigurableInstance, sourceConf2Instance, indent="" ):
continue
propType = sourceConf2Instance._descriptors[pname].cpp_type
if "PrivateToolHandleArray" in propType:
- setattr( destConfigurableInstance, pname, [conf2toConfigurable( tool, __indent( indent ) ) for tool in pvalue] )
+ setattr( destConfigurableInstance, pname, [conf2toConfigurable( tool, indent=__indent( indent ), parent = sourceConf2Instance.getName() ) for tool in pvalue] )
_log.debug( "%sSet the private tools array %s of %s", indent, pname, destConfigurableInstance.name() )
elif "PrivateToolHandle" in propType or "GaudiConfig2.Configurables" in propType or "ServiceHandle" in propType:
_log.debug( "%sSet the property %s that is private tool %s", indent, pname, destConfigurableInstance.name() )
@@ -917,7 +917,7 @@ def __setProperties( destConfigurableInstance, sourceConf2Instance, indent="" ):
except Exception:
pass
if pvalue is not None:
- setattr( destConfigurableInstance, pname, conf2toConfigurable( pvalue, indent=__indent( indent ) ) )
+ setattr( destConfigurableInstance, pname, conf2toConfigurable( pvalue, indent=__indent( indent ), parent = sourceConf2Instance.getName() ) )
else:
setattr( destConfigurableInstance, pname, pvalue )
@@ -930,7 +930,7 @@ def __setProperties( destConfigurableInstance, sourceConf2Instance, indent="" ):
pass
setattr( destConfigurableInstance, pname, pvalue )
-def conf2toConfigurable( comp, indent="", suppressDupes=False ):
+def conf2toConfigurable( comp, indent="", parent="", suppressDupes=False ):
"""
Method converts from Conf2 ( comp argument ) to old Configurable
If the Configurable of the same name exists, the properties merging process is invoked
@@ -952,10 +952,17 @@ def conf2toConfigurable( comp, indent="", suppressDupes=False ):
_log.debug( "%sConverting from GaudiConfig2 object %s type %s", indent, compName(comp), comp.__class__.__name__ )
- def __alreadyConfigured( instanceName ):
+ def __alreadyConfigured( comp, parent ):
from AthenaCommon.Configurable import Configurable
+ instanceName = comp.getName()
if instanceName in Configurable.allConfigurables:
- return Configurable.allConfigurables[instanceName]
+ conf = Configurable.allConfigurables[instanceName]
+ if conf.getParent() == parent:
+ return conf
+ else:
+ if not parent:
+ parent='[not set]'
+ _log.warning( "%sComponent: \"%s\" had parent %s whilst allConfigurables match had parent %s.", indent, instanceName, parent, conf.getParent() )
return None
def __createConf2Object( name ):
@@ -973,7 +980,7 @@ def conf2toConfigurable( comp, indent="", suppressDupes=False ):
_log.debug( "%sDealing with class %s property %s value type %s",
indent, sourceConfigurableInstance.getFullJobOptName(), prop, type(value) )
if "ServiceHandle" in str( type( value ) ):
- instance = __alreadyConfigured(value)
+ instance = __alreadyConfigured(value, sourceConfigurableInstance.getName())
if instance:
setattr( destConf2Instance, prop, __configurableToConf2(instance, __indent(indent)) )
else:
@@ -1126,7 +1133,7 @@ def conf2toConfigurable( comp, indent="", suppressDupes=False ):
updatedPropValue, existingConfigurable.getFullName())
_log.debug( "%s Conf2 Full name: %s ", indent, comp.getFullJobOptName() )
- existingConfigurable = __alreadyConfigured( comp.name )
+ existingConfigurable = __alreadyConfigured( comp, parent )
if existingConfigurable: # if configurable exists we try to merge with it
_log.debug( "%sPre-existing configurable %s was found, checking if has the same properties", indent, comp.getName() )
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredInDetTrackingGeometryBuilder.py b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredInDetTrackingGeometryBuilder.py
index 321634acdf55be851adc8555671b87843c03d6f5..a349ab1b640b6ba44dc160b3b27ec0a7c7153c71 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredInDetTrackingGeometryBuilder.py
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredInDetTrackingGeometryBuilder.py
@@ -50,7 +50,7 @@ class ConfiguredInDetTrackingGeometryBuilder( InDet__RobustTrackingGeometryBuild
PixelLayerBuilder.Identification = 'Pixel'
PixelLayerBuilder.SiDetManagerLocation = 'Pixel'
# additionall layers - handle with care !
- PixelLayerBuilder.BarrelAdditionalLayerRadii = [ 130 ] # The PST
+ PixelLayerBuilder.BarrelAdditionalLayerRadii = [ 130. ] # The PST
PixelLayerBuilder.BarrelAdditionalLayerType = [ 0 ] # -- will shift volume boundary to PST
PixelLayerBuilder.EndcapAdditionalLayerPositionsZ = [ -1900. , 1900. ] # DBM
PixelLayerBuilder.EndcapAdditionalLayerType = [ 1 , 1 ] # DBM
@@ -81,7 +81,7 @@ class ConfiguredInDetTrackingGeometryBuilder( InDet__RobustTrackingGeometryBuild
SCT_LayerBuilder.Identification = 'SCT'
SCT_LayerBuilder.SiDetManagerLocation = 'SCT'
# additionall layers - handle with care !
- SCT_LayerBuilder.EndcapAdditionalLayerPositionsZ = [ -2850 , 2850 ]
+ SCT_LayerBuilder.EndcapAdditionalLayerPositionsZ = [ -2850. , 2850. ]
SCT_LayerBuilder.EndcapAdditionalLayerType = [ 0 , 0 ]
# SCT barrel specifications
SCT_LayerBuilder.BarrelLayerBinsZ = TrkDetFlags.SCT_BarrelLayerMaterialBinsZ()
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredInDetTrackingGeometryBuilderCond.py b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredInDetTrackingGeometryBuilderCond.py
index 735ae4b690de2924a0f6ff0714da7316ad638867..95ffcfd7185646952f6744ca6c00f7fe3451e8bc 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredInDetTrackingGeometryBuilderCond.py
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredInDetTrackingGeometryBuilderCond.py
@@ -53,7 +53,7 @@ class ConfiguredInDetTrackingGeometryBuilderCond( InDet__RobustTrackingGeometryB
PixelLayerBuilder.Identification = 'Pixel'
PixelLayerBuilder.SiDetManagerLocation = 'Pixel'
# additionall layers - handle with care !
- PixelLayerBuilder.BarrelAdditionalLayerRadii = [ 130 ] # The PST
+ PixelLayerBuilder.BarrelAdditionalLayerRadii = [ 130. ] # The PST
PixelLayerBuilder.BarrelAdditionalLayerType = [ 0 ] # -- will shift volume boundary to PST
PixelLayerBuilder.EndcapAdditionalLayerPositionsZ = [ -1900. , 1900. ] # DBM
PixelLayerBuilder.EndcapAdditionalLayerType = [ 1 , 1 ] # DBM
@@ -84,7 +84,7 @@ class ConfiguredInDetTrackingGeometryBuilderCond( InDet__RobustTrackingGeometryB
SCT_LayerBuilder.Identification = 'SCT'
SCT_LayerBuilder.SiDetManagerLocation = 'SCT'
# additionall layers - handle with care !
- SCT_LayerBuilder.EndcapAdditionalLayerPositionsZ = [ -2850 , 2850 ]
+ SCT_LayerBuilder.EndcapAdditionalLayerPositionsZ = [ -2850. , 2850. ]
SCT_LayerBuilder.EndcapAdditionalLayerType = [ 0 , 0 ]
# SCT barrel specifications
SCT_LayerBuilder.BarrelLayerBinsZ = TrkDetFlags.SCT_BarrelLayerMaterialBinsZ()
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredStagedTrackingGeometryBuilder.py b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredStagedTrackingGeometryBuilder.py
index 2968b85359571d03b6417d96648750360eafb3f0..a174bd22dde6849ee656110adace9e3a5f86479c 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredStagedTrackingGeometryBuilder.py
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredStagedTrackingGeometryBuilder.py
@@ -88,7 +88,7 @@ class ConfiguredStagedTrackingGeometryBuilder( InDet__StagedTrackingGeometryBuil
SCT_LayerBuilder.Identification = 'SCT'
SCT_LayerBuilder.SiDetManagerLocation = 'SCT'
# additionall layers - handle with care !
- SCT_LayerBuilder.EndcapAdditionalLayerPositionsZ = [ -2850 , 2850 ]
+ SCT_LayerBuilder.EndcapAdditionalLayerPositionsZ = [ -2850. , 2850. ]
SCT_LayerBuilder.EndcapAdditionalLayerType = [ 0 , 0 ]
# SCT barrel specifications
SCT_LayerBuilder.BarrelLayerBinsZ = TrkDetFlags.SCT_BarrelLayerMaterialBinsZ()
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredStagedTrackingGeometryBuilderCond.py b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredStagedTrackingGeometryBuilderCond.py
index f429bae76c6f2b2bf8caad8d838a08da583c7253..8a8f0376761daf2deb8494e98fb89268f22343dc 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredStagedTrackingGeometryBuilderCond.py
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/python/ConfiguredStagedTrackingGeometryBuilderCond.py
@@ -89,7 +89,7 @@ class ConfiguredStagedTrackingGeometryBuilderCond( InDet__StagedTrackingGeometry
SCT_LayerBuilder.Identification = 'SCT'
SCT_LayerBuilder.SiDetManagerLocation = 'SCT'
# additionall layers - handle with care !
- SCT_LayerBuilder.EndcapAdditionalLayerPositionsZ = [ -2850 , 2850 ]
+ SCT_LayerBuilder.EndcapAdditionalLayerPositionsZ = [ -2850. , 2850. ]
SCT_LayerBuilder.EndcapAdditionalLayerType = [ 0 , 0 ]
# SCT barrel specifications
SCT_LayerBuilder.BarrelLayerBinsZ = TrkDetFlags.SCT_BarrelLayerMaterialBinsZ()
diff --git a/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py b/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py
index 1db2a0e41af595d6d17d33b6d2121c9c657871ac..ff3ea08121de91c8851ee82f27cbeef6ad424d73 100644
--- a/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py
+++ b/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py
@@ -50,7 +50,7 @@ def _getInDetTrackingGeometryBuilder(name, flags,result, envelopeDefinitionSvc,
PixelLayerBuilder.Identification = 'Pixel'
PixelLayerBuilder.SiDetManagerLocation = 'Pixel'
# additional layers - handle with care !
- PixelLayerBuilder.BarrelAdditionalLayerRadii = [ 130 ] # The PST
+ PixelLayerBuilder.BarrelAdditionalLayerRadii = [ 130. ] # The PST
PixelLayerBuilder.BarrelAdditionalLayerType = [ 0 ] # -- will shift volume boundary to PST
PixelLayerBuilder.EndcapAdditionalLayerPositionsZ = [ -1900. , 1900. ] # DBM
PixelLayerBuilder.EndcapAdditionalLayerType = [ 1 , 1 ] # DBM
@@ -77,7 +77,7 @@ def _getInDetTrackingGeometryBuilder(name, flags,result, envelopeDefinitionSvc,
SCT_LayerBuilder.Identification = 'SCT'
SCT_LayerBuilder.SiDetManagerLocation = 'SCT'
# additionall layers - handle with care !
- SCT_LayerBuilder.EndcapAdditionalLayerPositionsZ = [ -2850 , 2850 ]
+ SCT_LayerBuilder.EndcapAdditionalLayerPositionsZ = [ -2850. , 2850. ]
SCT_LayerBuilder.EndcapAdditionalLayerType = [ 0 , 0 ]
# SCT barrel specifications - use defaults
# SCT endcap specifications - use defaults
diff --git a/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py b/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py
index 66077f23ed22bdf16aaeeb6bd805e853bd7e81ce..c3b07848b35cc64e3dd7a1441cfed62d6a08185d 100644
--- a/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py
+++ b/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py
@@ -53,7 +53,7 @@ def _getInDetTrackingGeometryBuilder(name, flags,result, envelopeDefinitionSvc,
PixelLayerBuilder.Identification = 'Pixel'
PixelLayerBuilder.SiDetManagerLocation = 'Pixel'
# additional layers - handle with care !
- PixelLayerBuilder.BarrelAdditionalLayerRadii = [ 130 ] # The PST
+ PixelLayerBuilder.BarrelAdditionalLayerRadii = [ 130.0 ] # The PST
PixelLayerBuilder.BarrelAdditionalLayerType = [ 0 ] # -- will shift volume boundary to PST
PixelLayerBuilder.EndcapAdditionalLayerPositionsZ = [ -1900. , 1900. ] # DBM
PixelLayerBuilder.EndcapAdditionalLayerType = [ 1 , 1 ] # DBM
@@ -86,7 +86,7 @@ def _getInDetTrackingGeometryBuilder(name, flags,result, envelopeDefinitionSvc,
SCT_LayerBuilder.BarrelAdditionalLayerRadii = []
SCT_LayerBuilder.BarrelAdditionalLayerType = []
- SCT_LayerBuilder.EndcapAdditionalLayerPositionsZ = [ -2850 , 2850 ]
+ SCT_LayerBuilder.EndcapAdditionalLayerPositionsZ = [ -2850. , 2850. ]
SCT_LayerBuilder.EndcapAdditionalLayerType = [ 0 , 0 ]
SCT_LayerBuilder.BarrelLayerBinsZ = 1
SCT_LayerBuilder.BarrelLayerBinsPhi = 1