Changeset 1315 for trunk/source/geometry/solids/specific/src/G4PolyhedraSide.cc

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

File:

• trunk/source/geometry/solids/specific/src/G4PolyhedraSide.cc (modified) (7 diffs)

trunk/source/geometry/solids/specific/src/G4PolyhedraSide.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4PolyhedraSide.cc,v 1.15 2008/05/15 11:41:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4PolyhedraSide.cc,v 1.17 2010/02/24 11:31:49 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -64 +64 @@
                                         G4bool isAllBehind )
 {
-
   kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
   fSurfaceArea=0.;
+  fPhi.first = G4ThreeVector(0,0,0);
+  fPhi.second= 0.0;
+
   //
   // Record values
@@ -561 +563 @@
   // Try the closest phi segment first
   //
-  G4int iPhi = ClosestPhiSegment( p.phi() );
+  G4int iPhi = ClosestPhiSegment( GetPhi(p) );
   
   G4ThreeVector pdotc = p - vecs[iPhi].center;
@@ -594 +596 @@
   // Which phi segment is closest to this point?
   //
-  G4int iPhi = ClosestPhiSegment( p.phi() );
+  G4int iPhi = ClosestPhiSegment( GetPhi(p) );
   
   G4double norm;
@@ -624 +626 @@
   // Which phi segment is closest to this point?
   //
-  G4int iPhi = ClosestPhiSegment( p.phi() );
+  G4int iPhi = ClosestPhiSegment( GetPhi(p) );
 
   //
@@ -656 +658 @@
   // Which phi segment, if any, does the axis belong to
   //
-  iPhi = PhiSegment( axis.phi() );
+  iPhi = PhiSegment( GetPhi(axis) );
   
   if (iPhi < 0)
@@ -971 +973 @@
 
 //
+// GetPhi
+//
+// Calculate Phi for a given 3-vector (point), if not already cached for the
+// same point, in the attempt to avoid consecutive computation of the same
+// quantity
+//
+G4double G4PolyhedraSide::GetPhi( const G4ThreeVector& p )
+{
+  G4double val=0.;
+
+  if (fPhi.first != p)
+  {
+    val = p.phi();
+    fPhi.first = p;
+    fPhi.second = val;
+  }
+  else
+  {
+    val = fPhi.second;
+  }
+  return val;
+}
+
+
+//
 // DistanceToOneSide
 //