Changeset 921 for trunk/source/geometry/solids/CSG/include/G4Tubs.hh

Timestamp:

Feb 16, 2009, 10:14:30 AM (15 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

File:

• trunk/source/geometry/solids/CSG/include/G4Tubs.hh (modified) (8 diffs)

trunk/source/geometry/solids/CSG/include/G4Tubs.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4Tubs.hh,v 1.17 2007/05/18 07:38:00 gcosmo Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4Tubs.hh,v 1.21 2008/11/06 10:55:40 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // 
@@ -39 +39 @@
 //   A tube or tube segment with curved sides parallel to
 //   the z-axis. The tube has a specified half-length along
-//   the z axis, about which it is centred, and a given
+//   the z-axis, about which it is centered, and a given
 //   minimum and maximum radius. A minimum radius of 0
-//   signifies a filled tube /cylinder. The tube segment is
+//   corresponds to filled tube /cylinder. The tube segment is
 //   specified by starting and delta angles for phi, with 0
 //   being the +x axis, PI/2 the +y axis.
@@ -57 +57 @@
 //
 //   fDPhi  Delta angle of the segment.
+//
+//   fPhiFullTube   Boolean variable used for indicate the Phi Section
 
 // History:
@@ -103 +105 @@
     inline void SetStartPhiAngle (G4double newSPhi);
     inline void SetDeltaPhiAngle (G4double newDPhi);
-
+    
     // Methods for solid
 
@@ -144 +146 @@
 
     G4Tubs(__void__&);
+      //
       // Fake default constructor for usage restricted to direct object
       // persistency for clients requiring preallocation of memory for
@@ -164 +167 @@
       // for G4VSolid:: ClipCrossSection and ClipBetweenSections
 
-    G4double fRMin,fRMax,fDz,fSPhi,fDPhi;
-
-    // Used by distanceToOut
+    G4double fRMin, fRMax, fDz, fSPhi, fDPhi;
+    G4bool fPhiFullTube;
+   
+      // Used by distanceToOut
 
     enum ESide {kNull,kRMin,kRMax,kSPhi,kEPhi,kPZ,kMZ};
 
-    // used by normal
+      // Used by normal
 
     enum ENorm {kNRMin,kNRMax,kNSPhi,kNEPhi,kNZ};
@@ -176 +180 @@
   private:
 
+    inline void Initialize();
+      //
+      // Reset relevant values to zero
+
+    inline void InitializeTrigonometry();
+      //
+      // Recompute relevant trigonometric values and cache them
+
     G4ThreeVector ApproxSurfaceNormal( const G4ThreeVector& p ) const;
+      //
       // Algorithm for SurfaceNormal() following the original
       // specification for points not on the surface
@@ -183 +196 @@
 
     G4double kRadTolerance, kAngTolerance;
+      //
       // Radial and angular tolerances
+
+    G4double sinCPhi, cosCPhi, cosHDPhiOT, cosHDPhiIT,
+             sinSPhi, cosSPhi, sinEPhi, cosEPhi;
+      //
+      // Cached trigonometric values
 };