Import Geant4 10.7.0 source tree

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

examples/extended/parameterisations/Par02/History

@@ -14,6 +14,9 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+10-11-20 B. Morgan (expar02-V10-06-00)
+- Migration to G4RunManagerFactory.
+
 28-11-19 I. Hrivnacova (expar02-V10-05-00)
 - Fixed Doxygen warning
 

examples/extended/parameterisations/Par02/examplePar02.cc

@@ -25,7 +25,7 @@
 //
 //
 //
-// 
+//
 // --------------------------------------------------------------
 //      GEANT 4 - examplePar02
 // --------------------------------------------------------------
@@ -42,11 +42,7 @@
 #include "G4Types.hh"
 
 #include "G4UImanager.hh"
-#ifdef G4MULTITHREADED
-#include "G4MTRunManager.hh"
-#else
-#include "G4RunManager.hh"
-#endif
+#include "G4RunManagerFactory.hh"
 
 #include "Par02DetectorConstruction.hh"
 #include "Par02PhysicsList.hh"
@@ -66,23 +62,13 @@ 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:
   G4VUserDetectorConstruction* detector = new Par02DetectorConstruction();
   runManager->SetUserInitialization( detector );
-  
+
   // PhysicsList (including G4FastSimulationManagerProcess)
   G4VUserPhysicsList* physicsList = new Par02PhysicsList;
   runManager->SetUserInitialization( physicsList );

examples/extended/parameterisations/Par02/examplePar02.out

@@ -1,10 +1,11 @@
+Environment variable "G4FORCE_RUN_MANAGER_TYPE" enabled with value == Serial. Forcing G4RunManager type...
 
         ############################################
         !!! WARNING - FPE detection is activated !!!
         ############################################
 
 **************************************************************
- Geant4 version Name: geant4-10-06-ref-06    (26-June-2020)
+ Geant4 version Name: geant4-10-07-ref-00    (4-December-2020)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -12,9 +13,6 @@
                              WWW : http://geant4.org/
 **************************************************************
 
-+-------------------------------------------------------+
-|        Constructing sequential run manager            |
-+-------------------------------------------------------+
 G4GDML: Reading 'Par02FullDetector.gdml'...
 G4GDML: Reading definitions...
 G4GDML: Reading materials...
@@ -31,31 +29,28 @@ hcal !!!
 
 hcal !!!
 
+ecal !!!
+
 hcal !!!
 
 hcal !!!
 
+ecal !!!
+
+ecal !!!
+
+ecal !!!
+
 tracker !!!
 
 ecal !!!
-
-ecal !!!
-
-ecal !!!
-
-ecal !!!
-
-ecal !!!
-Warning : Region <MuonEndCap_1> does not have specific production cuts,
+Warning : Region <MuonForward_3> does not have specific production cuts,
 even though it appears in the current tracking world.
 Default cuts are used for this region.
-Warning : Region <MuonEndCap_2> does not have specific production cuts,
+Warning : Region <MuonForward_4> does not have specific production cuts,
 even though it appears in the current tracking world.
 Default cuts are used for this region.
-Warning : Region <MuonEndCap_3> does not have specific production cuts,
-even though it appears in the current tracking world.
-Default cuts are used for this region.
-Warning : Region <MuonEndCap_4> does not have specific production cuts,
+Warning : Region <MuonForward_5> does not have specific production cuts,
 even though it appears in the current tracking world.
 Default cuts are used for this region.
 Warning : Region <MuonEndCap_5> does not have specific production cuts,
@@ -70,18 +65,21 @@ Default cuts are used for this region.
 Warning : Region <MuonForward_2> does not have specific production cuts,
 even though it appears in the current tracking world.
 Default cuts are used for this region.
-Warning : Region <MuonForward_3> does not have specific production cuts,
-even though it appears in the current tracking world.
-Default cuts are used for this region.
-Warning : Region <MuonForward_4> does not have specific production cuts,
-even though it appears in the current tracking world.
-Default cuts are used for this region.
-Warning : Region <MuonForward_5> does not have specific production cuts,
-even though it appears in the current tracking world.
-Default cuts are used for this region.
 Warning : Region <MuonForward_6> does not have specific production cuts,
 even though it appears in the current tracking world.
 Default cuts are used for this region.
+Warning : Region <MuonEndCap_1> does not have specific production cuts,
+even though it appears in the current tracking world.
+Default cuts are used for this region.
+Warning : Region <MuonEndCap_2> does not have specific production cuts,
+even though it appears in the current tracking world.
+Default cuts are used for this region.
+Warning : Region <MuonEndCap_3> does not have specific production cuts,
+even though it appears in the current tracking world.
+Default cuts are used for this region.
+Warning : Region <MuonEndCap_4> does not have specific production cuts,
+even though it appears in the current tracking world.
+Default cuts are used for this region.
 Instantiating Visualization Manager.......
 Visualization Manager instantiating with verbosity "warnings (3)"...
 Visualization Manager initialising...
@@ -97,10 +95,12 @@ Registered graphics systems are:
   VRML1FILE (VRML1FILE)
   VRML2FILE (VRML2FILE)
   gMocrenFile (gMocrenFile)
-  OpenGLImmediateXm (OGLIXm, OGLI)
-  OpenGLStoredXm (OGLSXm, OGL, OGLS)
-  OpenGLImmediateX (OGLIX, OGLIXm_FALLBACK)
-  OpenGLStoredX (OGLSX, OGLSXm_FALLBACK)
+  OpenGLImmediateQt (OGLIQt, OGLI)
+  OpenGLStoredQt (OGLSQt, OGL, OGLS)
+  OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
+  OpenGLStoredXm (OGLSXm, OGLSQt_FALLBACK)
+  OpenGLImmediateX (OGLIX, OGLIQt_FALLBACK, OGLIXm_FALLBACK)
+  OpenGLStoredX (OGLSX, OGLSQt_FALLBACK, OGLSXm_FALLBACK)
   RayTracerX (RayTracerX)
 
 Registering model factories...
@@ -137,7 +137,8 @@ Some /vis commands (optionally) take a string to specify colour.
 Magnetic field is active, fieldValue = (0 0 1 T ).
 G4VisManager: Using G4TrajectoryDrawByCharge as fallback trajectory model.
 See commands in /vis/modeling/trajectories/ for other options.
-... open Root analysis file : DefaultOutput.root - done
+... create file : DefaultOutput.root - done
+... open analysis file : DefaultOutput.root - done
  ________Tracker model triggered _________
  ________Tracker model triggered _________
  ________Tracker model triggered _________
@@ -1138,7 +1139,10 @@ See commands in /vis/modeling/trajectories/ for other options.
  ________Tracker model triggered _________
  ________Tracker model triggered _________
  ________Tracker model triggered _________
-... write Root file : DefaultOutput.root - done
-... close Root file : DefaultOutput.root - done
+... write file : DefaultOutput.root - done
+... close file : DefaultOutput.root - done
+0 events have been kept for refreshing and/or reviewing.
+  "/vis/reviewKeptEvents" to review them one by one.
+  "/vis/enable", then "/vis/viewer/flush" or "/vis/viewer/rebuild" to see them accumulated.
 Graphics systems deleted.
 Visualization Manager deleting...