Import Geant4 7.0.0 source tree

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
@@ -22,7 +22,7 @@
//
//
// $Id: G4Assembly.hh,v 1.9 2003/06/16 16:52:21 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4Assembly
@@ -22,7 +22,7 @@
//
//
// $Id: G4Assembly.icc,v 1.3 2001/07/11 09:59:30 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4Axis2Placement3D.hh,v 1.4 2001/07/11 09:59:30 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4Axis2Placement3D
@@ -22,7 +22,7 @@
//
//
// $Id: G4Axis2Placement3D.icc,v 1.7 2001/07/20 11:52:42 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolid.hh,v 1.11 2003/06/16 16:52:22 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4BREPSolid.hh,v 1.14 2004/10/10 10:56:31 johna Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolid
@@ -123,6 +123,9 @@ public: // with description
G4NURBS* CreateNURBS () const;
// Create a G4Polyhedron/G4NURBS/... (It is the caller's responsibility
// to delete it). A null pointer means "not created".
virtual G4Polyhedron* GetPolyhedron () const;
// Smart access function - creates on request and stores for future
// access. A null pointer means "not available".
G4int Intersect(register const G4Ray&) const;
// Gets the roughly calculated closest intersection point for
@@ -140,10 +143,18 @@ public: // with description
inline G4int GetNumberOfSolids() const;
inline const G4Axis2Placement3D* GetPlace() const;
inline const G4BoundingBox3D* GetBBox() const;
inline G4int GetCubVolStatistics() const;
inline G4double GetCubVolEpsilon() const;
inline void SetCubVolStatistics(G4int st);
inline void SetCubVolEpsilon(G4double ep);
// Accessors methods.
public:
inline G4double GetCubicVolume();
// Returns an estimation of the geometrical cubic volume of the
// solid. Caches the computed value once computed the first time.
inline G4double IntersectionDistance() const;
inline void IntersectionDistance(G4double) const;
// Gets and sets intersection distance.
@@ -199,6 +210,12 @@ protected:
private:
G4int fCubVolStatistics;
G4double fCubVolEpsilon;
G4double fCubicVolume;
// Statistics, error accuracy and cached value for volume.
mutable G4Polyhedron* fpPolyhedron;
G4BREPSolid(const G4BREPSolid&);
G4BREPSolid& operator=(const G4BREPSolid&);
// Private copy constructor and assignment operator.
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolid.icc,v 1.4 2001/07/11 09:59:30 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4BREPSolid.icc,v 1.6 2004/09/22 09:52:08 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -138,3 +138,32 @@ inline void G4BREPSolid::QuickSort( register G4Surface** SrfVec,
if( left < j ) QuickSort(SrfVec,left, j );
if( i < right ) QuickSort(SrfVec,i, right);
}
inline G4int G4BREPSolid::GetCubVolStatistics() const
{
return fCubVolStatistics;
}
inline G4double G4BREPSolid::GetCubVolEpsilon() const
{
return fCubVolEpsilon;
}
inline void G4BREPSolid::SetCubVolStatistics(G4int st)
{
fCubVolStatistics=st;
}
inline void G4BREPSolid::SetCubVolEpsilon(G4double ep)
{
fCubVolEpsilon=ep;
}
///////////////////////////////////////////////////
inline G4double G4BREPSolid::GetCubicVolume()
{
if(fCubicVolume != 0.) ;
else fCubicVolume = EstimateCubicVolume(fCubVolStatistics,fCubVolEpsilon);
return fCubicVolume;
}
@@ -22,7 +22,7 @@
//
//
// $Id: G4BREPSolidBox.hh,v 1.7 2003/06/16 16:52:23 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidBox
@@ -22,7 +22,7 @@
//
//
// $Id: G4BREPSolidCone.hh,v 1.9 2003/06/16 16:52:24 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidCone
@@ -22,7 +22,7 @@
//
//
// $Id: G4BREPSolidCylinder.hh,v 1.8 2003/06/16 16:52:25 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidCylinder
@@ -22,7 +22,7 @@
//
//
// $Id: G4BREPSolidOpenPCone.hh,v 1.7 2003/06/16 16:52:26 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidOpenPCone
@@ -22,7 +22,7 @@
//
//
// $Id: G4BREPSolidPCone.hh,v 1.12 2003/06/16 16:52:27 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidPCone
@@ -22,7 +22,7 @@
//
//
// $Id: G4BREPSolidPolyhedra.hh,v 1.12 2003/06/16 16:52:28 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidPolyhedra
@@ -22,7 +22,7 @@
//
//
// $Id: G4BREPSolidSphere.hh,v 1.9 2003/06/16 16:52:29 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidSphere
@@ -22,7 +22,7 @@
//
//
// $Id: G4BREPSolidTorus.hh,v 1.8 2003/06/16 16:52:30 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidTorus
@@ -22,7 +22,7 @@
//
//
// $Id: G4BSplineCurve.hh,v 1.11 2003/06/16 16:52:31 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BSplineCurve
@@ -22,7 +22,7 @@
//
//
// $Id: G4BSplineCurve.icc,v 1.6 2001/07/11 09:59:31 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4BSplineCurveWithKnots.hh,v 1.4 2001/07/11 09:59:31 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BSplineCurveWithKnots
@@ -22,7 +22,7 @@
//
//
// $Id: G4BSplineSurface.hh,v 1.10 2001/07/11 09:59:31 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BSplineSurface
@@ -22,7 +22,7 @@
//
//
// $Id: G4BSplineSurface.icc,v 1.5 2003/03/28 13:11:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4BSplineSurfaceWithKnots.hh,v 1.3 2001/07/11 09:59:31 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BSplineSurfaceWithKnots
@@ -22,7 +22,7 @@
//
//
// $Id: G4BezierSurface.hh,v 1.6 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BezierSurface
@@ -22,7 +22,7 @@
//
//
// $Id: G4BezierSurface.icc,v 1.3 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4BoundingBox3D.hh,v 1.5 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BoundingBox3D
@@ -22,7 +22,7 @@
//
//
// $Id: G4BoundingBox3D.icc,v 1.3 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4CircularCurve.hh,v 1.7 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4CircularCurve
@@ -22,7 +22,7 @@
//
//
// $Id: G4CircularCurve.icc,v 1.5 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4CompositeCurve.hh,v 1.6 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4CompositeCurve
@@ -22,7 +22,7 @@
//
//
// $Id: G4CompositeCurve.icc,v 1.4 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4Conic.hh,v 1.6 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4Conic
@@ -22,7 +22,7 @@
//
//
// $Id: G4Conic.icc,v 1.3 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4ConicalSurface.hh,v 1.9 2003/06/16 16:52:32 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4ConicalSurface
@@ -22,7 +22,7 @@
//
//
// $Id: G4ConicalSurface.icc,v 1.3 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4ControlPoints.hh,v 1.6 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4ControlPoints
@@ -22,7 +22,7 @@
//
//
// $Id: G4ControlPoints.icc,v 1.2 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4ConvexHull.hh,v 1.6 2002/02/26 11:16:55 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4ConvexHull
@@ -22,7 +22,7 @@
//
//
// $Id: G4Curve.hh,v 1.8 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4Curve
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Curve.icc,v 1.5 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4Curve.icc,v 1.6 2004/12/02 09:31:24 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -105,7 +105,7 @@ void G4Curve::SetBoundsRest()
if (pMax>0)
{
// Find the range in the first determination
pRange-= (ceil(pRange/pMax)-1)*pMax;
pRange-= (std::ceil(pRange/pMax)-1)*pMax;
}
bounded= true;
@@ -151,7 +151,7 @@ G4bool G4Curve::IsPOn(G4double param) const
G4double pMax= GetPMax();
if (pMax>0)
diff-= floor(diff/pMax)*pMax;
diff-= std::floor(diff/pMax)*pMax;
return diff<=pRange;
}
@@ -22,7 +22,7 @@
//
//
// $Id: G4CurvePoint.hh,v 1.5 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4CurvePoint
@@ -22,7 +22,7 @@
//
//
// $Id: G4CurvePoint.icc,v 1.3 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4CurveRayIntersection.hh,v 1.4 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4CurveRayIntersection
@@ -22,7 +22,7 @@
//
//
// $Id: G4CurveRayIntersection.icc,v 1.3 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4CurveVector.hh,v 1.6 2003/06/16 16:52:33 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4CurveVector
@@ -22,7 +22,7 @@
//
//
// $Id: G4CylindricalSurface.hh,v 1.9 2003/06/16 16:52:34 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4CylindricalSurface
@@ -22,7 +22,7 @@
//
//
// $Id: G4CylindricalSurface.icc,v 1.3 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4Ellipse.hh,v 1.8 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4Ellipse
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Ellipse.icc,v 1.6 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4Ellipse.icc,v 1.7 2004/12/02 09:31:24 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -76,15 +76,15 @@ G4Point3D G4Ellipse::GetPoint(G4double param) const
{
param-= GetPShift();
return G4Point3D( position.GetLocation()
+ semiAxis1*cos(param)*position.GetPX()
+ semiAxis2*sin(param)*position.GetPY() );
+ semiAxis1*std::cos(param)*position.GetPX()
+ semiAxis2*std::sin(param)*position.GetPY() );
}
inline
G4double G4Ellipse::GetPPoint(const G4Point3D& pt) const
{
G4Point3D ptLocal= position.GetToPlacementCoordinates()*pt;
G4double angle= atan2(ptLocal.y(), ptLocal.x()*ratioAxis2Axis1);
G4double angle= std::atan2(ptLocal.y(), ptLocal.x()*ratioAxis2Axis1);
G4double r= (angle<0)? angle+twopi: angle;
return r+GetPShift();
}
@@ -117,7 +117,7 @@ void G4Ellipse::IntersectRay2D(const G4Ray& ray,
if (discr >= 0) {
// 2 intersections (maybe 1, but this case is rare)
G4double sqrtdiscr= sqrt(discr);
G4double sqrtdiscr= std::sqrt(discr);
// find the smallest positive i
G4double i= -sd-sqrtdiscr;
if (i<kCarTolerance) {
@@ -157,7 +157,7 @@ G4int G4Ellipse::IntersectRay2D(const G4Ray& ray)
if (discr > 0)
{
// 2 intersections
G4double sqrtdiscr= sqrt(discr);
G4double sqrtdiscr= std::sqrt(discr);
// if i is positive, we have an intersection
i= -sd-sqrtdiscr;
@@ -22,7 +22,7 @@
//
//
// $Id: G4FConicalSurface.hh,v 1.12 2003/06/16 16:52:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4FConicalSurface
@@ -22,7 +22,7 @@
//
//
// $Id: G4FConicalSurface.icc,v 1.3 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4FCylindricalSurface.hh,v 1.12 2003/06/16 16:52:36 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4FCylindricalSurface
@@ -22,7 +22,7 @@
//
//
// $Id: G4FCylindricalSurface.icc,v 1.3 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4FPlane.hh,v 1.12 2002/01/28 16:38:40 radoone Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4FPlane
@@ -22,7 +22,7 @@
//
//
// $Id: G4FPlane.icc,v 1.5 2003/03/28 13:11:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4Globals.hh,v 1.4 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// Author: A.Breakstone
// Adaptation: J.Sulkimo, P.Urban.
@@ -22,7 +22,7 @@
//
//
// $Id: G4Hyperbola.hh,v 1.8 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4Hyperbola
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Hyperbola.icc,v 1.7 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4Hyperbola.icc,v 1.8 2004/12/02 09:31:24 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -73,8 +73,8 @@ inline
G4Point3D G4Hyperbola::GetPoint(G4double param) const
{
return G4Point3D( position.GetLocation()
+ semiAxis*cosh(param)*position.GetPX()
+ semiImagAxis*sinh(param)*position.GetPY() );
+ semiAxis*std::cosh(param)*position.GetPX()
+ semiImagAxis*std::sinh(param)*position.GetPY() );
}
inline
@@ -82,7 +82,7 @@ G4double G4Hyperbola::GetPPoint(const G4Point3D& pt) const
{
G4Point3D ptLocal= position.GetToPlacementCoordinates()*pt;
G4double xval= ptLocal.y()/ptLocal.x()*ratioAxisImagAxis;
return 0.5*log((1+xval)/(1-xval)); // atanh(xval)
return 0.5*std::log((1+xval)/(1-xval)); // atanh(xval)
}
/////////////////////////////////////////////////////////////////////////////
@@ -108,7 +108,7 @@ void G4Hyperbola::IntersectRay2D(const G4Ray& ray,
G4double dd= d.x()*d.x()-d.y()*d.y(); // can be 0
G4double ss= s.x()*s.x()-s.y()*s.y();
if (abs(dd) < kCarTolerance*kCarTolerance) {
if (std::abs(dd) < kCarTolerance*kCarTolerance) {
// coeff of i^2 == 0
G4double i= (1-ss)/(2*sd);
@@ -123,7 +123,7 @@ void G4Hyperbola::IntersectRay2D(const G4Ray& ray,
if (discr >= 0) {
// 2 intersections (maybe 1, but this case is rare)
G4double sqrtdiscr= sqrt(discr);
G4double sqrtdiscr= std::sqrt(discr);
// find the smallest positive i
G4double i= -sd-sqrtdiscr;
if (i<kCarTolerance) {
@@ -158,7 +158,7 @@ G4int G4Hyperbola::IntersectRay2D(const G4Ray& ray)
G4double dd= d.x()*d.x()-d.y()*d.y(); // can be 0
G4double ss= s.x()*s.x()-s.y()*s.y();
if (abs(dd) < kCarTolerance*kCarTolerance) {
if (std::abs(dd) < kCarTolerance*kCarTolerance) {
// coeff of i^2 == 0
return 0;
@@ -171,7 +171,7 @@ G4int G4Hyperbola::IntersectRay2D(const G4Ray& ray)
if (discr >= 0)
{
// 2 intersections (maybe 1, but this case is rare)
G4double sqrtdiscr= sqrt(discr);
G4double sqrtdiscr= std::sqrt(discr);
// find the smallest positive i
G4double i= -sd-sqrtdiscr;
if (i > kCarTolerance)
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4KnotVector.hh,v 1.7 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4KnotVector.hh,v 1.8 2004/12/02 09:31:24 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
// ----------------------------------------------------------------------
// Class G4KnotVector
@@ -37,7 +37,7 @@
#ifndef __KNOTVECTOR_H
#define __KNOTVECTOR_H
#include <math.h>
#include <cmath>
#include "geomdefs.hh"
class G4KnotVector
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4KnotVector.icc,v 1.3 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4KnotVector.icc,v 1.4 2004/12/02 09:31:24 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -53,5 +53,5 @@ void G4KnotVector::PutKnot(G4int knot_number, G4double value)
inline
G4double G4KnotVector::ApxEq(G4double x, G4double y) const
{
return (fabs(x - y) < kCarTolerance);
return (std::fabs(x - y) < kCarTolerance);
}
@@ -22,7 +22,7 @@
//
//
// $Id: G4Line.hh,v 1.7 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4Line
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Line.icc,v 1.7 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4Line.icc,v 1.8 2004/12/02 09:31:24 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -137,9 +137,9 @@ G4int G4Line::IntersectRay2D(const G4Ray& ray)
G4int nbinter = 0;
if (fabs(denom) < kCarTolerance)
if (std::fabs(denom) < kCarTolerance)
{
if (fabs(num1) < kCarTolerance)
if (std::fabs(num1) < kCarTolerance)
{
// identical lines
}
@@ -22,7 +22,7 @@
//
//
// $Id: G4OsloMatrix.hh,v 1.5 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4OsloMatrix
@@ -22,7 +22,7 @@
//
//
// $Id: G4OsloMatrix.icc,v 1.3 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4Parabola.hh,v 1.8 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4Parabola
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Parabola.icc,v 1.6 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// $Id: G4Parabola.icc,v 1.7 2004/12/02 09:31:24 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -100,7 +100,7 @@ void G4Parabola::IntersectRay2D(const G4Ray& ray,
if (discr >= 0) {
// 2 intersections (maybe 1, but this case is rare)
G4double sqrtdiscr= sqrt(discr);
G4double sqrtdiscr= std::sqrt(discr);
// find the smallest positive i
G4double i= -bHalf-sqrtdiscr;
if (i<kCarTolerance) {
@@ -137,7 +137,7 @@ G4int G4Parabola::IntersectRay2D(const G4Ray& ray)
if (discr >= 0)
{
// 2 intersections (maybe 1, but this case is rare)
G4double sqrtdiscr= sqrt(discr);
G4double sqrtdiscr= std::sqrt(discr);
G4double i= -bHalf-sqrtdiscr;
if (i>kCarTolerance)
@@ -22,7 +22,7 @@
//
//
// $Id: G4PlacedSolid.hh,v 1.9 2003/06/16 16:52:37 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4PlacedSolid
@@ -22,7 +22,7 @@
//
//
// $Id: G4PlacedSolid.icc,v 1.7 2003/06/16 16:52:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4PlacementVector.hh,v 1.6 2003/06/16 16:52:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4PlacementVector
@@ -22,7 +22,7 @@
//
//
// $Id: G4Plane.hh,v 1.5 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4Plane
@@ -22,7 +22,7 @@
//
//
// $Id: G4Point3DVector.hh,v 1.7 2003/06/16 16:52:40 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4Point3DVector
@@ -22,7 +22,7 @@
//
//
// $Id: G4PointRat.hh,v 1.9 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4PointRat
@@ -22,7 +22,7 @@
//
//
// $Id: G4PointRat.icc,v 1.3 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4ProjectedSurface.hh,v 1.6 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4ProjectedSurface
@@ -22,7 +22,7 @@
//
//
// $Id: G4ProjectedSurface.icc,v 1.4 2003/03/28 13:11:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4Ray.hh,v 1.8 2003/03/28 13:11:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4Ray
@@ -22,7 +22,7 @@
//
//
// $Id: G4Ray.icc,v 1.6 2002/11/21 16:52:53 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4RectangularTrimmedSurface.hh,v 1.7 2001/07/11 09:59:37 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4BezierSurface
@@ -22,7 +22,7 @@
//
//
// $Id: G4STEPEntity.hh,v 1.6 2001/07/11 09:59:37 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4STEPEntity
@@ -22,7 +22,7 @@
//
//
// $Id: G4Sort.hh,v 1.4 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
//
@@ -22,7 +22,7 @@
//
//
// $Id: G4SphericalSurface.hh,v 1.9 2003/06/16 16:52:41 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4SphericalSurface
@@ -22,7 +22,7 @@
//
//
// $Id: G4SphericalSurface.icc,v 1.3 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4Surface.hh,v 1.8 2002/11/21 16:52:53 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4Surface
@@ -22,7 +22,7 @@
//
//
// $Id: G4Surface.icc,v 1.4 2002/11/21 16:52:53 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4SurfaceBoundary.hh,v 1.6 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4SurfaceBoundary
@@ -22,7 +22,7 @@
//
//
// $Id: G4SurfaceBoundary.icc,v 1.4 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4SurfaceList.hh,v 1.5 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4SurfaceList
@@ -22,7 +22,7 @@
//
//
// $Id: G4SurfaceOfLinearExtrusion.hh,v 1.4 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4SurfaceOfLinearExtrusion
@@ -22,7 +22,7 @@
//
//
// $Id: G4SurfaceOfRevolution.hh,v 1.4 2001/07/11 09:59:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4SurfaceOfRevolution
@@ -22,7 +22,7 @@
//
//
// $Id: G4ThreeMat.hh,v 1.9 2003/06/16 16:52:42 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4ThreeMat
@@ -22,7 +22,7 @@
//
//
// $Id: G4ToroidalSurface.hh,v 1.6 2001/07/11 09:59:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4ToroidalSurface
@@ -22,7 +22,7 @@
//
//
// $Id: G4ToroidalSurface.icc,v 1.3 2001/07/11 09:59:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -22,7 +22,7 @@
//
//
// $Id: G4UVHit.hh,v 1.6 2001/07/11 09:59:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ----------------------------------------------------------------------
// Class G4UVHit