lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 9.6.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 17:01:34 +02:00
parent b1eb5424d2
commit e2d2f9810a
10384 changed files with 698580 additions and 628834 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/specific/include/G4Paraboloid.icc
+5 -6
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4Paraboloid.icc,v 1.4 2007-08-21 12:58:36 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// --------------------------------------------------------------------
@@ -126,7 +125,7 @@ G4double G4Paraboloid::GetCubicVolume()
if(fCubicVolume != 0 ) {;}
else
{
fCubicVolume = pi * 2. * k2 * dz;
fCubicVolume = CLHEP::twopi * k2 * dz;
}
return fCubicVolume;
}
@@ -145,7 +144,7 @@ G4double G4Paraboloid::CalculateSurfaceArea() const
A1 = sqr(r2) + 4 * sqr(h1);
A1 *= sqr(A1); // Sets A1 = A1^3
A1 = pi * r2 /6 / sqr(h1) * ( std::sqrt(A1) - r2 * r2 * r2);
A1 = CLHEP::pi * r2 /6 / sqr(h1) * ( std::sqrt(A1) - r2 * r2 * r2);
// Calculate surface area for the paraboloid full paraboloid
// cutoff at z = -dz (not the cutoff area though).
@@ -154,11 +153,11 @@ G4double G4Paraboloid::CalculateSurfaceArea() const
A2 *= sqr(A2);// Sets A2 = A2^3
if(h2 != 0)
{ A2 = pi * r1 /6 / sqr(h2) * ( std::sqrt(A2) - r1 * r1 * r1); }
{ A2 = CLHEP::pi * r1 /6 / sqr(h2) * ( std::sqrt(A2) - r1 * r1 * r1); }
else
{ A2 = 0.; }
return fSurfaceArea = A1 - A2 + (sqr(r1) + sqr(r2))*pi;
return fSurfaceArea = A1 - A2 + (sqr(r1) + sqr(r2))*CLHEP::pi;
}
inline