Import Geant4 10.7.0 source tree

examples/basic/B4/B4d/CMakeLists.txt

@@ -1,8 +1,10 @@
-
 #----------------------------------------------------------------------------
 # Setup the project
 #
-cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.8...3.18)
+if(${CMAKE_VERSION} VERSION_LESS 3.12)
+  cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
+endif()
 project(B4d)
 
 #----------------------------------------------------------------------------

examples/basic/B4/B4d/exampleB4d.cc

@@ -31,11 +31,7 @@
 #include "B4dActionInitialization.hh"
 #include "B4Analysis.hh"
 
-#ifdef G4MULTITHREADED
-#include "G4MTRunManager.hh"
-#else
-#include "G4RunManager.hh"
-#endif
+#include "G4RunManagerFactory.hh"
 
 #include "G4UImanager.hh"
 #include "FTFP_BERT.hh"
@@ -98,13 +94,13 @@ int main(int argc,char** argv)
   
   // Construct the MT run manager
   //
+
+  auto* runManager =
+    G4RunManagerFactory::CreateRunManager(G4RunManagerType::Default);
 #ifdef G4MULTITHREADED
-  auto runManager = new G4MTRunManager;
-  if ( nThreads > 0 ) { 
+  if ( nThreads > 0 ) {
     runManager->SetNumberOfThreads(nThreads);
-  }  
-#else
-  auto runManager = new G4RunManager;
+  }
 #endif
 
   // Set mandatory initialization classes

examples/basic/B4/B4d/include/B4Analysis.hh

@@ -34,4 +34,7 @@
 //#include "g4csv.hh"
 //#include "g4xml.hh"
 
+//#include "G4GenericAnalysisManager.hh"
+//using G4AnalysisManager = G4GenericAnalysisManager;
+
 #endif

examples/basic/B4/B4d/run2.mac

@@ -4,6 +4,8 @@
 # % exampleB4[a,b,c,d] run2.mac
 #
 #/run/numberOfThreads 4
+#/control/cout/ignoreThreadsExcept 0
+#
 /run/initialize
 #
 # Default kinemtics: