Skip to content

Use static material maps in Geo2G4MaterialFactory

John Derek Chapman requested to merge jchapman/athena:trtCO2_ATLASSIM-4679_master into master

Making Geo2G4MaterialFactory::m_geoMaterialToG4Material and Geo2G4MaterialFactory::m_geoMaterialNameToObject into static member variables prevents the attempt to create a duplicate 'trt::CO2' material during simulation. Due to two different Geo2G4MaterialFactory instances being asked to build the 'trt::CO2' material. It is safe to make these variables static as this code is only run during the initialization of Geant4 (which is single-threaded). This will fix the final duplicated material warning listed in ATLASSIM-4679.

Merge after !35795 (merged)

Edited by John Derek Chapman

Merge request reports