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

Merge branch 'config.TrackingGeometryCondAlg-20210908' into 'master' 

TrackingGeometryCondAlg: Configuration workaround.

See merge request !46386
parents 24e577bb e193c3ab
No related branches found
Tags release/21.0.110
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,!46386TrackingGeometryCondAlg: Configuration workaround.
Hide whitespace changes
Inline Side-by-side
Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlg.py
+ 1
− 1
View file @ e6ec942a
...@@ -166,7 +166,7 @@ class ConfiguredTrackingGeometryCondAlg( Trk__TrackingGeometryCondAlg ) : ...@@ -166,7 +166,7 @@ class ConfiguredTrackingGeometryCondAlg( Trk__TrackingGeometryCondAlg ) :
if TrkDetFlags.MaterialSource() == 'COOL': if TrkDetFlags.MaterialSource() == 'COOL':
# the material provider # the material provider
from TrkDetDescrTools.TrkDetDescrToolsConf import Trk__LayerMaterialProvider as LayerMaterialProvider from TrkDetDescrTools.TrkDetDescrToolsConf import Trk__LayerMaterialProvider as LayerMaterialProvider
AtlasMaterialProvider = LayerMaterialProvider('AtlasMaterialProvider') AtlasMaterialProvider = LayerMaterialProvider('AtlasMaterialCondProvider')
AtlasMaterialProvider.OutputLevel = TrkDetFlags.ConfigurationOutputLevel() AtlasMaterialProvider.OutputLevel = TrkDetFlags.ConfigurationOutputLevel()
AtlasMaterialProvider.LayerMaterialMapKey = TrkDetFlags.MaterialStoreGateKey() AtlasMaterialProvider.LayerMaterialMapKey = TrkDetFlags.MaterialStoreGateKey()
......
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