Import Geant4 11.3.0 source tree

source/visualization/ToolsSG/History

@@ -6,6 +6,9 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2024-06-21 Ben Morgan (vis_toolssg-V1-02-02)
+- Use runtime checks for MT mode.
+
 ## 2024-04-30 Ben Morgan (vis_toolssg-V11-02-01)
 - Replace TOOLSSG vis driver variables that are just synonyms for more
   fundamental config options (e.g. GEANT4_USE_QT) with the underlying

source/visualization/ToolsSG/include/private/G4ToolsSGViewer.hh

@@ -296,7 +296,6 @@ public:
     }
   }
 
-#ifdef G4MULTITHREADED
   virtual void SwitchToVisSubThread() {}
   
   virtual void SwitchToMasterThread() {
@@ -321,7 +320,6 @@ public:
       }
     }
   }
-#endif
   
   //SG_VIEWER* sg_viewer() {return fSGViewer;}
 protected:

source/visualization/ToolsSG/src/G4ToolsSGSceneHandler.cc

@@ -123,9 +123,7 @@ tools::sg::separator* G4ToolsSGSceneHandler::GetOrCreateNode()
 { // Retrieve or create a G4ToolsSGNode node suitable for next solid or primitive
 
   // For time being, avoid errors in MT mode - see G4ToolsSGViewer::SwitchToMasterThread
-#ifdef G4MULTITHREADED
   if (!G4Threading::IsMasterThread()) return nullptr;
-#endif
 
   if (fReadyForTransients) {  // All transients hang from this node
     tools::sg::separator* sep = new tools::sg::separator;