Import Geant4 10.7.0 source tree

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

@@ -99,8 +99,8 @@ class G4CutTubs : public G4CSGSolid
 
     // Methods for solid
 
-    inline G4double GetCubicVolume();
-    inline G4double GetSurfaceArea();
+    G4double GetCubicVolume();
+    G4double GetSurfaceArea();
 
     void BoundingLimits(G4ThreeVector& pMin, G4ThreeVector& pMax) const;
 
@@ -182,17 +182,14 @@ class G4CutTubs : public G4CSGSolid
     G4double GetCutZ(const G4ThreeVector& p) const;
       // Get Z value of the point on Cutted Plane
 
-    void GetMaxMinZ(G4double& zmin,G4double& zmax)const;
-      // Get Max and Min values of Z on Cutted Plane,
-      // Used for Calculate BoundingLimits()
-
   private:
 
     G4double kRadTolerance, kAngTolerance;
       //
       // Radial and angular tolerances
 
-    G4double fRMin, fRMax, fDz, fSPhi, fDPhi;
+     G4double fRMin, fRMax, fDz, fSPhi, fDPhi;
+     mutable G4double fZMin, fZMax;
       //
       // Radial and angular dimensions
 

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

@@ -95,6 +95,8 @@ G4ThreeVector G4CutTubs::GetHighNorm () const
 inline
 void G4CutTubs::Initialize()
 {
+  fZMin = 0.;
+  fZMax = 0.;
   fCubicVolume = 0.;
   fSurfaceArea = 0.;
   fRebuildPolyhedron = true;
@@ -272,15 +274,3 @@ G4double G4CutTubs::GetDPhi () const
 {
   return GetDeltaPhiAngle();
 }
-
-inline G4double G4CutTubs::GetCubicVolume()
-{
-  if (fCubicVolume == 0.) { fCubicVolume = G4VSolid::GetCubicVolume(); }
-  return fCubicVolume;
-}
-
-inline G4double G4CutTubs::GetSurfaceArea()
-{
-  if (fSurfaceArea == 0.) { fSurfaceArea = G4VSolid::GetSurfaceArea(); }
-  return fSurfaceArea;
-}

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

@@ -151,9 +151,9 @@ void G4Sphere::InitializeThetaTrigonometry()
   sinETheta = std::sin(eTheta);
   cosETheta = std::cos(eTheta);
 
-  tanSTheta  = std::tan(fSTheta);
+  tanSTheta  = sinSTheta/cosSTheta;
   tanSTheta2 = tanSTheta*tanSTheta;
-  tanETheta  = std::tan(eTheta);
+  tanETheta  = sinETheta/cosETheta;
   tanETheta2 = tanETheta*tanETheta;
 }
 

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

@@ -252,6 +252,7 @@ class G4Trap : public G4CSGSolid
                       const G4ThreeVector& p3,
                       const G4ThreeVector& p4,
                             TrapSidePlane& plane ) ;
+    void SetCachedValues();
 
   private:
 
@@ -272,6 +273,7 @@ class G4Trap : public G4CSGSolid
     G4double fDy1,fDx1,fDx2,fTalpha1;
     G4double fDy2,fDx3,fDx4,fTalpha2;
     TrapSidePlane fPlanes[4];
+    G4double fAreas[6];
     G4int fTrapType;
 };
 

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

@@ -166,7 +166,7 @@ class G4Trd : public G4CSGSolid
   private:
 
     G4double halfCarTolerance;
-    G4double fDx1,fDx2,fDy1,fDy2,fDz;
+    G4double fDx1,fDx2,fDy1,fDy2,fDz,fHx,fHy;
     struct { G4double a,b,c,d; } fPlanes[4];
 };