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

Import Geant4 7.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 11:11:55 +02:00
parent e083ffb441
commit 516dbf1a58
5914 changed files with 202605 additions and 71141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/divisions/src/G4ParameterisationPolyhedra.cc
+6 -6
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParameterisationPolyhedra.cc,v 1.8 2004/05/17 07:20:41 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4ParameterisationPolyhedra.cc,v 1.10 2004/12/10 16:20:21 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-05 $
//
// class G4ParameterisationPolyhedra Implementation file
//
@@ -105,10 +105,10 @@ ConvertRadiusFactor(const G4Polyhedra& phedra) const
G4double phiTotal = phedra.GetEndPhi() - phedra.GetStartPhi();
G4int nofSides = phedra.GetOriginalParameters()->numSide;
if ( (phiTotal <=0) || (phiTotal > 2*M_PI+kAngTolerance) )
phiTotal = 2*M_PI;
if ( (phiTotal <=0) || (phiTotal > 2*pi+kAngTolerance) )
phiTotal = 2*pi;
return cos(0.5*phiTotal/nofSides);
return std::cos(0.5*phiTotal/nofSides);
}
//--------------------------------------------------------------------------
@@ -461,7 +461,7 @@ G4double G4ParameterisationPolyhedraZ::GetMaxParameter() const
{
G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
G4PolyhedraHistorical* origparamMother = msol->GetOriginalParameters();
return abs (origparamMother->Z_values[origparamMother->Num_z_planes-1]
return std::abs (origparamMother->Z_values[origparamMother->Num_z_planes-1]
-origparamMother->Z_values[0]);
}