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

Import Geant4 5.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 16:57:27 +02:00
parent 330b82b769
commit 37fff30d2e
5733 changed files with 263867 additions and 74574 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/BREPS/History
+23 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.42 2002/04/19 08:29:41 gcosmo Exp $
$Id: History,v 1.48 2002/12/03 14:32:44 gcosmo Exp $
----------------------------------------------------------------------------
=========================================================
@@ -17,6 +17,28 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
03/12/2002 : G. Cosmo breps-V04-01-04
- Fix to concrete BREPS for porting code on Windows: explicitely name the
internal struct type holding the solid parameters.
21/11/2002 : G. Cosmo breps-V04-01-03
- G4Ray[.hh.icc.cc], G4Surface[.hh.icc.cc]: made static inline methods not
inlined to allow porting on Windows DLLs.
07/11/2002 : R. Chytracek breps-V04-01-02
- All BREP solids + G4PlacedSolids now implement virtual StreamInfo(...) method
end properly expose their construction parameters via this interface to an
std::ostream instance.
28/10/2002 : G. Cosmo breps-V04-01-01
- G4BREPSolid[.hh.cc]: added implementation of StreamInfo() to comply with ne interface
for G4VSolid in "geommng-V04-01-03".
16/10/2002 : R. Chytracek breps-V04-01-00
- G4BREPSolidPCone.cc: fixed creation of begin & end planar surfaces in the case where
[RMIN[0] == 0.0 && RMAX[0] > 0.0] and/or [RMIN[sections] == 0.0 && RMAX[sections] > 0.0].
Fixes problem report #419.
19/04/2002 : R. Chytracek breps-V04-00-05
- G4BREPSolidPCone.cc: added sanity check of delta phi section value and
exception is thrown saying about this unsupported feature if delta phi
source/geometry/solids/BREPS/include/G4Assembly.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Assembly.hh,v 1.8 2001/07/11 09:59:30 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4Assembly
source/geometry/solids/BREPS/include/G4Assembly.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Assembly.icc,v 1.3 2001/07/11 09:59:30 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Axis2Placement3D.hh,v 1.4 2001/07/11 09:59:30 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4Axis2Placement3D
source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Axis2Placement3D.icc,v 1.7 2001/07/20 11:52:42 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4BREPSolid.hh
+9 -6
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolid.hh,v 1.9 2001/07/11 09:59:30 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolid.hh,v 1.10 2002/10/28 11:30:57 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolid
@@ -55,10 +55,6 @@ public: // with description
virtual ~G4BREPSolid();
// Constructors & destructor
virtual G4String GetEntityType() const;
// Returns identifier for solid type entity.
// A generic BREP solid is considered a "Closed_Shell".
virtual void Initialize();
// Calculates the bounding box for solids and surfaces.
// Converts concave planes to convex.
@@ -113,6 +109,13 @@ public: // with description
// Utility function to determine the maximum scope of the solid
// in the coordinates X, Y, Z. Returned as a G4Point3D.
virtual G4String GetEntityType() const;
// Returns identifier for solid type entity.
// A generic BREP solid is considered a "Closed_Shell".
virtual G4std::ostream& StreamInfo(G4std::ostream& os) const;
// Streams solid contents to output stream.
void DescribeYourselfTo (G4VGraphicsScene& scene) const;
// Dispatch function which identifies the solid to the graphics scene.
source/geometry/solids/BREPS/include/G4BREPSolid.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4BREPSolid.icc,v 1.4 2001/07/11 09:59:30 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4BREPSolidBox.hh
+6 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidBox.hh,v 1.5 2001/07/11 09:59:30 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidBox.hh,v 1.6 2002/11/06 23:28:45 radoone Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidBox
@@ -63,6 +63,9 @@ public: // with description
// Determines if the point Pt is inside, outside or on the surface
// of the solid.
virtual G4std::ostream& StreamInfo(G4std::ostream& os) const;
// Streams solid contents to output stream.
private:
G4BREPSolidBox(const G4BREPSolidBox&);
@@ -72,6 +75,7 @@ private:
private:
G4RotationMatrix Rotation;
G4Point3D constructorParams[8];
};
source/geometry/solids/BREPS/include/G4BREPSolidCone.hh
+17 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidCone.hh,v 1.5 2001/07/11 09:59:30 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidCone.hh,v 1.8 2002/12/03 14:24:20 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidCone
@@ -94,11 +94,26 @@ 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 G4std::ostream& StreamInfo(G4std::ostream& os) const;
// Streams solid contents to output stream.
private:
G4BREPSolidCone(const G4BREPSolidCone&);
G4BREPSolidCone& operator=(const G4BREPSolidCone&);
// Private copy constructor and assignment operator.
private:
struct G4BREPConeParams
{
G4ThreeVector origin;
G4ThreeVector axis;
G4ThreeVector direction;
G4double length;
G4double radius;
G4double large_radius;
} constructorParams;
};
source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh
+13 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidCylinder.hh,v 1.5 2001/07/11 09:59:30 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidCylinder.hh,v 1.7 2002/12/03 14:32:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidCylinder
@@ -63,12 +63,23 @@ class G4BREPSolidCylinder : public G4BREPSolid
~G4BREPSolidCylinder();
// Empty destructor.
virtual G4std::ostream& StreamInfo(G4std::ostream& os) const;
// Streams solid contents to output stream.
private:
G4BREPSolidCylinder(const G4BREPSolidCylinder&);
G4BREPSolidCylinder& operator=(const G4BREPSolidCylinder&);
// Private copy constructor and assignment operator.
struct G4BREPCylinderParams
{
G4ThreeVector origin;
G4ThreeVector axis;
G4ThreeVector direction;
G4double length;
G4double radius;
} constructorParams;
};
#endif
source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh
+5 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidOpenPCone.hh,v 1.5 2001/07/11 09:59:31 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidOpenPCone.hh,v 1.6 2002/11/06 23:28:48 radoone Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidOpenPCone
@@ -69,6 +69,9 @@ class G4BREPSolidOpenPCone : public G4IntersectionSolid
void DescribeYourselfTo (G4VGraphicsScene& scene) const;
// Dispatch function which identifies the solid to the graphics scene.
virtual G4std::ostream& StreamInfo(G4std::ostream& os) const;
// Streams solid contents to output stream.
private:
source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh
+17 -12
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidPCone.hh,v 1.9 2002/01/22 22:43:01 radoone Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidPCone.hh,v 1.11 2002/12/03 14:32:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidPCone
@@ -118,6 +118,9 @@ public:
G4Polyhedron* CreatePolyhedron () const;
// Creates a G4Polyhedron
virtual G4std::ostream& StreamInfo(G4std::ostream& os) const;
// Streams solid contents to output stream.
private:
G4Surface* ComputePlanarSurface( G4double r1, G4double r2,
@@ -133,16 +136,18 @@ private:
// The following is only utilised in storing the shape parameters for
// use in visualising this shape. J.A. Feb 24, 1997
//
struct PConeParameters {
G4double Start_angle;
G4double Opening_angle;
G4int Num_z_planes;
// G4double z_start;
G4double *Z_values;
G4double *Rmin;
G4double *Rmax;
} original_parameters;
// R. Chytracek, Nov 2002, Update to new IO dumping mechanism
struct G4BREPPConeParams
{
G4double start_angle;
G4double opening_angle;
G4int num_z_planes;
G4double z_start;
G4double* z_values;
G4double* RMIN;
G4double* RMAX;
} constructorParams;
};
#endif
source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh
+18 -12
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidPolyhedra.hh,v 1.9 2002/02/13 17:39:48 radoone Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidPolyhedra.hh,v 1.11 2002/12/03 14:32:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidPolyhedra
@@ -112,6 +112,9 @@ public: // with description
// solid to any boundary of this solid.
// Return 0 if the point is already outside.
virtual G4std::ostream& StreamInfo(G4std::ostream& os) const;
// Streams solid contents to output stream.
public:
G4Polyhedron* CreatePolyhedron () const;
@@ -149,17 +152,20 @@ private:
// The following is only utilised in storing the shape parameters for
// use in visualising this shape. J.A. Feb 24, 1997
//
struct PGonParameters
// R. Chytracek, Nov 2002, Update to new IO dumping mechanism
struct G4BREPPolyhedraParams
{
G4double Start_angle;
G4double Opening_angle;
int Sides;
int Num_z_planes;
// G4double z_start;
G4double *Z_values;
G4double *Rmin;
G4double *Rmax;
} original_parameters;
G4double start_angle;
G4double opening_angle;
G4int sides;
G4int num_z_planes;
G4double z_start;
G4double* z_values;
G4double* RMIN;
G4double* RMAX;
} constructorParams;
};
#endif
source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh
+12 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidSphere.hh,v 1.6 2001/07/11 09:59:31 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidSphere.hh,v 1.8 2002/12/03 14:32:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidSphere
@@ -96,6 +96,9 @@ class G4BREPSolidSphere : public G4BREPSolid
// solid to any boundary of this solid.
// Return 0 if the point is already outside.
virtual G4std::ostream& StreamInfo(G4std::ostream& os) const;
// Streams solid contents to output stream.
public: // without description
inline void SphReset() { active=1; }
@@ -106,6 +109,13 @@ class G4BREPSolidSphere : public G4BREPSolid
G4BREPSolidSphere& operator=(const G4BREPSolidSphere&);
// Private copy constructor and assignment operator.
struct G4BREPSphereParams
{
G4Vector3D origin;
G4Vector3D xhat;
G4Vector3D zhat;
G4double radius;
} constructorParams;
};
#endif
source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh
+14 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidTorus.hh,v 1.5 2001/07/11 09:59:31 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidTorus.hh,v 1.7 2002/12/03 14:32:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BREPSolidTorus
@@ -62,12 +62,24 @@ class G4BREPSolidTorus : public G4BREPSolid
~G4BREPSolidTorus();
// Empty destructor.
virtual G4std::ostream& StreamInfo(G4std::ostream& os) const;
// Streams solid contents to output stream.
private:
G4BREPSolidTorus(const G4BREPSolidTorus&);
G4BREPSolidTorus& operator=(const G4BREPSolidTorus&);
// Private copy constructor and assignment operator.
struct G4BREPTorusParams
{
G4ThreeVector origin;
G4ThreeVector axis;
G4ThreeVector direction;
G4double MinRadius;
G4double MaxRadius;
} constructorParams;
};
#endif
source/geometry/solids/BREPS/include/G4BSplineCurve.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4BSplineCurve.hh,v 1.10 2001/07/11 09:59:31 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BSplineCurve
source/geometry/solids/BREPS/include/G4BSplineCurve.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4BSplineCurve.icc,v 1.6 2001/07/11 09:59:31 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4BSplineCurveWithKnots.hh,v 1.4 2001/07/11 09:59:31 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BSplineCurveWithKnots
source/geometry/solids/BREPS/include/G4BSplineSurface.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4BSplineSurface.hh,v 1.10 2001/07/11 09:59:31 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BSplineSurface
source/geometry/solids/BREPS/include/G4BSplineSurface.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4BSplineSurface.icc,v 1.4 2001/07/11 09:59:31 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4BSplineSurfaceWithKnots.hh,v 1.3 2001/07/11 09:59:31 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BSplineSurfaceWithKnots
source/geometry/solids/BREPS/include/G4BezierSurface.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4BezierSurface.hh,v 1.6 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BezierSurface
source/geometry/solids/BREPS/include/G4BezierSurface.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4BezierSurface.icc,v 1.3 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4BoundingBox3D.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4BoundingBox3D.hh,v 1.5 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BoundingBox3D
source/geometry/solids/BREPS/include/G4BoundingBox3D.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4BoundingBox3D.icc,v 1.3 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4CircularCurve.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CircularCurve.hh,v 1.7 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4CircularCurve
source/geometry/solids/BREPS/include/G4CircularCurve.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CircularCurve.icc,v 1.5 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4CompositeCurve.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CompositeCurve.hh,v 1.6 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4CompositeCurve
source/geometry/solids/BREPS/include/G4CompositeCurve.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CompositeCurve.icc,v 1.4 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4Conic.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Conic.hh,v 1.6 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4Conic
source/geometry/solids/BREPS/include/G4Conic.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Conic.icc,v 1.3 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4ConicalSurface.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ConicalSurface.hh,v 1.8 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4ConicalSurface
source/geometry/solids/BREPS/include/G4ConicalSurface.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ConicalSurface.icc,v 1.3 2001/07/11 09:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4ControlPoints.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ControlPoints.hh,v 1.6 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4ControlPoints
source/geometry/solids/BREPS/include/G4ControlPoints.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ControlPoints.icc,v 1.2 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4ConvexHull.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ConvexHull.hh,v 1.6 2002/02/26 11:16:55 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4ConvexHull
source/geometry/solids/BREPS/include/G4Curve.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Curve.hh,v 1.8 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4Curve
source/geometry/solids/BREPS/include/G4Curve.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Curve.icc,v 1.5 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4CurvePoint.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CurvePoint.hh,v 1.5 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4CurvePoint
source/geometry/solids/BREPS/include/G4CurvePoint.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CurvePoint.icc,v 1.3 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CurveRayIntersection.hh,v 1.4 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4CurveRayIntersection
source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CurveRayIntersection.icc,v 1.3 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4CurveVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CurveVector.hh,v 1.5 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4CurveVector
source/geometry/solids/BREPS/include/G4CylindricalSurface.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CylindricalSurface.hh,v 1.8 2001/07/11 09:59:33 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4CylindricalSurface
source/geometry/solids/BREPS/include/G4CylindricalSurface.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CylindricalSurface.icc,v 1.3 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4Ellipse.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Ellipse.hh,v 1.8 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4Ellipse
source/geometry/solids/BREPS/include/G4Ellipse.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Ellipse.icc,v 1.6 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4FConicalSurface.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FConicalSurface.hh,v 1.11 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4FConicalSurface
source/geometry/solids/BREPS/include/G4FConicalSurface.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FConicalSurface.icc,v 1.3 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FCylindricalSurface.hh,v 1.11 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4FCylindricalSurface
source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FCylindricalSurface.icc,v 1.3 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4FPlane.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FPlane.hh,v 1.12 2002/01/28 16:38:40 radoone Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4FPlane
source/geometry/solids/BREPS/include/G4FPlane.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FPlane.icc,v 1.4 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4Globals.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Globals.hh,v 1.4 2001/07/11 09:59:34 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// Author: A.Breakstone
// Adaptation: J.Sulkimo, P.Urban.
source/geometry/solids/BREPS/include/G4Hyperbola.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Hyperbola.hh,v 1.8 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4Hyperbola
source/geometry/solids/BREPS/include/G4Hyperbola.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Hyperbola.icc,v 1.7 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4KnotVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4KnotVector.hh,v 1.7 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4KnotVector
source/geometry/solids/BREPS/include/G4KnotVector.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4KnotVector.icc,v 1.3 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4Line.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Line.hh,v 1.7 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4Line
source/geometry/solids/BREPS/include/G4Line.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Line.icc,v 1.7 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4OsloMatrix.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OsloMatrix.hh,v 1.5 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4OsloMatrix
source/geometry/solids/BREPS/include/G4OsloMatrix.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OsloMatrix.icc,v 1.3 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4Parabola.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Parabola.hh,v 1.8 2001/07/11 09:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4Parabola
source/geometry/solids/BREPS/include/G4Parabola.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Parabola.icc,v 1.6 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4PlacedSolid.hh
+5 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PlacedSolid.hh,v 1.7 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4PlacedSolid.hh,v 1.8 2002/11/06 23:28:53 radoone Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4PlacedSolid
@@ -60,6 +60,9 @@ public: // with description
inline G4ThreeVector* GetTranslation() const;
// Accessors.
G4std::ostream& StreamInfo(G4std::ostream& os) const;
// Streams solid contents to output stream.
private:
G4PlacedSolid(const G4PlacedSolid&);
source/geometry/solids/BREPS/include/G4PlacedSolid.icc
+8 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PlacedSolid.icc,v 1.5 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4PlacedSolid.icc,v 1.6 2002/11/06 23:28:54 radoone Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -55,3 +55,9 @@ G4ThreeVector* G4PlacedSolid::GetTranslation() const
{
return solidTranslation;
}
inline
G4std::ostream& G4PlacedSolid::StreamInfo(G4std::ostream& os) const
{
return solid->StreamInfo( os );
}
source/geometry/solids/BREPS/include/G4PlacementVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PlacementVector.hh,v 1.5 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4PlacementVector
source/geometry/solids/BREPS/include/G4Plane.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Plane.hh,v 1.5 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4Plane
source/geometry/solids/BREPS/include/G4Point3DVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Point3DVector.hh,v 1.6 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4Point3DVector
source/geometry/solids/BREPS/include/G4PointRat.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PointRat.hh,v 1.9 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4PointRat
source/geometry/solids/BREPS/include/G4PointRat.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PointRat.icc,v 1.3 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4ProjectedSurface.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ProjectedSurface.hh,v 1.6 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4ProjectedSurface
source/geometry/solids/BREPS/include/G4ProjectedSurface.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ProjectedSurface.icc,v 1.3 2001/07/11 09:59:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4Ray.hh
+15 -15
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Ray.hh,v 1.6 2001/07/11 09:59:37 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4Ray.hh,v 1.7 2002/11/21 16:52:52 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4Ray
@@ -113,35 +113,35 @@ public: // with description
inline void Vsetall(G4Vector3D &a, G4double s);
// Sets all elements of vector to the same scalar value.
static inline void Vcross(G4Plane &a, const G4Vector3D &b,
const G4Vector3D &c);
static void Vcross(G4Plane &a, const G4Vector3D &b,
const G4Vector3D &c);
// Cross product of 'b' and 'c'. Stores result in 'a' (G4Plane).
static inline void Vcross(G4Vector3D &a, const G4Vector3D &b,
const G4Vector3D &c);
static void Vcross(G4Vector3D &a, const G4Vector3D &b,
const G4Vector3D &c);
// Cross product of 'b' and 'c'. Stores result in 'a' (G4Vector3D).
static inline void Vmove(G4Point3D &a, const G4Point3D &b);
static void Vmove(G4Point3D &a, const G4Point3D &b);
// Sets 'a' equal to 'b'.
static inline void Vadd2(G4Point3D &a, const G4Point3D &b,
const G4Vector3D &c );
static void Vadd2(G4Point3D &a, const G4Point3D &b,
const G4Vector3D &c );
// Adds vector 'c' to 'b'. Stores result in 'a'.
static inline void Vsub2(G4Vector3D &a, const G4Point3D &b,
const G4Point3D &c);
static void Vsub2(G4Vector3D &a, const G4Point3D &b,
const G4Point3D &c);
// Subtracts vector 'c' from 'b'. Stores result in 'a'.
static inline void Vscale(G4Plane& a, const G4Plane& b, G4double c);
static void Vscale(G4Plane& a, const G4Plane& b, G4double c);
// Scales vector at `b' by scalar `c'. Stores result in `a'.
static inline G4double Vdot(const G4Plane &a, const G4Point3D &b);
static G4double Vdot(const G4Plane &a, const G4Point3D &b);
// Computes dot product of vectors at `a' and `b'.
static inline G4double Magsq(const G4Plane &a);
static G4double Magsq(const G4Plane &a);
// Returns scalar Magnitude squared of vector at `a'.
static inline G4double Magnitude(const G4Plane &a);
static G4double Magnitude(const G4Plane &a);
// Returns scalar Magnitude of vector at `a'.
public: // without description
source/geometry/solids/BREPS/include/G4Ray.icc
+2 -70
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Ray.icc,v 1.5 2001/07/11 09:59:37 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4Ray.icc,v 1.6 2002/11/21 16:52:53 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -90,76 +90,8 @@ G4int G4Ray::NearZero(G4double val, G4double epsilon) const
return ( ((val) > -epsilon) && ((val) < epsilon) );
}
inline
void G4Ray::Vcross(G4Plane &a, const G4Vector3D &b, const G4Vector3D &c)
{
a.a = b.y() * c.z() - b.z() * c.y() ;
a.b = b.z() * c.x() - b.x() * c.z() ;
a.c = b.x() * c.y() - b.y() * c.x() ;
}
inline
void G4Ray::Vcross(G4Vector3D &a, const G4Vector3D &b, const G4Vector3D &c)
{
a.setX(b.y() * c.z() - b.z() * c.y()) ;
a.setY(b.z() * c.x() - b.x() * c.z()) ;
a.setZ(b.x() * c.y() - b.y() * c.x()) ;
}
inline
void G4Ray::Vmove(G4Point3D &a, const G4Point3D &b)
{
a.setX(b.x());
a.setY(b.y());
a.setZ(b.z());
}
inline
void G4Ray::Vadd2(G4Point3D &a, const G4Point3D &b, const G4Vector3D &c)
{
a.setX(b.x() + c.x()) ;
a.setY(b.y() + c.y()) ;
a.setZ(b.z() + c.z()) ;
}
inline
void G4Ray::Vsub2(G4Vector3D &a, const G4Point3D &b, const G4Point3D &c)
{
a.setX(b.x() - c.x());
a.setY(b.y() - c.y());
a.setZ(b.z() - c.z());
}
inline
void G4Ray::Vsetall(G4Vector3D &a, G4double s)
{
a.setX(s); a.setY(s); a.setZ(s);
}
inline
void G4Ray::Vscale(G4Plane& a, const G4Plane& b, G4double c)
{
a.a = b.a * c;
a.b = b.b * c;
a.c = b.c * c;
}
inline
G4double G4Ray::Vdot(const G4Plane &a, const G4Point3D &b)
{
return (a.a * b.x() +
a.b * b.y() +
a.c * b.z());
}
inline
G4double G4Ray::Magsq(const G4Plane &a)
{
return ( a.a * a.a + a.b * a.b + a.c *a.c );
}
inline
G4double G4Ray::Magnitude(const G4Plane &a)
{
return (sqrt( Magsq( a )) );
}
source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4RectangularTrimmedSurface.hh,v 1.7 2001/07/11 09:59:37 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4BezierSurface
source/geometry/solids/BREPS/include/G4STEPEntity.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4STEPEntity.hh,v 1.6 2001/07/11 09:59:37 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4STEPEntity
source/geometry/solids/BREPS/include/G4Sort.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Sort.hh,v 1.4 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
//
source/geometry/solids/BREPS/include/G4SphericalSurface.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4SphericalSurface.hh,v 1.8 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4SphericalSurface
source/geometry/solids/BREPS/include/G4SphericalSurface.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4SphericalSurface.icc,v 1.3 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4Surface.hh
+4 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Surface.hh,v 1.7 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4Surface.hh,v 1.8 2002/11/21 16:52:53 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4Surface
@@ -110,8 +110,8 @@ public: // with description
public: // without description
inline static void Project (G4double& Coord, const G4Point3D& Pt,
const G4Plane& Pl);
static void Project (G4double& Coord, const G4Point3D& Pt,
const G4Plane& Pl);
// Utility function returning the projection (Coord) of a point Pt
// on a plane Pl.
source/geometry/solids/BREPS/include/G4Surface.icc
+2 -10
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Surface.icc,v 1.3 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4Surface.icc,v 1.4 2002/11/21 16:52:53 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -103,11 +103,3 @@ void G4Surface::SetNextNode(G4Surface* node)
{
next = node;
}
inline
void G4Surface::Project (G4double& Coord,
const G4Point3D& Pt2,
const G4Plane& Pl1)
{
Coord = Pt2.x()*Pl1.a + Pt2.y()*Pl1.b + Pt2.z()*Pl1.c - Pl1.d;
}
source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4SurfaceBoundary.hh,v 1.6 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4SurfaceBoundary
source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4SurfaceBoundary.icc,v 1.4 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4SurfaceList.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4SurfaceList.hh,v 1.5 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4SurfaceList
source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4SurfaceOfLinearExtrusion.hh,v 1.4 2001/07/11 09:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4SurfaceOfLinearExtrusion
source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4SurfaceOfRevolution.hh,v 1.4 2001/07/11 09:59:39 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4SurfaceOfRevolution
source/geometry/solids/BREPS/include/G4ThreeMat.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ThreeMat.hh,v 1.8 2001/07/11 09:59:39 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4ThreeMat
source/geometry/solids/BREPS/include/G4ToroidalSurface.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ToroidalSurface.hh,v 1.6 2001/07/11 09:59:39 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4ToroidalSurface
source/geometry/solids/BREPS/include/G4ToroidalSurface.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ToroidalSurface.icc,v 1.3 2001/07/11 09:59:39 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/BREPS/include/G4UVHit.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4UVHit.hh,v 1.6 2001/07/11 09:59:39 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// Class G4UVHit
source/geometry/solids/BREPS/src/G4Assembly.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Assembly.cc,v 1.5 2001/07/11 09:59:40 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Axis2Placement3D.cc,v 1.6 2001/07/11 09:59:40 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
source/geometry/solids/BREPS/src/G4BREPSolid.cc
+38 -7
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolid.cc,v 1.20 2001/07/20 11:52:43 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolid.cc,v 1.22 2002/11/06 23:29:32 radoone Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -43,15 +43,30 @@
#include "G4ToroidalSurface.hh"
#include "G4SphericalSurface.hh"
/*
G4int Box, Convex, AxisBox, PlaneSolid;
G4Axis2Placement3D* place;
G4BoundingBox3D* bbox;
G4double intersectionDistance;
G4int active;
G4int startInside;
G4int nb_of_surfaces;
G4Point3D intersection_point;
G4Surface** SurfaceVec;
G4double RealDist;
G4String solidname;
G4int Id;
*/
G4Ray G4BREPSolid::Track;
G4double G4BREPSolid::ShortestDistance= kInfinity;
G4int G4BREPSolid::NumberOfSolids=0;
G4BREPSolid::G4BREPSolid(const G4String& name)
: G4VSolid(name),
Box(0), Convex(0), AxisBox(0), PlaneSolid(0), place(0),
Box(0), Convex(0), AxisBox(0), PlaneSolid(0), place(0), bbox(0),
intersectionDistance(kInfinity), active(1), startInside(0),
solidname(name)
nb_of_surfaces(0), SurfaceVec(0), solidname(name)
{
}
@@ -59,7 +74,7 @@ G4BREPSolid::G4BREPSolid( const G4String& name ,
G4Surface** srfVec ,
G4int numberOfSrfs )
: G4VSolid(name),
Box(0), Convex(0), AxisBox(0), PlaneSolid(0), place(0),
Box(0), Convex(0), AxisBox(0), PlaneSolid(0), place(0), bbox(0),
intersectionDistance(kInfinity), active(1), startInside(0),
nb_of_surfaces(numberOfSrfs), SurfaceVec(srfVec)
{
@@ -71,12 +86,14 @@ G4BREPSolid::~G4BREPSolid()
if(place)
delete place;
delete bbox;
if(bbox)
delete bbox;
for(G4int a=0;a<nb_of_surfaces;a++)
delete SurfaceVec[a];
delete [] SurfaceVec;
if( nb_of_surfaces > 0 && SurfaceVec != 0)
delete [] SurfaceVec;
}
void G4BREPSolid::Initialize()
@@ -1467,3 +1484,17 @@ G4Point3D G4BREPSolid::Scope() const
return scope;
}
G4std::ostream& G4BREPSolid::StreamInfo(G4std::ostream& os) const
{
os << "-----------------------------------------------------------\n"
<< " *** Dump for solid - " << GetName() << " ***\n"
<< " ===================================================\n"
<< " Solid type: " << GetEntityType() << "\n"
<< " Parameters: \n"
<< " Number of solids: " << NumberOfSolids << "\n"
<< "-----------------------------------------------------------\n";
return os;
}
source/geometry/solids/BREPS/src/G4BREPSolidBox.cc
+31 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidBox.cc,v 1.6 2001/07/20 12:47:52 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidBox.cc,v 1.7 2002/11/06 23:29:33 radoone Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -84,6 +84,16 @@ G4BREPSolidBox::G4BREPSolidBox(const G4String& name,
PVec[3] = Pt8;
SurfaceVec[5] = new G4FPlane(&PVec);
// Save the constructor parameters
constructorParams[0] = Pt1;
constructorParams[1] = Pt2;
constructorParams[2] = Pt3;
constructorParams[3] = Pt4;
constructorParams[4] = Pt5;
constructorParams[5] = Pt6;
constructorParams[6] = Pt7;
constructorParams[7] = Pt8;
Initialize();
}
@@ -115,3 +125,22 @@ EInside G4BREPSolidBox::Inside(register const G4ThreeVector& Pt) const
return kSurface;
}
// Streams solid contents to output stream.
G4std::ostream& G4BREPSolidBox::StreamInfo(G4std::ostream& os) const
{
G4BREPSolid::StreamInfo( os )
<< "\n"
<< " Pt1: " << constructorParams[0]
<< " Pt2: " << constructorParams[1]
<< " Pt3: " << constructorParams[2]
<< " Pt4: " << constructorParams[3]
<< "\n Pt5: " << constructorParams[4]
<< " Pt6: " << constructorParams[5]
<< " Pt7: " << constructorParams[6]
<< " Pt8: " << constructorParams[7]
<< "\n-----------------------------------------------------------\n";
return os;
}
source/geometry/solids/BREPS/src/G4BREPSolidCone.cc
+27 -2
View File
@@ -20,8 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
// $Id: G4BREPSolidCone.cc,v 1.7 2001/07/11 09:59:41 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidCone.cc,v 1.10 2002/12/03 14:24:20 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -101,6 +101,15 @@ G4BREPSolidCone::G4BREPSolidCone(const G4String& name,
nb_of_surfaces = 3;
active=1;
// Save constructor parameters
constructorParams.origin = origin;
constructorParams.axis = axis;
constructorParams.direction = direction;
constructorParams.length = length;
constructorParams.radius = radius;
constructorParams.large_radius = large_radius;
Initialize();
}
@@ -198,3 +207,19 @@ G4double G4BREPSolidCone::DistanceToOut(const G4ThreeVector& Pt) const
if(dist1 > dist3) dist1 = dist3;
return dist1;
}
// Streams solid contents to output stream.
G4std::ostream& G4BREPSolidCone::StreamInfo(G4std::ostream& os) const
{
G4BREPSolid::StreamInfo( os )
<< "\n origin: " << constructorParams.origin
<< "\n axis: " << constructorParams.axis
<< "\n direction: " << constructorParams.direction
<< "\n length: " << constructorParams.length
<< "\n radius: " << constructorParams.radius
<< "\n large_radius: " << constructorParams.large_radius
<< "\n-----------------------------------------------------------\n";
return os;
}
source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc
+25 -2
View File
@@ -20,8 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
// $Id: G4BREPSolidCylinder.cc,v 1.7 2001/07/11 09:59:41 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidCylinder.cc,v 1.8 2002/11/06 23:29:35 radoone Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -86,9 +86,32 @@ G4BREPSolidCylinder::G4BREPSolidCylinder(const G4String& name,
nb_of_surfaces = 3;
active=1;
// Save constructor parameters
constructorParams.origin = origin;
constructorParams.axis = axis;
constructorParams.direction = direction;
constructorParams.length = length;
constructorParams.radius = radius;
Initialize();
}
G4BREPSolidCylinder::~G4BREPSolidCylinder()
{
}
// Streams solid contents to output stream.
G4std::ostream& G4BREPSolidCylinder::StreamInfo(G4std::ostream& os) const
{
G4BREPSolid::StreamInfo( os )
<< "\n origin: " << constructorParams.origin
<< "\n axis: " << constructorParams.axis
<< "\n direction: " << constructorParams.direction
<< "\n length: " << constructorParams.length
<< "\n radius: " << constructorParams.radius
<< "\n-----------------------------------------------------------\n";
return os;
}
source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc
+21 -10
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4BREPSolidOpenPCone.cc,v 1.6 2001/07/11 09:59:41 gunter Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidOpenPCone.cc,v 1.7 2002/11/06 23:29:36 radoone Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -47,14 +47,16 @@ G4BREPSolidOpenPCone::G4BREPSolidOpenPCone
G4double RMAX[]
)
: G4IntersectionSolid ( name,
new G4BREPSolidPCone ( name,
start_angle,
opening_angle,
num_z_planes,
z_start, z_values,
RMIN, RMAX ),
new G4Tubs( "IntersectionTubs", 0., 1., 1.,
start_angle, opening_angle ) )
new G4BREPSolidPCone( name,
start_angle, opening_angle,
num_z_planes, z_start, z_values,
RMIN, RMAX
),
new G4Tubs( "IntersectionTubs",
0., 1., 1., start_angle, opening_angle
)
)
//, constructorParams.z_values( 0 ), constructorParams.RMIN( 0 ), constructorParams.RMAX( 0 )
{
// compute max radius
@@ -78,3 +80,12 @@ void G4BREPSolidOpenPCone::DescribeYourselfTo (G4VGraphicsScene& scene) const
{
scene.AddThis ( *this );
}
// Streams solid contents to output stream.
G4std::ostream& G4BREPSolidOpenPCone::StreamInfo(G4std::ostream& os) const
{
G4IntersectionSolid::StreamInfo( os );
return os;
}
source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc
+76 -58
View File
@@ -20,8 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
// $Id: G4BREPSolidPCone.cc,v 1.26 2002/03/11 19:09:37 radoone Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidPCone.cc,v 1.28 2002/11/06 23:29:37 radoone Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -361,11 +361,13 @@ G4BREPSolidPCone::G4BREPSolidPCone(const G4String& name,
G4Point3D ArcStart1a = G4Point3D( Origin + (RMIN[0]*PlaneDir) );
G4Point3D ArcStart1b = G4Point3D( Origin + (RMAX[0]*PlaneDir) );
tmp = new G4CircularCurve;
tmp->Init(G4Axis2Placement3D(PlaneDir, PlaneAxis, Origin), RMIN[0]);
tmp->SetBounds(ArcStart1a, ArcStart1a);
tmp->SetSameSense(0);
cv.push_back(tmp);
if( RMIN[0] > 0.0 ) {
tmp = new G4CircularCurve;
tmp->Init(G4Axis2Placement3D(PlaneDir, PlaneAxis, Origin), RMIN[0]);
tmp->SetBounds(ArcStart1a, ArcStart1a);
tmp->SetSameSense(0);
cv.push_back(tmp);
}
tmp = new G4CircularCurve;
tmp->Init(G4Axis2Placement3D(PlaneDir, PlaneAxis, Origin), RMAX[0]);
@@ -389,12 +391,13 @@ G4BREPSolidPCone::G4BREPSolidPCone(const G4String& name,
cv.clear();
tmp = new G4CircularCurve;
tmp->Init(G4Axis2Placement3D(PlaneDir, PlaneAxis, LocalOrigin),
RMIN[sections]);
tmp->SetBounds(ArcStart2a, ArcStart2a);
tmp->SetSameSense(0);
cv.push_back(tmp);
if( RMIN[sections] > 0.0 ) {
tmp = new G4CircularCurve;
tmp->Init(G4Axis2Placement3D(PlaneDir, PlaneAxis, LocalOrigin), RMIN[sections]);
tmp->SetBounds(ArcStart2a, ArcStart2a);
tmp->SetSameSense(0);
cv.push_back(tmp);
}
tmp = new G4CircularCurve;
tmp->Init(G4Axis2Placement3D(PlaneDir, PlaneAxis, LocalOrigin),
@@ -413,51 +416,38 @@ G4BREPSolidPCone::G4BREPSolidPCone(const G4String& name,
nb_of_surfaces--;
}
// Save contructor parameters
constructorParams.start_angle = start_angle;
constructorParams.opening_angle = opening_angle;
constructorParams.num_z_planes = num_z_planes;
constructorParams.z_start = z_start;
constructorParams.z_values = 0;
constructorParams.RMIN = 0;
constructorParams.RMAX = 0;
if( num_z_planes > 0 ) {
constructorParams.z_values = new G4double[num_z_planes];
constructorParams.RMIN = new G4double[num_z_planes];
constructorParams.RMAX = new G4double[num_z_planes];
for( G4int idx = 0; idx < num_z_planes; idx++ ) {
constructorParams.z_values[idx] = z_values[idx];
constructorParams.RMIN[idx] = RMIN[idx];
constructorParams.RMAX[idx] = RMAX[idx];
}
}
active=1;
Initialize();
// Store the original parameters, to be used in visualisation
original_parameters.Start_angle= start_angle;
original_parameters.Opening_angle= opening_angle;
original_parameters.Num_z_planes= num_z_planes;
// original_parameters.z_start= z_start;
original_parameters.Z_values= new G4double[num_z_planes];
original_parameters.Rmin= new G4double[nb_of_surfaces];
original_parameters.Rmax= new G4double[nb_of_surfaces];
for(int is=0;is<num_z_planes;is++)
{
original_parameters.Z_values[is]= z_values[is];
original_parameters.Rmin[is]= RMIN[is];
original_parameters.Rmax[is]= RMAX[is];
}
// z_values[0] should be equal to z_start, for consistency
// with what the constructor does.
// Otherwise the z_values that are given are used
// shifted by z_values[0] - z_start:
// (because z_values are only used in
// line 26: Length = z_values[a+1] - z_values[a];
// ) // JA Apr 2, 97
/*
if( z_values[0] != z_start )
{
G4cerr << "ERROR in creating G4BREPSolidPCone: "
<< " z_values[0]= " << z_values[0] << " is not equal to "
<< " z_start= " , z_start;
// G4Exception(" Error in creating G4BREPSolidPCone: z_values[0] must be equal to z_start" );
original_parameters.Z_values[0]= z_start;
}
*/
}
G4BREPSolidPCone::~G4BREPSolidPCone()
{
delete [] original_parameters.Z_values;
delete [] original_parameters.Rmin;
delete [] original_parameters.Rmax;
if( constructorParams.num_z_planes > 0 ) {
delete [] constructorParams.z_values;
delete [] constructorParams.RMIN;
delete [] constructorParams.RMIN;
}
}
void G4BREPSolidPCone::Initialize()
@@ -793,6 +783,32 @@ G4double G4BREPSolidPCone::DistanceToOut(const G4ThreeVector& Pt) const
return fabs(Dist);
}
// Streams solid contents to output stream.
G4std::ostream& G4BREPSolidPCone::StreamInfo(G4std::ostream& os) const
{
G4BREPSolid::StreamInfo( os )
<< "\n start_angle: " << constructorParams.start_angle
<< "\n opening_angle: " << constructorParams.opening_angle
<< "\n num_z_planes: " << constructorParams.num_z_planes
<< "\n z_start: " << constructorParams.z_start
<< "\n z_values: ";
G4int idx;
for( idx = 0; idx < constructorParams.num_z_planes; idx++ ) {
os << constructorParams.z_values[idx] << " ";
}
os << "\n RMIN: ";
for( idx = 0; idx < constructorParams.num_z_planes; idx++ ) {
os << constructorParams.RMIN[idx] << " ";
}
os << "\n RMAX: ";
for( idx = 0; idx < constructorParams.num_z_planes; idx++ ) {
os << constructorParams.RMAX[idx] << " ";
}
os << "\n-----------------------------------------------------------\n";
return os;
}
void G4BREPSolidPCone::Reset() const
{
Active(1);
@@ -860,10 +876,12 @@ G4Surface* G4BREPSolidPCone::ComputePlanarSurface( G4double r1, G4double r2,
G4Polyhedron* G4BREPSolidPCone::CreatePolyhedron() const
{
return new G4PolyhedronPcon( original_parameters.Start_angle,
original_parameters.Opening_angle,
original_parameters.Num_z_planes,
original_parameters.Z_values,
original_parameters.Rmin,
original_parameters.Rmax);
return new G4PolyhedronPcon(
constructorParams.start_angle,
constructorParams.opening_angle,
constructorParams.num_z_planes,
constructorParams.z_values,
constructorParams.RMIN,
constructorParams.RMAX
);
}
source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc
+76 -66
View File
@@ -20,8 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
// $Id: G4BREPSolidPolyhedra.cc,v 1.22 2002/02/14 18:39:12 radoone Exp $
// GEANT4 tag $Name: geant4-04-01 $
// $Id: G4BREPSolidPolyhedra.cc,v 1.23 2002/11/06 23:29:38 radoone Exp $
// GEANT4 tag $Name: geant4-05-00 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -64,8 +64,8 @@
#include "g4std/strstream"
G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
G4double phi1,
G4double dphi,
G4double start_angle,
G4double opening_angle,
G4int sides,
G4int num_z_planes,
G4double z_start,
@@ -76,7 +76,7 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
{
G4int sections = num_z_planes - 1;
if( dphi >= 2*pi-perMillion ) {
if( opening_angle >= 2*pi-perMillion ) {
nb_of_surfaces = 2*(sections * sides) + 2;
} else {
nb_of_surfaces = 2*(sections * sides) + 4;
@@ -93,7 +93,7 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
G4Point3D LocalOrigin(0,0,z_start);
G4double Length;
G4int Count = 0 ;
G4double PartAngle = (dphi)/sides;
G4double PartAngle = (opening_angle)/sides;
///////////////////////////////////////////////////
@@ -199,7 +199,7 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
if( Length != 0.0 ) {
TmpAxis= XAxis;
TmpAxis.rotateZ(phi1);
TmpAxis.rotateZ(start_angle);
// L. Broglia: Be careful in the construction of the planes, see G4FPlane
for( G4int b = 0; b < sides; b++ ) {
@@ -342,7 +342,7 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
}
TmpAxis= XAxis;
TmpAxis.rotateZ(phi1);
TmpAxis.rotateZ(start_angle);
// Compute the outer planar surface
MaxSurfaceVec[Count] = ComputePlanarSurface( RMAX[a], RMAX[a+1], LocalOrigin, TmpAxis, sides, PartAngle, OuterSurfSense );
@@ -353,7 +353,7 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
Count++;
TmpAxis= XAxis;
TmpAxis.rotateZ(phi1);
TmpAxis.rotateZ(start_angle);
// Compute the inner planar surface
MaxSurfaceVec[Count] = ComputePlanarSurface( RMIN[a], RMIN[a+1], LocalOrigin, TmpAxis, sides, PartAngle, InnerSurfSense );
@@ -415,7 +415,7 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
}
TmpAxis= XAxis;
TmpAxis.rotateZ(phi1);
TmpAxis.rotateZ(start_angle);
MaxSurfaceVec[Count] = ComputePlanarSurface( R1, R2, LocalOrigin, TmpAxis, sides, PartAngle, SurfSense );
if( MaxSurfaceVec[Count] == 0 ) {
@@ -432,11 +432,11 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
LocalOrigin = LocalOrigin + (Length*Axis);
} // End of for loop over z sections
if(dphi >= 2*pi-perMillion) {
if(opening_angle >= 2*pi-perMillion) {
// Create the end planes for the configuration where delta phi >= 2*PI
TmpAxis = XAxis;
TmpAxis.rotateZ(phi1);
TmpAxis.rotateZ(start_angle);
MaxSurfaceVec[Count] = ComputePlanarSurface( RMIN[0], RMAX[0], Origin, TmpAxis, sides, PartAngle, ENormal );
@@ -448,7 +448,7 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
// Reset plane axis
TmpAxis = XAxis;
TmpAxis.rotateZ(phi1);
TmpAxis.rotateZ(start_angle);
MaxSurfaceVec[Count] = ComputePlanarSurface( RMIN[sections], RMAX[sections], LocalOrigin, TmpAxis, sides, PartAngle, EInverse );
@@ -464,9 +464,9 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
// Create the lateral planars
TmpAxis = XAxis;
G4Vector3D TmpAxis2 = XAxis;
TmpAxis.rotateZ(phi1);
TmpAxis2.rotateZ(phi1);
TmpAxis2.rotateZ(dphi);
TmpAxis.rotateZ(start_angle);
TmpAxis2.rotateZ(start_angle);
TmpAxis2.rotateZ(start_angle);
LocalOrigin = Origin;
G4int points = sections*2+2;
@@ -494,8 +494,8 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
MaxSurfaceVec[Count++] = new G4FPlane( &GapPointList2, 0, EInverse );
TmpAxis = XAxis;
TmpAxis.rotateZ(phi1);
TmpAxis.rotateZ(dphi);
TmpAxis.rotateZ(start_angle);
TmpAxis.rotateZ(opening_angle);
// Create end planes
G4Point3DVector EndPointList ((sides+1)*2);
@@ -564,46 +564,27 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
// Note radii are not scaled because this BREP uses the radius of the
// circumscribed circle and also graphics_reps/G4Polyhedron uses the radius of
// the circumscribed circle.
original_parameters.Start_angle= phi1;
original_parameters.Opening_angle= dphi;
original_parameters.Sides= sides;
original_parameters.Num_z_planes= num_z_planes;
original_parameters.Z_values= new G4double[num_z_planes];
original_parameters.Rmin= new G4double[num_z_planes];
original_parameters.Rmax= new G4double[num_z_planes];
G4double rFactor = 1.;
for(G4int is=0;is<num_z_planes;is++)
{
original_parameters.Z_values[is]= z_values[is];
original_parameters.Rmin[is]= RMIN[is]/rFactor;
original_parameters.Rmax[is]= RMAX[is]/rFactor;
}
///////////////////////////////////////////////////
// Print for debugging
#ifdef G4VERBOSE
static G4int print_pgone_parameters = 1;
// Save contructor parameters
constructorParams.start_angle = start_angle;
constructorParams.opening_angle = opening_angle;
constructorParams.sides = sides;
constructorParams.num_z_planes = num_z_planes;
constructorParams.z_start = z_start;
constructorParams.z_values = 0;
constructorParams.RMIN = 0;
constructorParams.RMAX = 0;
if(print_pgone_parameters)
{
G4cout << "Parameters of the G4PGone " << name << G4endl;
G4cout << " starting angle =" << original_parameters.Start_angle << G4endl;
G4cout << " opening angle =" << original_parameters.Opening_angle << G4endl;
G4cout << " sides =" << original_parameters.Sides << G4endl;
G4cout << " nb of z planes=" << original_parameters.Num_z_planes << G4endl;
for (G4int nb = 0; nb <= sections; nb++)
{
G4cout << " Z[" << nb << "] = " << original_parameters.Z_values[nb];
G4cout << " Rmin[" << nb << "] = " << original_parameters.Rmin[nb];
G4cout << " Rmax[" << nb << "] = " << original_parameters.Rmax[nb]
<< G4endl;
}
if( num_z_planes > 0 ) {
constructorParams.z_values = new G4double[num_z_planes];
constructorParams.RMIN = new G4double[num_z_planes];
constructorParams.RMAX = new G4double[num_z_planes];
for( G4int idx = 0; idx < num_z_planes; idx++ ) {
constructorParams.z_values[idx] = z_values[idx];
constructorParams.RMIN[idx] = RMIN[idx];
constructorParams.RMAX[idx] = RMAX[idx];
}
}
#endif
// z_values[0] should be equal to z_start, for consistency
// with what the constructor does.
@@ -617,7 +598,7 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
" z_values[0]= " << z_values[0] << " is not equal to " <<
" z_start= " << z_start;
// G4Exception(" Error in creating G4BREPSolidPolyhedra: z_values[0] must be equal to z_start" );
original_parameters.Z_values[0]= z_start;
constructorParams.z_values[0]= z_start;
}
active=1;
@@ -626,9 +607,11 @@ G4BREPSolidPolyhedra::G4BREPSolidPolyhedra(const G4String& name,
G4BREPSolidPolyhedra::~G4BREPSolidPolyhedra()
{
delete[] original_parameters.Z_values;
delete[] original_parameters.Rmin;
delete[] original_parameters.Rmax;
if( constructorParams.num_z_planes > 0 ) {
delete [] constructorParams.z_values;
delete [] constructorParams.RMIN;
delete [] constructorParams.RMIN;
}
}
void G4BREPSolidPolyhedra::Initialize()
@@ -1006,6 +989,33 @@ G4double G4BREPSolidPolyhedra::DistanceToOut(const G4ThreeVector& Pt) const
}
}
// Streams solid contents to output stream.
G4std::ostream& G4BREPSolidPolyhedra::StreamInfo(G4std::ostream& os) const
{
G4BREPSolid::StreamInfo( os )
<< "\n start_angle: " << constructorParams.start_angle
<< "\n opening_angle: " << constructorParams.opening_angle
<< "\n sides: " << constructorParams.sides
<< "\n num_z_planes: " << constructorParams.num_z_planes
<< "\n z_start: " << constructorParams.z_start
<< "\n z_values: ";
G4int idx;
for( idx = 0; idx < constructorParams.num_z_planes; idx++ ) {
os << constructorParams.z_values[idx] << " ";
}
os << "\n RMIN: ";
for( idx = 0; idx < constructorParams.num_z_planes; idx++ ) {
os << constructorParams.RMIN[idx] << " ";
}
os << "\n RMAX: ";
for( idx = 0; idx < constructorParams.num_z_planes; idx++ ) {
os << constructorParams.RMAX[idx] << " ";
}
os << "\n-----------------------------------------------------------\n";
return os;
}
G4Surface* G4BREPSolidPolyhedra::CreateTrapezoidalSurface( G4double r1, G4double r2,
const G4Point3D& origin, G4double distance,
G4Vector3D& xAxis, G4double partAngle,
@@ -1111,11 +1121,11 @@ G4Surface* G4BREPSolidPolyhedra::ComputePlanarSurface( G4double r1, G4double r2,
G4Polyhedron* G4BREPSolidPolyhedra::CreatePolyhedron() const
{
return new G4PolyhedronPgon( original_parameters.Start_angle,
original_parameters.Opening_angle,
original_parameters.Sides,
original_parameters.Num_z_planes,
original_parameters.Z_values,
original_parameters.Rmin,
original_parameters.Rmax);
return new G4PolyhedronPgon( constructorParams.start_angle,
constructorParams.opening_angle,
constructorParams.sides,
constructorParams.num_z_planes,
constructorParams.z_values,
constructorParams.RMIN,
constructorParams.RMAX);
}

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