Changeset 921 for trunk/source/graphics_reps/src/HepPolyhedron.cc

Timestamp:

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

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

File:

• trunk/source/graphics_reps/src/HepPolyhedron.cc (modified) (4 diffs)

trunk/source/graphics_reps/src/HepPolyhedron.cc

@@ -25 +25 @@
 //
 //
-// $Id: HepPolyhedron.cc,v 1.31 2008/04/28 16:06:06 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: HepPolyhedron.cc,v 1.32 2008/11/13 09:05:27 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // 
@@ -1630 +1630 @@
   if (sqrtan1<0.||sqrtan2<0.) k += 4;  
  
-  if (k != 0) {
+  if (k != 0)
+  {
     std::cerr << "HepPolyhedronHype: error in input parameters";
     if ((k & 1) != 0) std::cerr << " (radiuses)";
@@ -1650 +1651 @@
   double k2 = r2*r2;
 
-  double *zz = new double[n + n], *rr = new double[n + n];
+  double *zz = new double[n+n+1], *rr = new double[n+n+1];
 
   zz[0] = halfZ;
   rr[0] = std::sqrt(sqrtan2*halfZ*halfZ+k2);
 
-  for(int i = 1; i < n - 1; i++)
+  for(int i = 1; i < n-1; i++)
   {
     zz[i] = zz[i-1] - dz;
-    rr[i] =std::sqrt(sqrtan2*zz[i]*zz[i]+k2) ;
-    
+    rr[i] =std::sqrt(sqrtan2*zz[i]*zz[i]+k2);
   }
 
@@ -1665 +1665 @@
   rr[n-1] = rr[0];
 
-
   zz[n] = halfZ;
   rr[n] =  std::sqrt(sqrtan1*halfZ*halfZ+k1);
-   for(int i = n+1; i < n +n; i++)
+
+  for(int i = n+1; i < n+n; i++)
   {
     zz[i] = zz[i-1] - dz;
-    rr[i] =std::sqrt(sqrtan1*zz[i]*zz[i]+k1) ;
-    
+    rr[i] =std::sqrt(sqrtan1*zz[i]*zz[i]+k1);
   }
   zz[n+n] = -halfZ;