Import Geant4 11.2.0.beta source tree

source/geometry/biasing/include/G4IStore.hh

@@ -56,11 +56,11 @@ class G4IStore : public G4VIStore
     static G4IStore* GetInstance(const G4String& ParallelWorldName);
       // return ptr to singleton instance of the class.
 
-    virtual G4double GetImportance(const G4GeometryCell& gCell) const;
+    G4double GetImportance(const G4GeometryCell& gCell) const override;
       // derive an importance value of a "cell" addressed by a
       // G4GeometryCell from the store.
 
-    virtual G4bool IsKnown(const G4GeometryCell& gCell) const;
+    G4bool IsKnown(const G4GeometryCell& gCell) const override;
       // returns true if the gCell is in the store, else false 
 
     void Clear();
@@ -71,7 +71,7 @@ class G4IStore : public G4VIStore
     void SetParallelWorldVolume(const G4String& paraName);
       // set a reference to parallel world volume of the "importance" geometry
 
-    virtual const G4VPhysicalVolume& GetWorldVolume() const;
+    const G4VPhysicalVolume& GetWorldVolume() const override;
       // return a reference to the world volume of the "importance" geometry
 
     virtual const G4VPhysicalVolume* GetParallelWorldVolumePointer() const;
@@ -98,7 +98,7 @@ class G4IStore : public G4VIStore
     explicit G4IStore(const G4String& ParallelWorldName);
       // initialise the importance store for the given geometry
 
-    ~G4IStore();
+    ~G4IStore() override;
       // destructor
 
   private:
@@ -115,11 +115,6 @@ class G4IStore : public G4VIStore
     mutable G4GeometryCellImportance::const_iterator fCurrentIterator;
 
     static G4ThreadLocal G4IStore* fInstance;
-
-#ifdef G4MULTITHREADED
-    static G4Mutex IStoreMutex;
-#endif
-
 };
 
 #endif

source/geometry/biasing/include/G4ImportanceAlgorithm.hh

@@ -45,12 +45,12 @@ class G4ImportanceAlgorithm : public G4VImportanceAlgorithm
     G4ImportanceAlgorithm();
       // simple construction
 
-    virtual ~G4ImportanceAlgorithm();
+    ~G4ImportanceAlgorithm() override;
       // repeate warning if triggered
 
-    virtual G4Nsplit_Weight Calculate(G4double ipre, 
+    G4Nsplit_Weight Calculate(G4double ipre, 
                                       G4double ipost, 
-                                      G4double init_w) const;
+                                      G4double init_w) const override;
       // calculate the number of tracks and their weight according to the
       // pre and post importance value and the weight of the mother track
 
@@ -62,11 +62,6 @@ class G4ImportanceAlgorithm : public G4VImportanceAlgorithm
   private:
 
     mutable G4bool fWarned = false;
-
-#ifdef G4MULTITHREADED
-    static G4Mutex ImportanceMutex;
-#endif
-
 };
 
 #endif

source/geometry/biasing/include/G4WeightWindowAlgorithm.hh

@@ -58,10 +58,10 @@ class G4WeightWindowAlgorithm : public G4VWeightWindowAlgorithm
                             G4double survivalFactor = 3,
                             G4int maxNumberOfSplits = 5);
   
-    virtual ~G4WeightWindowAlgorithm();
+    ~G4WeightWindowAlgorithm() override;
 
-    virtual G4Nsplit_Weight Calculate(G4double init_w,
-                                      G4double lowerWeightBound) const;
+    G4Nsplit_Weight Calculate(G4double init_w,
+                                      G4double lowerWeightBound) const override;
       // calculate number of tracks and their weight according
       // to the initial track weight and the lower energy bound
 

source/geometry/biasing/include/G4WeightWindowStore.hh

@@ -52,12 +52,12 @@ class G4WeightWindowStore: public G4VWeightWindowStore
     static G4WeightWindowStore* GetInstance(const G4String& ParallelWorldName);
       // return ptr to singleton instance of the class
 
-    virtual G4double GetLowerWeight(const G4GeometryCell& gCell, 
-                                          G4double partEnergy) const;
+    G4double GetLowerWeight(const G4GeometryCell& gCell, 
+                                          G4double partEnergy) const override;
       // derive a lower weight bound value of a "cell" addressed by a 
       // G4GeometryCell and the corresponding energy from the store
 
-    virtual G4bool IsKnown(const G4GeometryCell &gCell) const;
+    G4bool IsKnown(const G4GeometryCell &gCell) const override;
       // returns true if the gCell is in the store, else false 
 
     void Clear();
@@ -67,7 +67,7 @@ class G4WeightWindowStore: public G4VWeightWindowStore
     void SetParallelWorldVolume(const G4String& paraName);
       // set a pointer to parallel world volume of the weightwindow geometry
 
-    virtual const G4VPhysicalVolume& GetWorldVolume() const;
+    const G4VPhysicalVolume& GetWorldVolume() const override;
       // return a reference to the world volume of the weightwindow geometry
     virtual const G4VPhysicalVolume* GetParallelWorldVolumePointer() const;
       // return a pointer to parallel world volume of the weightwindow geometry
@@ -89,7 +89,7 @@ class G4WeightWindowStore: public G4VWeightWindowStore
     explicit G4WeightWindowStore(const G4String& ParallelWorldName);
       // initialise the weight window store for the given geometry
 
-   ~G4WeightWindowStore();
+   ~G4WeightWindowStore() override;
       // destructor
 
   private: