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/G4EllipticalCone.icc
+4 -4
View File
@@ -24,8 +24,7 @@
// ********************************************************************
//
//
// $Id: G4EllipticalCone.icc,v 1.7 2008-11-21 09:26:22 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
// $Id$
//
//
// --------------------------------------------------------------------
@@ -97,11 +96,12 @@ G4double G4EllipticalCone::GetCubicVolume()
{
if (zTopCut > +zheight )
{
fCubicVolume = (8./3.)*pi*xSemiAxis*ySemiAxis*zheight*zheight*zheight;
fCubicVolume = (8./3.)*CLHEP::pi*xSemiAxis*
ySemiAxis*zheight*zheight*zheight;
}
else
{
fCubicVolume = pi*xSemiAxis*ySemiAxis*
fCubicVolume = CLHEP::pi*xSemiAxis*ySemiAxis*
(2./3.*std::pow(zTopCut,3.)+2.*sqr(zheight)*zTopCut);
}
}