Changeset 850 for trunk/source/geometry/solids/specific/include

Timestamp:

Sep 10, 2008, 5:40:37 PM (16 years ago)

Author:

garnier

Message:

geant4.8.2 beta

Location:

trunk/source/geometry/solids/specific/include

Files:

• G4ClippablePolygon.hh (modified) (1 diff)
• G4ClippablePolygon.icc (modified) (1 diff)
• G4Ellipsoid.hh (modified) (1 diff)
• G4Ellipsoid.icc (modified) (1 diff)
• G4EllipticalCone.hh (modified) (1 diff)
• G4EllipticalCone.icc (modified) (1 diff)
• G4EllipticalTube.hh (modified) (1 diff)
• G4EllipticalTube.icc (modified) (1 diff)
• G4EnclosingCylinder.hh (modified) (1 diff)
• G4ExtrudedSolid.hh (modified) (1 diff)
• G4ExtrudedSolid.icc (modified) (1 diff)
• G4Hype.hh (modified) (1 diff)
• G4Hype.icc (modified) (1 diff)
• G4IntersectingCone.hh (modified) (1 diff)
• G4Paraboloid.hh (modified) (1 diff)
• G4Paraboloid.icc (modified) (1 diff)
• G4PolyPhiFace.hh (modified) (6 diffs)
• G4PolyPhiFace.icc (modified) (1 diff)
• G4Polycone.hh (modified) (2 diffs)
• G4Polycone.icc (modified) (1 diff)
• G4PolyconeSide.hh (modified) (4 diffs)
• G4Polyhedra.hh (modified) (1 diff)
• G4Polyhedra.icc (modified) (1 diff)
• G4PolyhedraSide.hh (modified) (4 diffs)
• G4QuadrangularFacet.hh (modified) (1 diff)
• G4ReduciblePolygon.hh (modified) (1 diff)
• G4SolidExtentList.hh (modified) (1 diff)
• G4TessellatedGeometryAlgorithms.hh (modified) (1 diff)
• G4TessellatedGeometryAlgorithms.icc (modified) (1 diff)
• G4TessellatedSolid.hh (modified) (1 diff)
• G4Tet.hh (modified) (1 diff)
• G4TriangularFacet.hh (modified) (1 diff)
• G4TwistTrapFlatSide.hh (modified) (1 diff)
• G4TwistTubsFlatSide.hh (modified) (1 diff)
• G4TwistTubsHypeSide.hh (modified) (1 diff)
• G4TwistTubsSide.hh (modified) (1 diff)
• G4TwistedBox.hh (modified) (1 diff)
• G4TwistedTrap.hh (modified) (1 diff)
• G4TwistedTrd.hh (modified) (1 diff)
• G4TwistedTubs.hh (modified) (1 diff)
• G4VCSGface.hh (modified) (2 diffs)
• G4VCSGfaceted.hh (modified) (2 diffs)
• G4VFacet.hh (modified) (1 diff)
• G4VFacet.icc (modified) (1 diff)
• G4VTwistSurface.hh (modified) (1 diff)
• G4VTwistSurface.icc (modified) (1 diff)
• G4VTwistedFaceted.hh (modified) (1 diff)

trunk/source/geometry/solids/specific/include/G4ClippablePolygon.hh

@@ -26 +26 @@
 //
 // $Id: G4ClippablePolygon.hh,v 1.11 2007/05/11 13:54:28 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 //

trunk/source/geometry/solids/specific/include/G4ClippablePolygon.icc

@@ -26 +26 @@
 //
 // $Id: G4ClippablePolygon.icc,v 1.4 2006/06/29 18:46:41 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // --------------------------------------------------------------------

trunk/source/geometry/solids/specific/include/G4Ellipsoid.hh

@@ -26 +26 @@
 //
 // $Id: G4Ellipsoid.hh,v 1.12 2007/05/18 07:39:56 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 //

trunk/source/geometry/solids/specific/include/G4Ellipsoid.icc

@@ -26 +26 @@
 //
 // $Id: G4Ellipsoid.icc,v 1.7 2006/10/20 13:45:20 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 //

trunk/source/geometry/solids/specific/include/G4EllipticalCone.hh

@@ -26 +26 @@
 //
 // $Id: G4EllipticalCone.hh,v 1.11 2007/08/20 15:21:40 tnikitin Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 //

trunk/source/geometry/solids/specific/include/G4EllipticalCone.icc

@@ -26 +26 @@
 //
 // $Id: G4EllipticalCone.icc,v 1.6 2006/10/20 13:45:20 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 //

trunk/source/geometry/solids/specific/include/G4EllipticalTube.hh

@@ -26 +26 @@
 //
 // $Id: G4EllipticalTube.hh,v 1.18 2006/10/20 13:45:20 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // --------------------------------------------------------------------

trunk/source/geometry/solids/specific/include/G4EllipticalTube.icc

@@ -26 +26 @@
 //
 // $Id: G4EllipticalTube.icc,v 1.4 2006/06/29 18:46:55 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // --------------------------------------------------------------------

trunk/source/geometry/solids/specific/include/G4EnclosingCylinder.hh

@@ -26 +26 @@
 //
 // $Id: G4EnclosingCylinder.hh,v 1.8 2006/06/29 18:46:58 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 //

trunk/source/geometry/solids/specific/include/G4ExtrudedSolid.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4ExtrudedSolid.hh,v 1.6.2.1 2008/04/23 08:10:24 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ExtrudedSolid.hh,v 1.7 2008/02/27 12:32:48 ivana Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4ExtrudedSolid.icc

@@ -26 +26 @@
 //
 // $Id: G4ExtrudedSolid.icc,v 1.2 2007/02/19 10:17:45 ivana Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // --------------------------------------------------------------------

trunk/source/geometry/solids/specific/include/G4Hype.hh

@@ -27 +27 @@
 // $Id: G4Hype.hh,v 1.15 2006/10/20 13:45:20 gcosmo Exp $
 // $Original: G4Hype.hh,v 1.0 1998/06/09 16:57:50 safai Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4Hype.icc

@@ -26 +26 @@
 //
 // $Id: G4Hype.icc,v 1.7 2006/06/29 18:47:03 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // --------------------------------------------------------------------

trunk/source/geometry/solids/specific/include/G4IntersectingCone.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4IntersectingCone.hh,v 1.9.8.1 2008/04/28 09:03:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4IntersectingCone.hh,v 1.11 2008/04/28 08:59:47 gcosmo Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4Paraboloid.hh

@@ -26 +26 @@
 //
 // $Id: G4Paraboloid.hh,v 1.4 2008/01/22 17:42:09 tnikitin Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 //

trunk/source/geometry/solids/specific/include/G4Paraboloid.icc

@@ -26 +26 @@
 //
 // $Id: G4Paraboloid.icc,v 1.4 2007/08/21 12:58:36 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 //

trunk/source/geometry/solids/specific/include/G4PolyPhiFace.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4PolyPhiFace.hh,v 1.10 2007/05/11 13:54:28 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4PolyPhiFace.hh,v 1.12 2008/05/15 11:41:58 gcosmo Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // 
@@ -58 +58 @@
 
 #include "G4VCSGface.hh"
+#include "G4TwoVector.hh"
 
 class G4ReduciblePolygon;
@@ -67 +68 @@
            zNorm;        // r/z normal
   G4ThreeVector norm3D;  // 3D normal
+
+  // Needed for Triangulation Algorithm
+  //
+  G4bool ear;
+  G4PolyPhiFaceVertex *next,*prev;
 };
 
@@ -122 +128 @@
       // Allocates on the heap a clone of this face.
 
+    G4double SurfaceArea();
+    G4double SurfaceTriangle( G4ThreeVector p1, G4ThreeVector p2,
+                              G4ThreeVector p3, G4ThreeVector* p4);
+    G4ThreeVector GetPointOnFace();
+      // Auxiliary methods for determination of points on surface.
+
   public:  // without description
 
@@ -158 +170 @@
   protected:
 
+    // Functions used for Triangulation in Case of generic Polygone.
+    // The triangulation is used for GetPointOnFace()
+
+    G4double Area2( G4TwoVector a, G4TwoVector b, G4TwoVector c);
+      // Calculation of 2*Area of Triangle with Sign
+
+    G4bool Left( G4TwoVector a, G4TwoVector b, G4TwoVector c );
+    G4bool LeftOn( G4TwoVector a, G4TwoVector b, G4TwoVector c );
+    G4bool Collinear( G4TwoVector a, G4TwoVector b, G4TwoVector c );
+      // Boolean functions for sign of Surface
+
+    G4bool IntersectProp( G4TwoVector a, G4TwoVector b,
+                          G4TwoVector c, G4TwoVector d );
+      // Boolean function for finding proper intersection of two
+      // line segments (a,b) and (c,d).
+
+    G4bool Between( G4TwoVector a, G4TwoVector b, G4TwoVector c );
+      // Boolean function for determining if point c is between a and b
+      // where the three points (a,b,c) are on the same line.
+
+    G4bool Intersect( G4TwoVector a, G4TwoVector b,
+                      G4TwoVector c, G4TwoVector d );
+      // Boolean function for finding proper intersection or not
+      // of two line segments (a,b) and (c,d).
+
+    G4bool Diagonalie( G4PolyPhiFaceVertex *a, G4PolyPhiFaceVertex *b );
+      // Boolean Diagonalie help to determine if diagonal s
+      // of segment (a,b) is convex or reflex.
+
+    G4bool InCone( G4PolyPhiFaceVertex *a, G4PolyPhiFaceVertex *b );
+      // Boolean function for determining if b is inside the cone (a0,a,a1)
+      // where a is the center of the cone.
+
+    G4bool Diagonal( G4PolyPhiFaceVertex *a, G4PolyPhiFaceVertex *b );
+      // Boolean function for determining if Diagonal is possible
+      // inside Polycone or PolyHedra.
+
+    void EarInit();
+      // Initialisation for Triangulisation by ear tips.
+      // For details see "Computational Geometry in C" by Joseph O'Rourke.
+
+    void Triangulate();
+      // Triangulisation by ear tips for Polycone or Polyhedra.
+      // For details see "Computational Geometry in C" by Joseph O'Rourke.
+      // NOTE: a copy of the shape is made and this copy is reordered in
+      //       order to have a list of triangles. This list is used by the
+      //       method GetPointOnFace().
+
+  protected:
+
     G4int      numEdges;            // Number of edges
     G4PolyPhiFaceEdge   *edges;     // The edges of the face
@@ -164 +226 @@
     G4ThreeVector    radial;        // Unit vector along radial direction
     G4ThreeVector    surface;       // Point on surface
+    G4ThreeVector    surface_point; // Auxiliary point on surface used for
+                                    // method GetPointOnFace() 
     G4double   rMin, rMax, // Extent in r
                zMin, zMax; // Extent in z
     G4bool      allBehind; // True if the polycone/polyhedra
                            // is behind the place of this face
-    G4double   kCarTolerance;       // Surface thickness
+    G4double   kCarTolerance;// Surface thickness
+    G4double   fSurfaceArea; // Surface Area of PolyPhiFace 
+    G4PolyPhiFaceVertex *triangles; // Auxiliary pointer to 'corners' used for
+                                    // triangulation. Copy structure, changing
+                                    // the structure of 'corners' (ear removal)
 };
 

trunk/source/geometry/solids/specific/include/G4PolyPhiFace.icc

@@ -26 +26 @@
 //
 // $Id: G4PolyPhiFace.icc,v 1.6 2006/06/29 18:47:10 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4Polycone.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4Polycone.hh,v 1.20 2007/04/26 06:18:20 tnikitin Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4Polycone.hh,v 1.22 2008/05/15 13:45:15 gcosmo Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // 
@@ -116 +116 @@
 
   G4ThreeVector GetPointOnSurface() const;
-  
+
   void ComputeDimensions(       G4VPVParameterisation* p,
                           const G4int n,

trunk/source/geometry/solids/specific/include/G4Polycone.icc

@@ -26 +26 @@
 //
 // $Id: G4Polycone.icc,v 1.10 2006/06/29 18:47:14 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // --------------------------------------------------------------------

trunk/source/geometry/solids/specific/include/G4PolyconeSide.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4PolyconeSide.hh,v 1.10 2007/08/13 10:33:03 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4PolyconeSide.hh,v 1.12 2008/05/15 11:41:58 gcosmo Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // 
@@ -101 +101 @@
 
     G4VCSGface *Clone() { return new G4PolyconeSide( *this ); }
+
+    G4double SurfaceArea();
+    G4ThreeVector GetPointOnFace();
   
   public:  // without description
@@ -130 +133 @@
              zNormEdge[2];  // Normal to edges
 
-    //(WP) 
-    int ncorners;
+    G4int ncorners;
     G4ThreeVector *corners; // The coordinates of the corners (if phiIsOpen)
 
@@ -151 +153 @@
 
     G4double kCarTolerance; // Geometrical surface thickness
+    G4double fSurfaceArea;  // Used for surface calculation 
 };
 

trunk/source/geometry/solids/specific/include/G4Polyhedra.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4Polyhedra.hh,v 1.17 2007/01/22 12:58:53 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4Polyhedra.hh,v 1.20 2008/05/15 13:45:15 gcosmo Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4Polyhedra.icc

@@ -26 +26 @@
 //
 // $Id: G4Polyhedra.icc,v 1.11 2007/01/22 12:58:53 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // --------------------------------------------------------------------

trunk/source/geometry/solids/specific/include/G4PolyhedraSide.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4PolyhedraSide.hh,v 1.9 2007/05/11 13:54:28 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4PolyhedraSide.hh,v 1.11 2008/05/15 11:41:59 gcosmo Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // 
@@ -70 +70 @@
 {
 
-  public:
+  public:  // with description
 
     G4PolyhedraSide( const G4PolyhedraSideRZ *prevRZ,
@@ -104 +104 @@
 
     G4VCSGface *Clone() { return new G4PolyhedraSide( *this ); }
-  
+
+  public:  // without description
+
+    // Methods used for GetPointOnSurface()
+
+    G4double SurfaceTriangle( G4ThreeVector p1,
+                              G4ThreeVector p2,
+                              G4ThreeVector p3,
+                              G4ThreeVector *p4 );
+    G4ThreeVector GetPointOnPlane( G4ThreeVector p0, G4ThreeVector p1, 
+                                   G4ThreeVector p2, G4ThreeVector p3,
+                                   G4double *Area );
+    G4double SurfaceArea();
+    G4ThreeVector GetPointOnFace();  
+
   public:  // without description
 
@@ -184 +198 @@
 
     G4double kCarTolerance;  // Geometrical surface thickness
+    G4double fSurfaceArea;   // Surface Area 
 };
 

trunk/source/geometry/solids/specific/include/G4QuadrangularFacet.hh

@@ -26 +26 @@
 //
 // $Id: G4QuadrangularFacet.hh,v 1.5 2007/02/26 08:39:13 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

trunk/source/geometry/solids/specific/include/G4ReduciblePolygon.hh

@@ -26 +26 @@
 //
 // $Id: G4ReduciblePolygon.hh,v 1.9 2006/06/29 18:47:29 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4SolidExtentList.hh

@@ -26 +26 @@
 //
 // $Id: G4SolidExtentList.hh,v 1.7 2006/06/29 18:47:32 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4TessellatedGeometryAlgorithms.hh

@@ -25 +25 @@
 //
 // $Id:
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

trunk/source/geometry/solids/specific/include/G4TessellatedGeometryAlgorithms.icc

@@ -25 +25 @@
 //
 // $Id:
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

trunk/source/geometry/solids/specific/include/G4TessellatedSolid.hh

@@ -26 +26 @@
 //
 // $Id: G4TessellatedSolid.hh,v 1.10 2007/12/10 16:30:13 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

trunk/source/geometry/solids/specific/include/G4Tet.hh

@@ -30 +30 @@
 //
 // $Id: G4Tet.hh,v 1.9 2006/11/13 08:58:03 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 //

trunk/source/geometry/solids/specific/include/G4TriangularFacet.hh

@@ -26 +26 @@
 //
 // $Id: G4TriangularFacet.hh,v 1.8 2007/12/10 16:30:18 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

trunk/source/geometry/solids/specific/include/G4TwistTrapFlatSide.hh

@@ -26 +26 @@
 //
 // $Id: G4TwistTrapFlatSide.hh,v 1.5 2006/06/29 18:47:48 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4TwistTubsFlatSide.hh

@@ -26 +26 @@
 //
 // $Id: G4TwistTubsFlatSide.hh,v 1.5 2006/06/29 18:47:53 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4TwistTubsHypeSide.hh

@@ -26 +26 @@
 //
 // $Id: G4TwistTubsHypeSide.hh,v 1.5 2006/06/29 18:47:56 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4TwistTubsSide.hh

@@ -26 +26 @@
 //
 // $Id: G4TwistTubsSide.hh,v 1.5 2006/06/29 18:47:58 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4TwistedBox.hh

@@ -26 +26 @@
 //
 // $Id: G4TwistedBox.hh,v 1.10 2006/06/29 18:48:00 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4TwistedTrap.hh

@@ -26 +26 @@
 //
 // $Id: G4TwistedTrap.hh,v 1.10 2006/06/29 18:48:02 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4TwistedTrd.hh

@@ -26 +26 @@
 //
 // $Id: G4TwistedTrd.hh,v 1.6 2006/06/29 18:48:04 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4TwistedTubs.hh

@@ -26 +26 @@
 //
 // $Id: G4TwistedTubs.hh,v 1.14 2007/05/23 09:32:35 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4VCSGface.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VCSGface.hh,v 1.7 2006/06/29 18:48:08 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4VCSGface.hh,v 1.9 2008/05/15 11:41:59 gcosmo Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // 
@@ -300 +300 @@
 
   virtual G4VCSGface* Clone() = 0;
+
+  virtual G4double SurfaceArea( ) = 0;
+  virtual G4ThreeVector GetPointOnFace() = 0;
 };
 

trunk/source/geometry/solids/specific/include/G4VCSGfaceted.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VCSGfaceted.hh,v 1.13 2006/10/20 13:45:20 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4VCSGfaceted.hh,v 1.17 2008/05/15 13:45:15 gcosmo Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // 
@@ -127 +127 @@
                                  const G4bool outgoing ) const;
 
+    G4ThreeVector GetPointOnSurfaceGeneric()const;
+      // Returns a random point located on the surface of the solid 
+      // in case of generic Polycone or generic Polyhedra.
+
     void CopyStuff( const G4VCSGfaceted &source );
     void DeleteStuff();

trunk/source/geometry/solids/specific/include/G4VFacet.hh

@@ -26 +26 @@
 //
 // $Id: G4VFacet.hh,v 1.6 2007/08/23 14:45:03 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

trunk/source/geometry/solids/specific/include/G4VFacet.icc

@@ -26 +26 @@
 //
 // $Id: G4VFacet.icc,v 1.5 2007/08/23 14:45:03 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

trunk/source/geometry/solids/specific/include/G4VTwistSurface.hh

@@ -26 +26 @@
 //
 // $Id: G4VTwistSurface.hh,v 1.6 2007/05/11 13:54:28 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4VTwistSurface.icc

@@ -26 +26 @@
 //
 // $Id: G4VTwistSurface.icc,v 1.3 2006/06/29 18:48:20 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // 

trunk/source/geometry/solids/specific/include/G4VTwistedFaceted.hh

@@ -26 +26 @@
 //
 // $Id: G4VTwistedFaceted.hh,v 1.10 2006/10/20 13:45:20 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 // 
 // --------------------------------------------------------------------