Import Geant4 10.7.0 source tree

examples/extended/parameterisations/Par01/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(Par01)
 
 #----------------------------------------------------------------------------

examples/extended/parameterisations/Par01/History

@@ -14,6 +14,9 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+10-11-2020 B. Morgan (expar01-V10-06-00)
+- Migration to G4RunManagerFactory.
+
 17-05-2018 J.Allison (expar01-V10-04-00)
 - Add #include "G4Types.hh"
 - Remove G4UI_USE and G4VIS_USE.
@@ -204,7 +207,7 @@ June 17, 2000  John Allison  (exampleN05-V01-01-00)
 11 December 1998 M. Verderi
 - fix made in ExN05CalorimeterSD to allow several instanciations of this class.
   The problem was a static variable (HCID) used in EndOfEventAction which made
-  confusion to get the hits collection. HCID is now put as private (non static!) 
+  confusion to get the hits collection. HCID is now put as private (non static!)
   member of the class.
 - the example.in/.out are updated accordingly
 
@@ -239,8 +242,8 @@ June 17, 2000  John Allison  (exampleN05-V01-01-00)
 - Modified ExN05PhysicsList to register above processes.
 - Modified ExN05DetectorConstruction to attach Userlimits to crystal.
 - Added ExN05DetectorMessenger to switch on/off UserLimits.
-- Modified exampleN05.in 
- 
+- Modified exampleN05.in
+
 
 9th August 1998  John Allison
 - Changed G4UIterminal to G4UIGAG.
@@ -289,7 +292,7 @@ a private navigator, rather than the one for tracking.
 May 07, 98 M. Verderi
 
 - First commit (many improvements needed):
-	- main() coded in exampleN05.cc 
+	- main() coded in exampleN05.cc
 	- include:
 		MyCalorimeterHit.hh
 		MyCalorimeterHitsCollection.hh
@@ -298,7 +301,7 @@ May 07, 98 M. Verderi
 		MyEMCShower.hh
 		MyEnergySpot.hh
 		MyEventAction.hh
-		MyEventActionMessenger.hh 
+		MyEventActionMessenger.hh
 		MyPhysicsList.hh
 		MyPiModel.hh
 		MyPrimaryGeneratorAction.hh

examples/extended/parameterisations/Par01/examplePar01.cc

@@ -28,7 +28,7 @@
 //
 //
 //
-// 
+//
 // --------------------------------------------------------------
 //                     Geant4 - examplePar01
 // --------------------------------------------------------------
@@ -53,11 +53,7 @@
 #include "G4FastSimulationPhysics.hh"
 
 #include "G4UImanager.hh"
-#ifdef G4MULTITHREADED
-#include "G4MTRunManager.hh"
-#else
-#include "G4RunManager.hh"
-#endif
+#include "G4RunManagerFactory.hh"
 
 // ----------------------------------------------------------------
 // -- Action initialization (includes the primary generator action:
@@ -80,18 +76,8 @@ int main(int argc, char** argv)
   //-------------------------------
   // Initialization of Run manager
   //-------------------------------
-#ifdef G4MULTITHREADED
-  G4MTRunManager * runManager = new G4MTRunManager;
+  auto* runManager = G4RunManagerFactory::CreateRunManager();
   runManager->SetNumberOfThreads(4);
-  G4cout<<"+-------------------------------------------------------+"<<G4endl;
-  G4cout<<"|              Constructing MT run manager              |"<<G4endl;
-  G4cout<<"+-------------------------------------------------------+"<<G4endl;
-#else
-  G4RunManager * runManager = new G4RunManager;
-  G4cout<<"+-------------------------------------------------------+"<<G4endl;
-  G4cout<<"|        Constructing sequential run manager            |"<<G4endl;
-  G4cout<<"+-------------------------------------------------------+"<<G4endl;
-#endif
 
   // -----------------------------------------------------
   // -- Detector/mass geometry and parallel geometry(ies):