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

Import Geant4 9.4.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 16:25:56 +02:00
parent 74cad5e589
commit 89a9605df1
4440 changed files with 379508 additions and 189225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/BREPS/include/G4BREPSolid.hh
+15 -9
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolid.hh,v 1.17 2006/10/19 15:35:36 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4BREPSolid.hh,v 1.19 2010/10/20 09:14:11 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolid
@@ -116,6 +116,10 @@ public: // with description
// Returns identifier for solid type entity.
// A generic BREP solid is considered a "Closed_Shell".
virtual G4VSolid* Clone() const;
// Returns a pointer of a dynamically allocated copy of the solid.
// The caller has responsibility for ownership.
virtual std::ostream& StreamInfo(std::ostream& os) const;
// Streams solid contents to output stream.
@@ -181,6 +185,10 @@ public: // without description
// persistency for clients requiring preallocation of memory for
// persistifiable objects.
G4BREPSolid(const G4BREPSolid& rhs);
G4BREPSolid& operator=(const G4BREPSolid& rhs);
// Copy constructor and assignment operator.
protected:
G4ThreeVectorList* CreateRotatedVertices(const G4AffineTransform&) const;
@@ -227,6 +235,11 @@ protected:
G4int Id;
private:
G4int IsBox();
G4int FinalEvaluation(register const G4Ray&, G4int =0) const;
private:
G4int fStatistics;
@@ -238,13 +251,6 @@ private:
mutable G4Polyhedron* fpPolyhedron;
G4BREPSolid(const G4BREPSolid&);
G4BREPSolid& operator=(const G4BREPSolid&);
// Private copy constructor and assignment operator.
G4int IsBox();
G4int FinalEvaluation(register const G4Ray&, G4int =0) const;
};
#include "G4BREPSolid.icc"
source/geometry/solids/BREPS/include/G4BREPSolidBox.hh
+11 -6
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidBox.hh,v 1.10 2008/01/22 16:03:13 tnikitin Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4BREPSolidBox.hh,v 1.12 2010/10/20 09:14:11 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidBox
@@ -77,7 +77,10 @@ public: // with description
// Determines if the point Pt is inside, outside or on the surface
// of the solid.
virtual std::ostream& StreamInfo(std::ostream& os) const;
G4VSolid* Clone() const;
// Returns a pointer of a dynamically allocated copy of the solid.
std::ostream& StreamInfo(std::ostream& os) const;
// Streams solid contents to output stream.
public: // without description
@@ -87,11 +90,13 @@ public: // without description
// persistency for clients requiring preallocation of memory for
// persistifiable objects.
G4BREPSolidBox(const G4BREPSolidBox& rhs);
G4BREPSolidBox& operator=(const G4BREPSolidBox& rhs);
// Copy constructor and assignment operator.
private:
G4BREPSolidBox(const G4BREPSolidBox&);
G4BREPSolidBox& operator=(const G4BREPSolidBox&);
// Private copy constructor and assignment operator.
void InitializeBox();
private:
source/geometry/solids/BREPS/include/G4BREPSolidCone.hh
+12 -7
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidCone.hh,v 1.11 2006/06/29 18:37:51 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4BREPSolidCone.hh,v 1.13 2010/10/20 09:14:11 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidCone
@@ -97,7 +97,10 @@ class G4BREPSolidCone : public G4BREPSolid
// Calculates the distance to the nearest surface of a shape from an
// inside point. The distance can be an underestimate.
virtual std::ostream& StreamInfo(std::ostream& os) const;
G4VSolid* Clone() const;
// Returns a pointer of a dynamically allocated copy of the solid.
std::ostream& StreamInfo(std::ostream& os) const;
// Streams solid contents to output stream.
public: // without description
@@ -107,12 +110,14 @@ class G4BREPSolidCone : public G4BREPSolid
// persistency for clients requiring preallocation of memory for
// persistifiable objects.
G4BREPSolidCone(const G4BREPSolidCone& rhs);
G4BREPSolidCone& operator=(const G4BREPSolidCone& rhs);
// Copy constructor and assignment operator.
private:
G4BREPSolidCone(const G4BREPSolidCone&);
G4BREPSolidCone& operator=(const G4BREPSolidCone&);
// Private copy constructor and assignment operator.
void InitializeCone();
private:
struct G4BREPConeParams
source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh
+13 -6
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidCylinder.hh,v 1.10 2006/06/29 18:37:53 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4BREPSolidCylinder.hh,v 1.12 2010/10/20 09:14:11 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidCylinder
@@ -66,7 +66,10 @@ class G4BREPSolidCylinder : public G4BREPSolid
~G4BREPSolidCylinder();
// Empty destructor.
virtual std::ostream& StreamInfo(std::ostream& os) const;
G4VSolid* Clone() const;
// Returns a pointer of a dynamically allocated copy of the solid.
std::ostream& StreamInfo(std::ostream& os) const;
// Streams solid contents to output stream.
public: // without description
@@ -76,11 +79,15 @@ class G4BREPSolidCylinder : public G4BREPSolid
// persistency for clients requiring preallocation of memory for
// persistifiable objects.
G4BREPSolidCylinder(const G4BREPSolidCylinder& rhs);
G4BREPSolidCylinder& operator=(const G4BREPSolidCylinder& rhs);
// Copy constructor and assignment operator.
private:
G4BREPSolidCylinder(const G4BREPSolidCylinder&);
G4BREPSolidCylinder& operator=(const G4BREPSolidCylinder&);
// Private copy constructor and assignment operator.
void InitializeCylinder();
private:
struct G4BREPCylinderParams
{
source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh
+19 -5
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidOpenPCone.hh,v 1.9 2006/06/29 18:37:55 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4BREPSolidOpenPCone.hh,v 1.12 2010/10/20 09:14:11 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidOpenPCone
@@ -73,7 +73,10 @@ class G4BREPSolidOpenPCone : public G4IntersectionSolid
void DescribeYourselfTo (G4VGraphicsScene& scene) const;
// Dispatch function which identifies the solid to the graphics scene.
virtual std::ostream& StreamInfo(std::ostream& os) const;
G4VSolid* Clone() const;
// Returns a pointer of a dynamically allocated copy of the solid.
std::ostream& StreamInfo(std::ostream& os) const;
// Streams solid contents to output stream.
public: // without description
@@ -83,11 +86,22 @@ class G4BREPSolidOpenPCone : public G4IntersectionSolid
// persistency for clients requiring preallocation of memory for
// persistifiable objects.
G4BREPSolidOpenPCone(const G4BREPSolidOpenPCone& rhs);
G4BREPSolidOpenPCone& operator=(const G4BREPSolidOpenPCone& rhs);
private:
G4BREPSolidOpenPCone(const G4BREPSolidOpenPCone&);
G4BREPSolidOpenPCone& operator=(const G4BREPSolidOpenPCone&);
void InitializeOPCone();
private:
struct G4BREPOpenPConeParams
{
G4double start_angle, opening_angle;
G4int num_z_planes; // sections
G4double z_start;
G4double *z_values, *RMIN, *RMAX;
} constructorParams;
};
#endif
source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh
+13 -8
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidPCone.hh,v 1.14 2006/06/29 18:37:57 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4BREPSolidPCone.hh,v 1.16 2010/10/20 09:14:11 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidPCone
@@ -121,7 +121,10 @@ public:
G4Polyhedron* CreatePolyhedron () const;
// Creates a G4Polyhedron
virtual std::ostream& StreamInfo(std::ostream& os) const;
G4VSolid* Clone() const;
// Returns a pointer of a dynamically allocated copy of the solid.
std::ostream& StreamInfo(std::ostream& os) const;
// Streams solid contents to output stream.
public: // without description
@@ -131,8 +134,14 @@ public: // without description
// persistency for clients requiring preallocation of memory for
// persistifiable objects.
G4BREPSolidPCone(const G4BREPSolidPCone& rhs);
G4BREPSolidPCone& operator=(const G4BREPSolidPCone& rhs);
// Copy constructor and assignment operator.
private:
void InitializePCone();
G4Surface* ComputePlanarSurface( G4double r1, G4double r2,
G4ThreeVector& origin,
G4ThreeVector& planeAxis,
@@ -140,10 +149,6 @@ private:
G4int surfSense );
// For a given radius values compute a planar surface
G4BREPSolidPCone(const G4BREPSolidPCone&);
G4BREPSolidPCone& operator=(const G4BREPSolidPCone&);
// Private copy constructor and assignment operator.
// The following is only utilised in storing the shape parameters for
// use in visualising this shape. J.A. Feb 24, 1997
// R. Chytracek, Nov 2002, Update to new IO dumping mechanism
source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh
+13 -8
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidPolyhedra.hh,v 1.14 2006/06/29 18:37:59 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4BREPSolidPolyhedra.hh,v 1.16 2010/10/20 09:14:11 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidPolyhedra
@@ -115,7 +115,10 @@ public: // with description
// solid to any boundary of this solid.
// Return 0 if the point is already outside.
virtual std::ostream& StreamInfo(std::ostream& os) const;
G4VSolid* Clone() const;
// Returns a pointer of a dynamically allocated copy of the solid.
std::ostream& StreamInfo(std::ostream& os) const;
// Streams solid contents to output stream.
public:
@@ -133,17 +136,19 @@ public: // without description
// persistency for clients requiring preallocation of memory for
// persistifiable objects.
G4BREPSolidPolyhedra(const G4BREPSolidPolyhedra& rhs);
G4BREPSolidPolyhedra& operator=(const G4BREPSolidPolyhedra& rhs);
// Copy constructor and assignment operator.
private:
G4BREPSolidPolyhedra(const G4BREPSolidPolyhedra&);
G4BREPSolidPolyhedra& operator=(const G4BREPSolidPolyhedra&);
// Private copy constructor and assignment operator.
typedef enum _SF {
EInverse = 0,
ENormal = 1
} ESurfaceSense;
void InitializePolyhedra();
G4Surface* CreateTrapezoidalSurface( G4double r1, G4double r2,
const G4Point3D& origin, G4double zDistance,
G4Vector3D& xAxis, G4double partAngle,
source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh
+16 -9
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidSphere.hh,v 1.11 2006/06/29 18:38:01 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4BREPSolidSphere.hh,v 1.13 2010/10/20 09:14:11 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidSphere
@@ -99,7 +99,10 @@ class G4BREPSolidSphere : public G4BREPSolid
// solid to any boundary of this solid.
// Return 0 if the point is already outside.
virtual std::ostream& StreamInfo(std::ostream& os) const;
G4VSolid* Clone() const;
// Returns a pointer of a dynamically allocated copy of the solid.
std::ostream& StreamInfo(std::ostream& os) const;
// Streams solid contents to output stream.
public: // without description
@@ -111,18 +114,22 @@ class G4BREPSolidSphere : public G4BREPSolid
inline void SphReset() { active=1; }
G4BREPSolidSphere(const G4BREPSolidSphere& rhs);
G4BREPSolidSphere& operator=(const G4BREPSolidSphere& rhs);
// Copy constructor and assignment operator.
private:
G4BREPSolidSphere(const G4BREPSolidSphere&);
G4BREPSolidSphere& operator=(const G4BREPSolidSphere&);
// Private copy constructor and assignment operator.
void InitializeSphere();
private:
struct G4BREPSphereParams
{
G4Vector3D origin;
G4Vector3D xhat;
G4Vector3D zhat;
G4double radius;
G4Vector3D xhat;
G4Vector3D zhat;
G4double radius;
} constructorParams;
};
source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh
+13 -6
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidTorus.hh,v 1.10 2006/06/29 18:38:03 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4BREPSolidTorus.hh,v 1.12 2010/10/20 09:14:11 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidTorus
@@ -65,7 +65,10 @@ class G4BREPSolidTorus : public G4BREPSolid
~G4BREPSolidTorus();
// Empty destructor.
virtual std::ostream& StreamInfo(std::ostream& os) const;
G4VSolid* Clone() const;
// Returns a pointer of a dynamically allocated copy of the solid.
std::ostream& StreamInfo(std::ostream& os) const;
// Streams solid contents to output stream.
public: // without description
@@ -75,11 +78,15 @@ class G4BREPSolidTorus : public G4BREPSolid
// persistency for clients requiring preallocation of memory for
// persistifiable objects.
G4BREPSolidTorus(const G4BREPSolidTorus& rhs);
G4BREPSolidTorus& operator=(const G4BREPSolidTorus& rhs);
// Copy constructor and assignment operator.
private:
G4BREPSolidTorus(const G4BREPSolidTorus&);
G4BREPSolidTorus& operator=(const G4BREPSolidTorus&);
// Private copy constructor and assignment operator.
void InitializeTorus();
private:
struct G4BREPTorusParams
{
source/geometry/solids/BREPS/include/G4BSplineCurve.hh
+7 -10
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BSplineCurve.hh,v 1.13 2006/06/29 18:38:05 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4BSplineCurve.hh,v 1.14 2010/07/07 14:45:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4BSplineCurve
@@ -48,9 +48,6 @@ class G4KnotVector;
class G4BSplineCurve : public G4Curve
{
public:
typedef std::vector<G4double> G4doubleVector;
public: // with description
@@ -74,11 +71,11 @@ public: // with description
// Accessors methods.
void Init(G4int degree0, G4Point3DVector* controlPointsList0,
G4doubleVector* knots0, G4doubleVector* weightsData0);
std::vector<G4double>* knots0, std::vector<G4double>* weightsData0);
G4int GetDegree() const;
const G4Point3DVector* GetControlPointsList() const;
const G4doubleVector* GetKnots() const;
const G4doubleVector* GetWeightsData() const;
const std::vector<G4double>* GetKnots() const;
const std::vector<G4double>* GetWeightsData() const;
// Get/Set methods for the geometric data.
// The "knots" vector contains each knot multiplicity Times.
// The object is responsible for deleting the containers passed
@@ -113,8 +110,8 @@ protected:
//
G4int degree;
G4Point3DVector* controlPointsList;
G4doubleVector* knots;
G4doubleVector* weightsData;
std::vector<G4double>* knots;
std::vector<G4double>* weightsData;
};
source/geometry/solids/BREPS/include/G4BSplineCurve.icc
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BSplineCurve.icc,v 1.7 2006/06/29 18:38:07 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4BSplineCurve.icc,v 1.8 2010/07/07 14:45:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -48,14 +48,14 @@ G4BSplineCurve::GetControlPointsList() const
}
inline
const G4BSplineCurve::G4doubleVector*
const std::vector<G4double>*
G4BSplineCurve::GetKnots() const
{
return knots;
}
inline
const G4BSplineCurve::G4doubleVector*
const std::vector<G4double>*
G4BSplineCurve::GetWeightsData() const
{
return weightsData;
source/geometry/solids/BREPS/include/G4BoundingBox3D.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BoundingBox3D.hh,v 1.7 2007/05/11 13:49:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4BoundingBox3D.hh,v 1.8 2010/07/07 14:45:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4BoundingBox3D
source/geometry/solids/BREPS/include/G4BoundingBox3D.icc
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4BoundingBox3D.icc,v 1.4 2006/06/29 18:38:27 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4BoundingBox3D.icc,v 1.5 2010/07/07 14:45:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4Curve.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Curve.hh,v 1.11 2007/05/11 13:49:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4Curve.hh,v 1.13 2010/07/07 14:45:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4Curve
source/geometry/solids/BREPS/include/G4CurvePoint.icc
+3 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4CurvePoint.icc,v 1.4 2006/06/29 18:39:03 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4CurvePoint.icc,v 1.5 2010/07/07 14:45:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -39,6 +39,7 @@ inline
void G4CurvePoint::Init(G4Curve& c0)
{
c= &c0;
u= 0.;
notComputed= allFlags;
}
source/geometry/solids/BREPS/include/G4Hyperbola.hh
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Hyperbola.hh,v 1.10 2006/06/29 18:39:36 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4Hyperbola.hh,v 1.11 2010/07/07 14:45:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4Hyperbola
@@ -70,7 +70,7 @@ public: // with description
inline G4double GetSemiAxis() const;
inline G4double GetSemiImagAxis() const;
inline void Init(G4Axis2Placement3D position0,
inline void Init(const G4Axis2Placement3D& position0,
G4double semiAxis0, G4double semiImagAxis0);
// Get/Set for the geometric data.
source/geometry/solids/BREPS/include/G4Hyperbola.icc
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Hyperbola.icc,v 1.9 2006/06/29 18:39:38 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4Hyperbola.icc,v 1.10 2010/07/07 14:45:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -36,7 +36,7 @@
// --------------------------------------------------------------------
inline
void G4Hyperbola::Init(G4Axis2Placement3D position0,
void G4Hyperbola::Init(const G4Axis2Placement3D& position0,
G4double semiAxis0, G4double semiImagAxis0)
{
position= position0;
source/geometry/solids/BREPS/include/G4ProjectedSurface.hh
+12 -13
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ProjectedSurface.hh,v 1.7 2006/06/29 18:40:17 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4ProjectedSurface.hh,v 1.8 2010/07/07 14:45:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4ProjectedSurface
@@ -45,10 +45,9 @@
class G4ProjectedSurface : public G4Surface
{
friend class G4BSplineSurface;
friend void CopySurface(G4ProjectedSurface& proj);
public: // with description
public: // with description
G4ProjectedSurface();
virtual ~G4ProjectedSurface();
@@ -60,18 +59,12 @@ public: // with description
// to the surface. The bounding rectangle is used
// for a preliminary check of intersection.
public: // without description
public: // without description
inline G4Vector3D SurfaceNormal(const G4Point3D& Pt) const;
// Returns normal to surface (G4Vector3D(0,0,0)).
protected:
static G4int Splits;
G4ControlPoints *ctl_points;
// Test variables
private:
private:
G4ProjectedSurface(const G4ProjectedSurface&);
G4ProjectedSurface& operator=(const G4ProjectedSurface&);
@@ -112,7 +105,13 @@ private:
inline G4int Amin(G4int i, G4int j) const;
inline G4int AhIndex(G4int j, G4int t, G4int iorder) const;
private:
protected:
static G4int Splits;
G4ControlPoints *ctl_points;
// Test variables
private:
short dir;
G4KnotVector *u_knots;
source/geometry/solids/BREPS/include/G4SphericalSurface.hh
+6 -6
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4SphericalSurface.hh,v 1.10 2006/06/29 18:40:36 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4SphericalSurface.hh,v 1.11 2010/07/07 14:45:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4SphericalSurface
@@ -50,7 +50,7 @@
class G4SphericalSurface : public G4Surface
{
public: // with description
public: // with description
G4SphericalSurface();
// Default constructor.
@@ -152,7 +152,7 @@ public: // with description
// Accessors methodss to return the axes, radius, and angles
// of the G4SphericalSurface.
public: // without description
public: // without description
virtual G4Vector3D Normal( const G4Vector3D& p ) const;
// Returns the Normal unit vector as for SurfaceNormal().
@@ -198,7 +198,7 @@ public: // without description
// non-zero reverses the order of the rotations.
*/
protected: // with description
protected: // with description
G4Vector3D x_axis;
// Direction (unit vector) of axis of G4SphericalSurface
@@ -227,7 +227,7 @@ protected: // with description
// Upper polar angle limit of G4SphericalSurface
// (in radians). Allowed range: theta_1 < theta_2 <= theta_1 + PI.
private:
private:
G4SphericalSurface(const G4SphericalSurface&);
G4SphericalSurface& operator=(const G4SphericalSurface&);
source/geometry/solids/BREPS/include/G4Surface.hh
+8 -17
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Surface.hh,v 1.10 2007/05/11 13:49:32 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4Surface.hh,v 1.12 2010/07/07 14:45:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4Surface
@@ -51,7 +51,7 @@
class G4Surface : public G4STEPEntity
{
public: // with description
public: // with description
G4Surface();
virtual ~G4Surface();
@@ -110,8 +110,7 @@ public: // with description
// Calculates the bounds for a bounding box to the surface.
// The bounding box is used for a preliminary check of intersection.
public: // without description
public: // without description
static void Project (G4double& Coord, const G4Point3D& Pt,
const G4Plane& Pl);
@@ -178,11 +177,11 @@ public: // without description
// further checks are Done. It must be overwritten by derived classes.
*/
protected:
protected:
virtual void InitBounded();
protected:
protected:
G4BoundingBox3D* bbox;
G4Point3D closest_hit;
@@ -191,7 +190,7 @@ protected:
G4SurfaceBoundary surfaceBoundary;
// The boundaries of the surface.
G4double kCarTolerance;
G4double kCarTolerance, kAngTolerance;
G4int Intersected;
// BSplineSurface and FPlane sets it, no one gets it.
@@ -209,15 +208,7 @@ protected:
G4int sameSense;
// by L. Broglia
protected:
const G4double FLT_MAXX;
// Maybe kInfinity instead?
const G4double FLT_EPSILO;
// Maybe kCarTolerance instead?
private:
private:
G4Surface(const G4Surface&);
G4Surface& operator=(const G4Surface&);
source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4SurfaceOfRevolution.hh,v 1.5 2006/06/29 18:40:56 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4SurfaceOfRevolution.hh,v 1.7 2010/07/13 14:44:23 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
//
// ----------------------------------------------------------------------
// Class G4SurfaceOfRevolution
@@ -34,7 +34,7 @@
//
// Definition of a surface of revolution.
// (not implemented yet).
//
// ----------------------------------------------------------------------
#ifndef included_G4SurfaceOfRevolution
#define included_G4SurfaceOfRevolution