Import Geant4 11.1.0.beta source tree

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

@@ -45,7 +45,7 @@ class HepPolyhedronProcessor;
 
 class G4BooleanSolid : public G4VSolid
 {
-  public:  // with description
+  public:
  
     G4BooleanSolid( const G4String& pName,
                           G4VSolid* pSolidA ,
@@ -90,8 +90,6 @@ class G4BooleanSolid : public G4VSolid
    
     G4ThreeVector GetPointOnSurface() const;
 
-  public:  // without description
-
     G4BooleanSolid(__void__&);
       // Fake default constructor for usage restricted to direct object
       // persistency for clients requiring preallocation of memory for

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

@@ -44,7 +44,7 @@
 
 class G4DisplacedSolid : public G4VSolid
 {
-  public:  // with description
+  public:
 
     G4DisplacedSolid( const G4String& pName,
                             G4VSolid* pSolid ,
@@ -62,10 +62,6 @@ class G4DisplacedSolid : public G4VSolid
 
     virtual ~G4DisplacedSolid() ;
 
-  public:  // without description 
-
-    // It also has all the methods that a solid requires, eg.
-
     EInside Inside( const G4ThreeVector& p ) const ; 
 
     void BoundingLimits(G4ThreeVector& pMin, G4ThreeVector& pMax) const;
@@ -97,9 +93,10 @@ class G4DisplacedSolid : public G4VSolid
 
     void CleanTransformations();
 
-    G4ThreeVector GetPointOnSurface() const;
+    G4double GetCubicVolume();
+    G4double GetSurfaceArea();
 
-  public:  // with description 
+    G4ThreeVector GetPointOnSurface() const;
 
     G4GeometryType  GetEntityType() const;
     G4VSolid* Clone() const;
@@ -134,8 +131,6 @@ class G4DisplacedSolid : public G4VSolid
 
     std::ostream& StreamInfo(std::ostream& os) const;
 
-  public:  // without description
-
     G4DisplacedSolid(__void__&);
       // Fake default constructor for usage restricted to direct object
       // persistency for clients requiring preallocation of memory for

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

@@ -44,7 +44,7 @@
 
 class G4IntersectionSolid : public G4BooleanSolid
 {
-  public:  // with description
+  public:
 
     G4IntersectionSolid( const G4String& pName,
                                G4VSolid* pSolidA ,
@@ -67,8 +67,6 @@ class G4IntersectionSolid : public G4BooleanSolid
 
     G4VSolid* Clone() const;
 
-  public:  // without description
-
     G4IntersectionSolid(__void__&);
       // Fake default constructor for usage restricted to direct object
       // persistency for clients requiring preallocation of memory for

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

@@ -44,7 +44,7 @@ class G4ScaleTransform;
 
 class G4ScaledSolid : public G4VSolid
 {
-  public:  // with description
+  public:
 
     G4ScaledSolid( const G4String& pName,
                          G4VSolid* pSolid ,
@@ -97,8 +97,6 @@ class G4ScaledSolid : public G4VSolid
 
     std::ostream& StreamInfo(std::ostream& os) const;
 
-  public:  // without description
-
     G4ScaledSolid(__void__&);
       // Fake default constructor for usage restricted to direct object
       // persistency for clients requiring preallocation of memory for
@@ -121,6 +119,6 @@ class G4ScaledSolid : public G4VSolid
     G4double fSurfaceArea = -1.0;
     mutable G4bool fRebuildPolyhedron = false;
     mutable G4Polyhedron* fpPolyhedron = nullptr;
-} ;
+};
 
 #endif

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

@@ -45,7 +45,7 @@
 
 class G4SubtractionSolid : public G4BooleanSolid
 {
-  public:  // with description
+  public:
 
     G4SubtractionSolid(  const G4String& pName,
                                G4VSolid* pSolidA ,
@@ -68,8 +68,6 @@ class G4SubtractionSolid : public G4BooleanSolid
 
     G4VSolid* Clone() const;
 
-  public:  // without description
-
     G4SubtractionSolid(__void__&);
       // Fake default constructor for usage restricted to direct object
       // persistency for clients requiring preallocation of memory for