Import Geant4 9.2.0 source tree

This commit is contained in:
Gabriele Cosmo
2016-06-09 15:58:43 +02:00
parent 96c8bcd0af
commit b79225fb37
7544 changed files with 245407 additions and 91099 deletions
+14 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.67 2007/07/16 08:07:29 gcosmo Exp $
$Id: History,v 1.70 2008/07/08 10:01:13 gcosmo Exp $
----------------------------------------------------------------------------
=========================================================
@@ -17,6 +17,19 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
08/07/2008 : G. Cosmo breps-V09-01-02
- Replaced exit() statement with G4Exception in G4Ray.
13/03/2008 : G. Cosmo breps-V09-01-01
- Cleared compilation warnings on gcc-4.3.0 for ambiguous use of parentheses
in condition statements, if-else constructs and empty for-loops.
22/01/2008 : T. Nikitina breps-V09-01-00
- Fixed bug in G4BREPSolidPolyhedra::DistanceToOut() for cases of particle
passing the border of two touching surfaces.
- G4BREPSolidBox: fixed problem in the constructor in definition of the
side for the normal to surface.
16/07/2007 : G. Cosmo breps-V09-00-00
- Added missing initialisations of kCarTolerance in alternative constructors
for G4BoundingBox3D, G4Curve, G4CurveRayIntersection, G4KnotVector.
@@ -25,7 +25,7 @@
//
//
// $Id: G4Assembly.hh,v 1.10 2006/06/29 18:37:33 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4Assembly
@@ -25,7 +25,7 @@
//
//
// $Id: G4Assembly.icc,v 1.4 2006/06/29 18:37:35 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4Axis2Placement3D.hh,v 1.5 2006/06/29 18:37:38 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4Axis2Placement3D
@@ -25,7 +25,7 @@
//
//
// $Id: G4Axis2Placement3D.icc,v 1.9 2006/06/29 18:37:41 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4BREPSolid.hh,v 1.17 2006/10/19 15:35:36 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolid
@@ -25,7 +25,7 @@
//
//
// $Id: G4BREPSolid.icc,v 1.9 2006/10/20 14:23:19 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidBox.hh,v 1.9 2006/06/29 18:37:48 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// $Id: G4BREPSolidBox.hh,v 1.10 2008/01/22 16:03:13 tnikitin Exp $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidBox
@@ -39,7 +39,18 @@
// const G4Point3D& Pt3, const G4Point3D& Pt4,
// const G4Point3D& Pt5, const G4Point3D& Pt6,
// const G4Point3D& Pt7, const G4Point3D& Pt8)
// Points have to be given in following way:
// First for YZ plane with X fixed to negative value, then
// for YZ plane with X xixed to positive value
// Examle :
// const G4Point3D Pt1(-x,-y,-z);
// const G4Point3D Pt2(-x,-y, z);
// const G4Point3D Pt3(-x, y, z);
// const G4Point3D Pt4(-x, y,-z);
// const G4Point3D Pt5( x,-y,-z);
// const G4Point3D Pt6( x,-y, z);
// const G4Point3D Pt7( x, y, z);
// const G4Point3D Pt8( x, y,-z);
// Authors: J.Sulkimo, P.Urban.
// Revisions by: L.Broglia, G.Cosmo.
// ----------------------------------------------------------------------
@@ -25,7 +25,7 @@
//
//
// $Id: G4BREPSolidCone.hh,v 1.11 2006/06/29 18:37:51 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidCone
@@ -25,7 +25,7 @@
//
//
// $Id: G4BREPSolidCylinder.hh,v 1.10 2006/06/29 18:37:53 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidCylinder
@@ -25,7 +25,7 @@
//
//
// $Id: G4BREPSolidOpenPCone.hh,v 1.9 2006/06/29 18:37:55 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidOpenPCone
@@ -25,7 +25,7 @@
//
//
// $Id: G4BREPSolidPCone.hh,v 1.14 2006/06/29 18:37:57 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidPCone
@@ -25,7 +25,7 @@
//
//
// $Id: G4BREPSolidPolyhedra.hh,v 1.14 2006/06/29 18:37:59 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidPolyhedra
@@ -25,7 +25,7 @@
//
//
// $Id: G4BREPSolidSphere.hh,v 1.11 2006/06/29 18:38:01 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidSphere
@@ -25,7 +25,7 @@
//
//
// $Id: G4BREPSolidTorus.hh,v 1.10 2006/06/29 18:38:03 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidTorus
@@ -25,7 +25,7 @@
//
//
// $Id: G4BSplineCurve.hh,v 1.13 2006/06/29 18:38:05 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BSplineCurve
@@ -25,7 +25,7 @@
//
//
// $Id: G4BSplineCurve.icc,v 1.7 2006/06/29 18:38:07 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4BSplineCurveWithKnots.hh,v 1.5 2006/06/29 18:38:09 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BSplineCurveWithKnots
@@ -25,7 +25,7 @@
//
//
// $Id: G4BSplineSurface.hh,v 1.11 2006/06/29 18:38:11 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BSplineSurface
@@ -25,7 +25,7 @@
//
//
// $Id: G4BSplineSurface.icc,v 1.6 2006/06/29 18:38:14 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4BSplineSurfaceWithKnots.hh,v 1.4 2006/06/29 18:38:17 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BSplineSurfaceWithKnots
@@ -25,7 +25,7 @@
//
//
// $Id: G4BezierSurface.hh,v 1.7 2006/06/29 18:38:20 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BezierSurface
@@ -25,7 +25,7 @@
//
//
// $Id: G4BezierSurface.icc,v 1.4 2006/06/29 18:38:22 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4BoundingBox3D.hh,v 1.7 2007/05/11 13:49:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BoundingBox3D
@@ -25,7 +25,7 @@
//
//
// $Id: G4BoundingBox3D.icc,v 1.4 2006/06/29 18:38:27 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4CircularCurve.hh,v 1.9 2006/06/29 18:38:30 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4CircularCurve
@@ -25,7 +25,7 @@
//
//
// $Id: G4CircularCurve.icc,v 1.6 2006/06/29 18:38:32 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4CompositeCurve.hh,v 1.8 2006/06/29 18:38:35 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4CompositeCurve
@@ -25,7 +25,7 @@
//
//
// $Id: G4CompositeCurve.icc,v 1.5 2006/06/29 18:38:37 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4Conic.hh,v 1.7 2006/06/29 18:38:39 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4Conic
@@ -25,7 +25,7 @@
//
//
// $Id: G4Conic.icc,v 1.4 2006/06/29 18:38:42 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4ConicalSurface.hh,v 1.10 2006/06/29 18:38:44 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4ConicalSurface
@@ -25,7 +25,7 @@
//
//
// $Id: G4ConicalSurface.icc,v 1.4 2006/06/29 18:38:47 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4ControlPoints.hh,v 1.7 2006/06/29 18:38:50 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4ControlPoints
@@ -25,7 +25,7 @@
//
//
// $Id: G4ControlPoints.icc,v 1.3 2006/06/29 18:38:52 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4ConvexHull.hh,v 1.7 2006/06/29 18:38:54 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4ConvexHull
@@ -25,7 +25,7 @@
//
//
// $Id: G4Curve.hh,v 1.11 2007/05/11 13:49:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4Curve
@@ -25,7 +25,7 @@
//
//
// $Id: G4Curve.icc,v 1.7 2006/06/29 18:38:58 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4CurvePoint.hh,v 1.6 2006/06/29 18:39:00 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4CurvePoint
@@ -25,7 +25,7 @@
//
//
// $Id: G4CurvePoint.icc,v 1.4 2006/06/29 18:39:03 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4CurveRayIntersection.hh,v 1.6 2007/05/11 13:49:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4CurveRayIntersection
@@ -25,7 +25,7 @@
//
//
// $Id: G4CurveRayIntersection.icc,v 1.4 2006/06/29 18:39:07 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4CurveVector.hh,v 1.7 2006/06/29 18:39:10 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4CurveVector
@@ -25,7 +25,7 @@
//
//
// $Id: G4CylindricalSurface.hh,v 1.10 2006/06/29 18:39:12 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4CylindricalSurface
@@ -25,7 +25,7 @@
//
//
// $Id: G4CylindricalSurface.icc,v 1.4 2006/06/29 18:39:14 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4Ellipse.hh,v 1.10 2006/06/29 18:39:16 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4Ellipse
@@ -25,7 +25,7 @@
//
//
// $Id: G4Ellipse.icc,v 1.8 2006/06/29 18:39:18 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4FConicalSurface.hh,v 1.13 2006/06/29 18:39:21 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4FConicalSurface
@@ -25,7 +25,7 @@
//
//
// $Id: G4FConicalSurface.icc,v 1.4 2006/06/29 18:39:23 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4FCylindricalSurface.hh,v 1.13 2006/06/29 18:39:25 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4FCylindricalSurface
@@ -25,7 +25,7 @@
//
//
// $Id: G4FCylindricalSurface.icc,v 1.4 2006/06/29 18:39:27 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4FPlane.hh,v 1.13 2006/06/29 18:39:30 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4FPlane
@@ -25,7 +25,7 @@
//
//
// $Id: G4FPlane.icc,v 1.6 2006/06/29 18:39:32 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4Globals.hh,v 1.5 2006/06/29 18:39:34 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// Author: A.Breakstone
// Adaptation: J.Sulkimo, P.Urban.
@@ -25,7 +25,7 @@
//
//
// $Id: G4Hyperbola.hh,v 1.10 2006/06/29 18:39:36 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4Hyperbola
@@ -25,7 +25,7 @@
//
//
// $Id: G4Hyperbola.icc,v 1.9 2006/06/29 18:39:38 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4KnotVector.hh,v 1.10 2007/05/11 13:49:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4KnotVector
@@ -25,7 +25,7 @@
//
//
// $Id: G4KnotVector.icc,v 1.5 2006/06/29 18:39:42 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4Line.hh,v 1.9 2006/06/29 18:39:44 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4Line
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Line.icc,v 1.9 2006/06/29 18:39:46 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// $Id: G4Line.icc,v 1.10 2008/03/13 14:18:57 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -165,11 +165,13 @@ G4int G4Line::IntersectRay2D(const G4Ray& ray)
// test the validity of the results
if(t>=0 && u>=0 && u<=1)
{
// test if the point is on the line
if( t==0 || u==0 )
return 999;
else
nbinter = 1;
nbinter = 1;
}
}
return nbinter;
@@ -25,7 +25,7 @@
//
//
// $Id: G4OsloMatrix.hh,v 1.6 2006/06/29 18:39:49 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4OsloMatrix
@@ -25,7 +25,7 @@
//
//
// $Id: G4OsloMatrix.icc,v 1.4 2006/06/29 18:39:52 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4Parabola.hh,v 1.10 2006/06/29 18:39:54 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4Parabola
@@ -25,7 +25,7 @@
//
//
// $Id: G4Parabola.icc,v 1.8 2006/06/29 18:39:57 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4PlacedSolid.hh,v 1.10 2006/06/29 18:39:59 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4PlacedSolid
@@ -25,7 +25,7 @@
//
//
// $Id: G4PlacedSolid.icc,v 1.8 2006/06/29 18:40:02 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4PlacementVector.hh,v 1.7 2006/06/29 18:40:04 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4PlacementVector
@@ -25,7 +25,7 @@
//
//
// $Id: G4Plane.hh,v 1.6 2006/06/29 18:40:06 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4Plane
@@ -25,7 +25,7 @@
//
//
// $Id: G4Point3DVector.hh,v 1.8 2006/06/29 18:40:09 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4Point3DVector
@@ -25,7 +25,7 @@
//
//
// $Id: G4PointRat.hh,v 1.10 2006/06/29 18:40:12 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4PointRat
@@ -25,7 +25,7 @@
//
//
// $Id: G4PointRat.icc,v 1.4 2006/06/29 18:40:15 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4ProjectedSurface.hh,v 1.7 2006/06/29 18:40:17 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4ProjectedSurface
@@ -25,7 +25,7 @@
//
//
// $Id: G4ProjectedSurface.icc,v 1.5 2006/06/29 18:40:19 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4Ray.hh,v 1.9 2006/06/29 18:40:21 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4Ray
@@ -25,7 +25,7 @@
//
//
// $Id: G4Ray.icc,v 1.7 2006/06/29 18:40:24 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4RectangularTrimmedSurface.hh,v 1.8 2006/06/29 18:40:27 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4BezierSurface
@@ -25,7 +25,7 @@
//
//
// $Id: G4STEPEntity.hh,v 1.7 2006/06/29 18:40:30 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4STEPEntity
@@ -25,7 +25,7 @@
//
//
// $Id: G4Sort.hh,v 1.5 2006/06/29 18:40:33 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
//
@@ -25,7 +25,7 @@
//
//
// $Id: G4SphericalSurface.hh,v 1.10 2006/06/29 18:40:36 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4SphericalSurface
@@ -25,7 +25,7 @@
//
//
// $Id: G4SphericalSurface.icc,v 1.4 2006/06/29 18:40:39 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4Surface.hh,v 1.10 2007/05/11 13:49:32 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4Surface
@@ -25,7 +25,7 @@
//
//
// $Id: G4Surface.icc,v 1.5 2006/06/29 18:40:43 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4SurfaceBoundary.hh,v 1.8 2006/06/29 18:40:45 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4SurfaceBoundary
@@ -25,7 +25,7 @@
//
//
// $Id: G4SurfaceBoundary.icc,v 1.5 2006/06/29 18:40:47 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4SurfaceList.hh,v 1.6 2006/06/29 18:40:50 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4SurfaceList
@@ -25,7 +25,7 @@
//
//
// $Id: G4SurfaceOfLinearExtrusion.hh,v 1.5 2006/06/29 18:40:53 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4SurfaceOfLinearExtrusion
@@ -25,7 +25,7 @@
//
//
// $Id: G4SurfaceOfRevolution.hh,v 1.5 2006/06/29 18:40:56 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4SurfaceOfRevolution
@@ -25,7 +25,7 @@
//
//
// $Id: G4ThreeMat.hh,v 1.10 2006/06/29 18:40:58 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4ThreeMat
@@ -25,7 +25,7 @@
//
//
// $Id: G4ToroidalSurface.hh,v 1.7 2006/06/29 18:41:01 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4ToroidalSurface
@@ -25,7 +25,7 @@
//
//
// $Id: G4ToroidalSurface.icc,v 1.4 2006/06/29 18:41:03 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -25,7 +25,7 @@
//
//
// $Id: G4UVHit.hh,v 1.7 2006/06/29 18:41:05 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// Class G4UVHit
@@ -25,7 +25,7 @@
//
//
// $Id: G4Assembly.cc,v 1.6 2006/06/29 18:41:07 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -25,7 +25,7 @@
//
//
// $Id: G4Axis2Placement3D.cc,v 1.9 2006/06/29 18:41:09 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolid.cc,v 1.36 2006/10/19 15:35:36 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
// $Id: G4BREPSolid.cc,v 1.37 2008/03/13 14:18:57 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -986,6 +986,7 @@ G4double G4BREPSolid::DistanceToOut(register const G4ThreeVector& P,
//
G4double surfDistance = SurfaceVec[a]->GetDistance();
if( surfDistance < ShortestDistance )
{
if( surfDistance > sqrHalfTolerance )
{
ShortestDistance = surfDistance;
@@ -994,6 +995,7 @@ G4double G4BREPSolid::DistanceToOut(register const G4ThreeVector& P,
{
// The point is within the boundary: ignore it
}
}
}
}
}
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidBox.cc,v 1.10 2006/06/29 18:41:14 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// $Id: G4BREPSolidBox.cc,v 1.11 2008/01/22 16:03:52 tnikitin Exp $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -52,6 +52,7 @@ G4BREPSolidBox::G4BREPSolidBox(const G4String& name,
active=1;PlaneSolid=1;
SurfaceVec = new G4Surface*[6];
G4Point3DVector PVec(4);
G4int sense=0;
PVec[0] = Pt1;
PVec[1] = Pt2;
@@ -61,7 +62,7 @@ G4BREPSolidBox::G4BREPSolidBox(const G4String& name,
PVec[2] = Pt6;
PVec[3] = Pt5;
SurfaceVec[1] = new G4FPlane(&PVec);
SurfaceVec[1] = new G4FPlane(&PVec,0,sense);
PVec[0] = Pt2;
PVec[1] = Pt6;
@@ -79,13 +80,13 @@ G4BREPSolidBox::G4BREPSolidBox(const G4String& name,
PVec[1] = Pt5;
PVec[2] = Pt8;
PVec[3] = Pt4;
SurfaceVec[4] = new G4FPlane(&PVec);
SurfaceVec[4] = new G4FPlane(&PVec,0,sense);
PVec[0] = Pt5;
PVec[1] = Pt6;
PVec[2] = Pt7;
PVec[3] = Pt8;
SurfaceVec[5] = new G4FPlane(&PVec);
SurfaceVec[5] = new G4FPlane(&PVec,0,sense);
// Save the constructor parameters
constructorParams[0] = Pt1;
@@ -24,7 +24,7 @@
// ********************************************************************
//
// $Id: G4BREPSolidCone.cc,v 1.15 2006/06/29 18:41:16 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -24,7 +24,7 @@
// ********************************************************************
//
// $Id: G4BREPSolidCylinder.cc,v 1.11 2006/06/29 18:41:18 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -25,7 +25,7 @@
//
//
// $Id: G4BREPSolidOpenPCone.cc,v 1.11 2006/06/29 18:41:21 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -24,7 +24,7 @@
// ********************************************************************
//
// $Id: G4BREPSolidPCone.cc,v 1.38 2006/06/29 18:41:24 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -23,8 +23,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4BREPSolidPolyhedra.cc,v 1.34 2006/06/29 18:41:27 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// $Id: G4BREPSolidPolyhedra.cc,v 1.35 2008/01/22 16:04:58 tnikitin Exp $
// GEANT4 tag $Name: geant4-09-02 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -1182,12 +1182,21 @@ G4BREPSolidPolyhedra::DistanceToOut(register const G4ThreeVector& Pt,
}
}
G4double distance = 0.;
G4double distance = 0.;
// Be careful !
// SurfaceVec->Distance is in fact the squared distance
//
if((ShortestDistance != kInfinity) && (parity&1))
// This condition was changed in order to give not zero answer
// when particle is passing the border of two Touching Surfaces
// and the distance to this surfaces is not zero.
// parity is for the points on the boundary,
// parity is counting only surfDistance<kCarTolerance/2.
//
// if((ShortestDistance != kInfinity) && (parity&1))
//
//
if((ShortestDistance != kInfinity) || (parity&1))
{
distance = std::sqrt(ShortestDistance);
}

Some files were not shown because too many files have changed in this diff Show More