Import Geant4 11.0.0.beta source tree

source/geometry/solids/Boolean/include/G4BooleanSolid.hh

@@ -70,7 +70,7 @@ class G4BooleanSolid : public G4VSolid
       // return the corresponding solid (for no=0 and 1).
       // If the solid is not a "Boolean", return 0.
 
-    inline G4double GetCubicVolume();
+    virtual G4double GetCubicVolume();
     inline G4double GetSurfaceArea();
 
     virtual G4GeometryType  GetEntityType() const;
@@ -82,12 +82,12 @@ class G4BooleanSolid : public G4VSolid
     inline G4double GetCubVolEpsilon() const;
     inline void SetCubVolStatistics(G4int st);
     inline void SetCubVolEpsilon(G4double ep);
-
+   
     inline G4int GetAreaStatistics() const;
     inline G4double GetAreaAccuracy() const;
     inline void SetAreaStatistics(G4int st);
     inline void SetAreaAccuracy(G4double ep);
-
+   
     G4ThreeVector GetPointOnSurface() const;
 
   public:  // without description
@@ -116,12 +116,14 @@ class G4BooleanSolid : public G4VSolid
     G4VSolid* fPtrSolidA = nullptr;
     G4VSolid* fPtrSolidB = nullptr;
 
+    G4double fCubicVolume = -1.0;
+      // Stored value of fCubicVolume 
+
   private:
 
     G4int    fStatistics = 1000000;
     G4double fCubVolEpsilon = 0.001;
     G4double fAreaAccuracy = -1;
-    G4double fCubicVolume = -1.0;
     G4double fSurfaceArea = -1.0;
 
     mutable G4bool fRebuildPolyhedron = false;

source/geometry/solids/Boolean/include/G4BooleanSolid.icc

@@ -79,16 +79,6 @@ void G4BooleanSolid::SetAreaAccuracy(G4double ep)
   fAreaAccuracy = ep;
 }
 
-inline
-G4double G4BooleanSolid::GetCubicVolume()
-{
-  if(fCubicVolume < 0.)
-  {
-    fCubicVolume = EstimateCubicVolume(fStatistics,fCubVolEpsilon);
-  }
-  return fCubicVolume;
-}
-
 inline
 G4double G4BooleanSolid::GetSurfaceArea()
 {

source/geometry/solids/Boolean/include/G4SubtractionSolid.hh

@@ -111,6 +111,7 @@ class G4SubtractionSolid : public G4BooleanSolid
     void DescribeYourselfTo ( G4VGraphicsScene& scene ) const ;
     G4Polyhedron* CreatePolyhedron () const ;
 
+    virtual G4double GetCubicVolume() final;
 };
 
 #endif

source/geometry/solids/Boolean/include/G4UnionSolid.hh

@@ -110,6 +110,8 @@ class G4UnionSolid : public G4BooleanSolid
     void DescribeYourselfTo ( G4VGraphicsScene& scene ) const ;
     G4Polyhedron* CreatePolyhedron () const ;
 
+    virtual G4double GetCubicVolume() final;
+
   private:
 
     G4ThreeVector fPMin, fPMax; // bounding box extended by half-tolerance