Merge branch 'fixMTSmartlessness' into 'master'

G4AtlasMTRunManager: initialize geometry before setting smartlessness.

See merge request atlas/athena!14941

Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasMTRunManager.cxx

@@ -62,6 +62,16 @@ void G4AtlasMTRunManager::InitializeGeometry()
 {
   ATH_MSG_INFO("InitializeGeometry");
 
+  // Retrieve detector geo service
+  if (m_detGeoSvc.retrieve().isFailure()) {
+    ATH_MSG_ERROR("Could not retrieve the DetectorGeometrySvc");
+    G4ExceptionDescription description;
+    description << "InitializeGeometry: Failed to retrieve IDetectorGeometrySvc.";
+    G4Exception("G4AtlasMTRunManager", "CouldNotRetrieveDetGeoSvc",
+                FatalException, description);
+    abort(); // to keep Coverity happy
+  }
+
   // Set smartlessness
   G4LogicalVolumeStore *logicalVolumeStore = G4LogicalVolumeStore::GetInstance();
   const G4String muonSys("Muon::MuonSys");
@@ -77,16 +87,6 @@ void G4AtlasMTRunManager::InitializeGeometry()
     }
   }
 
-  // Retrieve detector geo service
-  if (m_detGeoSvc.retrieve().isFailure()) {
-    ATH_MSG_ERROR("Could not retrieve the DetectorGeometrySvc");
-    G4ExceptionDescription description;
-    description << "InitializeGeometry: Failed to retrieve IDetectorGeometrySvc.";
-    G4Exception("G4AtlasMTRunManager", "CouldNotRetrieveDetGeoSvc",
-                FatalException, description);
-    abort(); // to keep Coverity happy
-  }
-
   // Create/assign detector construction
   SetUserInitialization( m_detGeoSvc->GetDetectorConstruction() );
   if (userDetector) {