Import Geant4 10.7.2 source tree

source/geometry/solids/CSG/History

@@ -16,6 +16,11 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+May 17, 2021 E.Tcherniaev geom-csg-V10-06-07
+- Bux fix in G4Sphere::GetSurfaceArea()
+- G4Sphere::GetCubicVolume() moved to source
+- Revised G4Sphere::GetPointOnSurface()
+
 February 1, 2021 G.Cosmo geom-csg-V10-06-06
 - G4Trap, G4Para: removed spurious character in printout in StreamInfo().
   Addressed problem report #2318.

source/geometry/solids/CSG/include/G4Sphere.hh

@@ -121,7 +121,7 @@ class G4Sphere : public G4CSGSolid
 
     // Methods for solid
 
-    inline G4double GetCubicVolume();
+    G4double GetCubicVolume();
     G4double GetSurfaceArea();
 
     void ComputeDimensions(      G4VPVParameterisation* p,

source/geometry/solids/CSG/include/G4Sphere.icc

@@ -115,7 +115,7 @@ G4double G4Sphere::GetCosEndTheta () const
   return cosETheta;
 }
 
-inline 
+inline
 void G4Sphere::Initialize()
 {
   fCubicVolume = 0.;
@@ -127,7 +127,7 @@ inline
 void G4Sphere::InitializePhiTrigonometry()
 {
   hDPhi = 0.5*fDPhi;                       // half delta phi
-  cPhi  = fSPhi + hDPhi; 
+  cPhi  = fSPhi + hDPhi;
   ePhi  = fSPhi + fDPhi;
 
   sinCPhi    = std::sin(cPhi);
@@ -310,7 +310,7 @@ void G4Sphere::SetDeltaThetaAngle(G4double newDTheta)
 // Old access functions
 
 inline
-G4double G4Sphere::GetRmin() const 
+G4double G4Sphere::GetRmin() const
 {
   return GetInsideRadius();
 }
@@ -344,12 +344,3 @@ G4double G4Sphere::GetDTheta() const
 {
   return GetDeltaThetaAngle();
 }
-
-inline
-G4double G4Sphere::GetCubicVolume()
-{
-  if(fCubicVolume != 0.) {;}
-  else { fCubicVolume = fDPhi*(std::cos(fSTheta)-std::cos(fSTheta+fDTheta))*
-                              (fRmax*fRmax*fRmax-fRmin*fRmin*fRmin)/3.; }
-  return fCubicVolume;
-}