Import Geant4 11.1.0.beta source tree

source/geometry/navigation/include/G4GeometryMessenger.hh

@@ -48,6 +48,8 @@ class G4UIcmdWithADoubleAndUnit;
 class G4TransportationManager;
 class G4GeomTestVolume;
 
+#include <vector>
+
 class G4GeometryMessenger : public G4UImessenger
 {
   public:  // with description
@@ -70,16 +72,17 @@ class G4GeometryMessenger : public G4UImessenger
     void RecursiveOverlapTest();
 
     G4UIdirectory             *geodir, *navdir, *testdir;
-    G4UIcmdWithABool          *chkCmd, *pchkCmd, *verCmd;
+    G4UIcmdWithABool          *chkCmd, *pchkCmd, *verCmd, *parCmd;
     G4UIcmdWithoutParameter   *recCmd, *resCmd;
     G4UIcmdWithADoubleAndUnit *tolCmd;
     G4UIcmdWithAnInteger      *verbCmd, *rslCmd, *rcsCmd, *rcdCmd, *errCmd;
 
     G4double tol = 0.0;
     G4int recLevel = 0, recDepth = -1;
+    G4bool checkParallelWorlds = false;
 
     G4TransportationManager* tmanager;
-    G4GeomTestVolume* tvolume = nullptr;
+    std::vector<G4GeomTestVolume*> tvolumes{};
 };
 
 #endif

source/geometry/navigation/include/G4SafetyHelper.hh

@@ -92,7 +92,6 @@ class G4SafetyHelper
 
     G4PathFinder* fpPathFinder = nullptr;
     G4Navigator* fpMassNavigator = nullptr;
-    G4int fMassNavigatorId = -1;
 
     G4bool fUseParallelGeometries = false; 
       // Flag whether to use PathFinder or single (mass) Navigator directly

source/geometry/navigation/include/G4TransportationManager.hh

@@ -153,6 +153,10 @@ class G4TransportationManager
      static G4ThreadLocal G4TransportationManager* fTransportationManager;
 
      static G4Navigator* fFirstTrackingNavigator;
+
+  public:
+
+    static constexpr G4int kMassNavigatorId = 0;
 };
 
 #include "G4TransportationManager.icc"