Import Geant4 11.4.1 source tree

source/run/include/G4MTRunManager.hh

@@ -35,8 +35,8 @@
 
 // Original authors: X.Dong, A.Dotti - February 2013
 // --------------------------------------------------------------------
-#ifndef G4MTRunManager_hh
-#define G4MTRunManager_hh 1
+#ifndef G4MTRUNMANAGER_HH
+#define G4MTRUNMANAGER_HH
 
 #include "G4MTBarrier.hh"
 #include "G4RNGHelper.hh"
@@ -77,6 +77,9 @@ class G4MTRunManager : public G4RunManager
                              G4int n_select = -1) override;
     virtual void InitializeThreadPool() {}
 
+    // Start parallel optimization
+    void GeometryOptimisation() override;
+
     // The following do not do anything for this runmanager
     void TerminateOneEvent() override;
     void ProcessOneEvent(G4int i_event) override;

source/run/include/G4MaterialScanner.hh

@@ -32,8 +32,8 @@
 
 // Author: M.Asai, May 2006
 // --------------------------------------------------------------------
-#ifndef G4MaterialScanner_hh
-#define G4MaterialScanner_hh 1
+#ifndef G4MATERIALSCANNER_HH
+#define G4MATERIALSCANNER_HH
 
 #include "G4ThreeVector.hh"
 #include "globals.hh"
@@ -104,10 +104,10 @@ class G4MaterialScanner
     G4MSSteppingAction* theMatScannerSteppingAction = nullptr;
 
     G4ThreeVector eyePosition;
-    G4int nTheta = 91;
+    G4int nTheta = 1;
     G4double thetaMin = 0.0;
     G4double thetaSpan = 0.0;
-    G4int nPhi = 37;
+    G4int nPhi = 1;
     G4double phiMin = 0.0;
     G4double phiSpan = 0.0;
 

source/run/include/G4RunManager.hh

@@ -98,8 +98,8 @@
 
 // Original author: M.Asai, 1996
 // --------------------------------------------------------------------
-#ifndef G4RunManager_hh
-#define G4RunManager_hh 1
+#ifndef G4RUNMANAGER_HH
+#define G4RUNMANAGER_HH
 
 #include "G4Event.hh"
 #include "G4EventManager.hh"
@@ -133,6 +133,7 @@ class G4DCtable;
 class G4Run;
 class G4PrimaryTransformer;
 class G4RunManagerFactory;
+class G4MaterialScanner;
 
 class G4RunManager
 {
@@ -207,6 +208,7 @@ class G4RunManager
     // InitializeGeometry() and the G4VUserPhysicsList class will be accessed
     // from the method InitializePhysics().
     virtual void InitializeGeometry();
+    virtual void GeometryOptimisation();
     virtual void InitializePhysics();
 
     // These four methods are invoked from the BeamOn() method and they're
@@ -673,7 +675,7 @@ class G4RunManager
     static G4ThreadLocal G4RunManager* fRunManager;
 
     G4RunMessenger* runMessenger = nullptr;
-
+    G4MaterialScanner* materialScanner = nullptr;
 };
 
 #endif

source/run/include/G4WorkerRunManager.hh

@@ -36,8 +36,8 @@
 
 // Original authors: X.Dong, A.Dotti - 2013
 // --------------------------------------------------------------------
-#ifndef G4WorkerRunManager_hh
-#define G4WorkerRunManager_hh 1
+#ifndef G4WORKERRUNMANAGER_HH
+#define G4WORKERRUNMANAGER_HH
 
 #include "G4RNGHelper.hh"
 #include "G4RunManager.hh"
@@ -55,6 +55,7 @@ class G4WorkerRunManager : public G4RunManager
     ~G4WorkerRunManager() override;
 
     void InitializeGeometry() override;
+    void GeometryOptimisation() override;
     void RunInitialization() override;
     void DoEventLoop(G4int n_event, const char* macroFile = nullptr, G4int n_select = -1) override;
     void ProcessOneEvent(G4int i_event) override;

source/run/include/private/G4RunMessenger.hh

@@ -47,8 +47,8 @@
 
 // Original author: M.Asai, 1997
 // --------------------------------------------------------------------
-#ifndef G4RunMessenger_hh
-#define G4RunMessenger_hh 1
+#ifndef G4RUNMESSENGER_HH
+#define G4RUNMESSENGER_HH
 
 #include "G4UImessenger.hh"
 #include "globals.hh"
@@ -92,6 +92,7 @@ class G4RunMessenger : public G4UImessenger
     G4UIcmdWithoutParameter* initCmd = nullptr;
     G4UIcmdWithoutParameter* geomCmd = nullptr;
     G4UIcmdWithABool* geomRebCmd = nullptr;
+    G4UIcmdWithoutParameter* undertakeOptCmd = nullptr;
     G4UIcmdWithoutParameter* physCmd = nullptr;
     G4UIcmdWithAnInteger* randEvtCmd = nullptr;
     G4UIcommand* procUICmds = nullptr;