Import Geant4 10.7.0 source tree

examples/extended/runAndEvent/RE01/CMakeLists.txt

@@ -1,6 +1,9 @@
 #----------------------------------------------------------------------------
 # 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(RE01)
 
 #----------------------------------------------------------------------------
@@ -23,7 +26,7 @@ include(${Geant4_USE_FILE})
 #----------------------------------------------------------------------------
 # Locate sources and headers for this project
 #
-include_directories(${PROJECT_SOURCE_DIR}/include 
+include_directories(${PROJECT_SOURCE_DIR}/include
                     ${Geant4_INCLUDE_DIR})
 file(GLOB sources ${PROJECT_SOURCE_DIR}/src/*.cc)
 file(GLOB headers ${PROJECT_SOURCE_DIR}/include/*.hh)

examples/extended/runAndEvent/RE01/History

@@ -14,6 +14,9 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Oct. 29, 2020 M. Asai (exampleRE01-V10-06-00)
+- Migration to G4RunManagerFactory.
+
 May 14, 2018 J. Allison  (exampleRE01-V10-04-01)
 - Remove G4UI_USE and G4VIS_USE.
 - Move instantiation of G4UIExecutive to start of main.

examples/extended/runAndEvent/RE01/RE01.cc

@@ -40,11 +40,7 @@
 
 #include "G4Types.hh"
 
-#ifdef G4MULTITHREADED
-#include "G4MTRunManager.hh"
-#else
-#include "G4RunManager.hh"
-#endif
+#include "G4RunManagerFactory.hh"
 #include "G4UImanager.hh"
 
 #include "RE01DetectorConstruction.hh"
@@ -59,18 +55,13 @@
 
 int main(int argc,char** argv)
 {
- // Instantiate G4UIExecutive if there are no arguments (interactive mode)
- G4UIExecutive* ui = nullptr;
- if ( argc == 1 ) {
+  // Instantiate G4UIExecutive if there are no arguments (interactive mode)
+  G4UIExecutive* ui = nullptr;
+  if ( argc == 1 ) {
    ui = new G4UIExecutive(argc, argv);
- }
+  }
 
-#ifdef G4MULTITHREADED
- G4MTRunManager * runManager = new G4MTRunManager;
- //runManager->SetNumberOfThreads(4);
-#else
- G4RunManager * runManager = new G4RunManager;
-#endif
+  auto* runManager = G4RunManagerFactory::CreateRunManager();
 
   // Visualization manager construction
   G4VisManager* visManager = new G4VisExecutive;