Fix NSW geometry initialisation (ATLASSIM-4447 and ATLASSIM-4448)

MuonSpectrometer/MuonGeoModel/MuonGeoModel/MuonDetectorFactory001.h

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MuonDetectorFactory001_H
@@ -35,7 +35,7 @@ public:
   virtual void create (GeoPhysVol* world);
 
   // Get the manager.
-  virtual const MuonDetectorManager* getDetectorManager() const;
+  virtual MuonDetectorManager* getDetectorManager() const;
 
   inline void setDBAtlasVersion(std::string v);
   inline void setDBMuonVersion(std::string v);

MuonSpectrometer/MuonGeoModel/src/MYSQL.cxx

@@ -136,17 +136,23 @@ TgcReadoutParams* MYSQL::GetTgcRPars(int jsta)
 Technology* MYSQL::GetTechnology(std::string name)
 {
   std::map<std::string,Technology* >::const_iterator it =  m_technologies.find(name);
+#ifndef NDEBUG
   MsgStream log(Athena::getMessageSvc(),"MuonGeoModel.MYSQL");
+#endif
   if (it!=m_technologies.end()) {
+#ifndef NDEBUG
     if (log.level()<=MSG::VERBOSE) {
       log << MSG::VERBOSE << "found the station technology name " << name << endmsg;
     }
+#endif
     return it->second;
   } else {
+#ifndef NDEBUG
     if (log.level()<=MSG::VERBOSE) {
       log << MSG::VERBOSE << "MYSQL:: Technology " << name << "+++++++++ not found!" << endmsg;
     }
-    return 0;
+#endif
+    return nullptr;
   }
 }
 

MuonSpectrometer/MuonGeoModel/src/MuonDetectorFactory001.cxx

@@ -115,7 +115,7 @@ namespace MuonGM {
     delete m_muon;
   }
 
-  const MuonDetectorManager* MuonDetectorFactory001::getDetectorManager() const
+  MuonDetectorManager* MuonDetectorFactory001::getDetectorManager() const
   {
     return m_manager;
   }