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

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:

trunk/source/geometry/solids/specific/include

Files:

• G4ExtrudedSolid.hh (modified) (2 diffs)
• G4PolyconeSide.hh (modified) (3 diffs)
• G4PolyhedraSide.hh (modified) (3 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ExtrudedSolid.hh,v 1.7 2008/02/27 12:32:48 ivana Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4ExtrudedSolid.hh,v 1.8 2010/04/15 10:23:34 ivana Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -45 +45 @@
 // const G4String& pName             - solid name
 // std::vector<G4TwoVector> polygon  - the vertices of the outlined polygon
-//                                     defined in clock-wise order     
+//                                     defined in clockwise or anti-clockwise order     
 // std::vector<ZSection>             - the z-sections defined by
 //                                     z position, offset and scale

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

@@ -25 +25 @@
 //
 //
-// $Id: G4PolyconeSide.hh,v 1.12 2008/05/15 11:41:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4PolyconeSide.hh,v 1.13 2010/02/24 11:18:25 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -114 +114 @@
   protected:
 
+    G4double DistanceAway( const G4ThreeVector &p, G4bool opposite,
+                                 G4double &distOutside2, G4double *rzNorm=0 );
+      
+    G4bool PointOnCone( const G4ThreeVector &hit, G4double normSign,
+                        const G4ThreeVector &p,
+                        const G4ThreeVector &v, G4ThreeVector &normal );
+
+    void CopyStuff( const G4PolyconeSide &source );
+  
+    static void FindLineIntersect( G4double x1, G4double y1,
+                                   G4double tx1, G4double ty1,
+                                   G4double x2, G4double y2,
+                                 G4double tx2, G4double ty2,
+                                 G4double &x, G4double &y );
+
+    G4double GetPhi( const G4ThreeVector& p );
+
+  protected:
+
     G4double r[2], z[2]; // r, z parameters, in specified order
     G4double startPhi,   // Start phi (0 to 2pi), if phiIsOpen
@@ -136 +155 @@
     G4ThreeVector *corners; // The coordinates of the corners (if phiIsOpen)
 
-    G4double DistanceAway( const G4ThreeVector &p, G4bool opposite,
-                                 G4double &distOutside2, G4double *rzNorm=0 );
-      
-    G4bool PointOnCone( const G4ThreeVector &hit, G4double normSign,
-                        const G4ThreeVector &p,
-                        const G4ThreeVector &v, G4ThreeVector &normal );
-
-    void CopyStuff( const G4PolyconeSide &source );
-  
-    static void FindLineIntersect( G4double x1, G4double y1,
-                                   G4double tx1, G4double ty1,
-                                   G4double x2, G4double y2,
-                                 G4double tx2, G4double ty2,
-                                 G4double &x, G4double &y );
   private:
 
+    std::pair<G4ThreeVector, G4double> fPhi;  // Cached value for phi
     G4double kCarTolerance; // Geometrical surface thickness
     G4double fSurfaceArea;  // Used for surface calculation 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4PolyhedraSide.hh,v 1.11 2008/05/15 11:41:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4PolyhedraSide.hh,v 1.12 2010/02/24 11:18:25 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -166 +166 @@
   
     G4int PhiSegment( G4double phi );
-  
+
+    G4double GetPhi( const G4ThreeVector& p );
+
     G4double DistanceToOneSide( const G4ThreeVector &p,
                                 const G4PolyhedraSideVec &vec,
@@ -197 +199 @@
   private:
 
+    std::pair<G4ThreeVector, G4double> fPhi;  // Cached value for phi
     G4double kCarTolerance;  // Geometrical surface thickness
     G4double fSurfaceArea;   // Surface Area