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

Import Geant4 9.5.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 16:46:55 +02:00
parent 89a9605df1
commit b1eb5424d2
10957 changed files with 888481 additions and 160139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/specific/include/G4ClippablePolygon.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ClippablePolygon.hh,v 1.11 2007/05/11 13:54:28 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4ClippablePolygon.hh,v 1.11 2007-05-11 13:54:28 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4ClippablePolygon.icc
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ClippablePolygon.icc,v 1.4 2006/06/29 18:46:41 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4ClippablePolygon.icc,v 1.4 2006-06-29 18:46:41 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/specific/include/G4Ellipsoid.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Ellipsoid.hh,v 1.14 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4Ellipsoid.hh,v 1.14 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4Ellipsoid.icc
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Ellipsoid.icc,v 1.7 2006/10/20 13:45:20 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4Ellipsoid.icc,v 1.7 2006-10-20 13:45:20 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4EllipticalCone.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4EllipticalCone.hh,v 1.14 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4EllipticalCone.hh,v 1.14 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4EllipticalCone.icc
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4EllipticalCone.icc,v 1.7 2008/11/21 09:26:22 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4EllipticalCone.icc,v 1.7 2008-11-21 09:26:22 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4EllipticalTube.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4EllipticalTube.hh,v 1.22 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4EllipticalTube.hh,v 1.22 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// --------------------------------------------------------------------
// GEANT 4 class header file
source/geometry/solids/specific/include/G4EllipticalTube.icc
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4EllipticalTube.icc,v 1.4 2006/06/29 18:46:55 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4EllipticalTube.icc,v 1.4 2006-06-29 18:46:55 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/specific/include/G4EnclosingCylinder.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4EnclosingCylinder.hh,v 1.8 2006/06/29 18:46:58 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4EnclosingCylinder.hh,v 1.8 2006-06-29 18:46:58 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4ExtrudedSolid.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ExtrudedSolid.hh,v 1.10 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4ExtrudedSolid.hh,v 1.10 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4ExtrudedSolid.icc
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ExtrudedSolid.icc,v 1.2 2007/02/19 10:17:45 ivana Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4ExtrudedSolid.icc,v 1.2 2007-02-19 10:17:45 ivana Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -45,7 +45,7 @@ inline G4TwoVector G4ExtrudedSolid::GetVertex(G4int index) const
{
if ( index<0 || index >= fNv )
{
G4Exception ("G4ExtrudedSolid::GetVertex()", "InvalidInput",
G4Exception ("G4ExtrudedSolid::GetVertex()", "GeomSolids0003",
FatalException, "Index outside range.");
return G4TwoVector();
}
@@ -69,7 +69,7 @@ G4ExtrudedSolid::ZSection G4ExtrudedSolid::GetZSection(G4int index) const
{
if ( index<0 || index >= fNz )
{
G4Exception ("G4ExtrudedSolid::GetZSection()", "InvalidInput",
G4Exception ("G4ExtrudedSolid::GetZSection()", "GeomSolids0003",
FatalException, "Index outside range.");
return ZSection(0.0, G4TwoVector(), 0.0);
}
source/geometry/solids/specific/include/G4GenericTrap.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4GenericTrap.hh,v 1.13 2010/11/10 10:00:16 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4GenericTrap.hh,v 1.13 2010-11-10 10:00:16 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4GenericTrap.icc
+5 -5
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4GenericTrap.icc,v 1.5 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4GenericTrap.icc,v 1.5 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -56,7 +56,7 @@ G4TwoVector G4GenericTrap::GetVertex(G4int index) const
{
if ( index<0 || index >= G4int(fVertices.size()) )
{
G4Exception ("G4GenericTrap::GetVertex()", "InvalidInput",
G4Exception ("G4GenericTrap::GetVertex()", "GeomSolids0003",
FatalException, "Index outside range.");
return G4TwoVector();
}
@@ -78,7 +78,7 @@ G4double G4GenericTrap::GetTwistAngle(G4int index) const
{
if ( (index<0) || (index >= G4int(fVertices.size())) )
{
G4Exception ("G4GenericTrap::GetTwistAngle()", "InvalidInput",
G4Exception ("G4GenericTrap::GetTwistAngle()", "GeomSolids0003",
FatalException, "Index outside range.");
return 0.;
}
@@ -100,7 +100,7 @@ void G4GenericTrap::SetTwistAngle(G4int index, G4double twist)
{
if ( (index<0) || (index >= G4int(fVertices.size())) )
{
G4Exception ("G4GenericTrap::SetTwistAngle()", "InvalidInput",
G4Exception ("G4GenericTrap::SetTwistAngle()", "GeomSolids0003",
FatalException, "Index outside range.");
}
else
source/geometry/solids/specific/include/G4Hype.hh
+2 -2
View File
@@ -24,9 +24,9 @@
// ********************************************************************
//
//
// $Id: G4Hype.hh,v 1.17 2010/10/20 08:54:18 gcosmo Exp $
// $Id: G4Hype.hh,v 1.17 2010-10-20 08:54:18 gcosmo Exp $
// $Original: G4Hype.hh,v 1.0 1998/06/09 16:57:50 safai Exp $
// GEANT4 tag $Name: geant4-09-04 $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4Hype.icc
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Hype.icc,v 1.7 2006/06/29 18:47:03 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4Hype.icc,v 1.7 2006-06-29 18:47:03 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
source/geometry/solids/specific/include/G4IntersectingCone.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4IntersectingCone.hh,v 1.13 2010/07/12 15:33:49 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4IntersectingCone.hh,v 1.13 2010-07-12 15:33:49 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4Paraboloid.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Paraboloid.hh,v 1.6 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4Paraboloid.hh,v 1.6 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4Paraboloid.icc
+5 -5
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Paraboloid.icc,v 1.4 2007/08/21 12:58:36 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4Paraboloid.icc,v 1.4 2007-08-21 12:58:36 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
@@ -59,7 +59,7 @@ void G4Paraboloid::SetZHalfLength(G4double pDz)
{
if(pDz <= 0)
{
G4Exception("G4Paraboloid::SetZHalfLength()", "InvalidSetup",
G4Exception("G4Paraboloid::SetZHalfLength()", "GeomSolids0002",
FatalException, "Invalid dimensions.");
}
else
@@ -81,7 +81,7 @@ void G4Paraboloid::SetRadiusPlusZ(G4double pR2)
{
if(pR2 <= 0 || pR2 <= r1)
{
G4Exception("G4Paraboloid::SetRadiusPlusZ()", "InvalidSetup",
G4Exception("G4Paraboloid::SetRadiusPlusZ()", "GeomSolids0002",
FatalException, "Invalid dimensions.");
}
else
@@ -103,7 +103,7 @@ void G4Paraboloid::SetRadiusMinusZ(G4double pR1)
{
if(pR1 < 0 || pR1 >= r2)
{
G4Exception("G4Paraboloid::SetRadiusMinusZ()", "InvalidSetup",
G4Exception("G4Paraboloid::SetRadiusMinusZ()", "GeomSolids0002",
FatalException, "Invalid dimensions.");
}
else
source/geometry/solids/specific/include/G4PolyPhiFace.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4PolyPhiFace.hh,v 1.13 2010/07/12 15:25:37 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4PolyPhiFace.hh,v 1.13 2010-07-12 15:25:37 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4PolyPhiFace.icc
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4PolyPhiFace.icc,v 1.6 2006/06/29 18:47:10 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4PolyPhiFace.icc,v 1.6 2006-06-29 18:47:10 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4Polycone.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Polycone.hh,v 1.24 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4Polycone.hh,v 1.24 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4Polycone.icc
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Polycone.icc,v 1.10 2006/06/29 18:47:14 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4Polycone.icc,v 1.10 2006-06-29 18:47:14 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -81,7 +81,7 @@ inline
void G4Polycone::SetOriginalParameters(G4PolyconeHistorical* pars)
{
if (!pars)
G4Exception("G4Polycone::SetOriginalParameters()", "InvalidSetup",
G4Exception("G4Polycone::SetOriginalParameters()", "GeomSolids0002",
FatalException, "NULL pointer to parameters!");
*original_parameters = *pars;
fCubicVolume = 0.;
source/geometry/solids/specific/include/G4PolyconeSide.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4PolyconeSide.hh,v 1.13 2010/02/24 11:18:25 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04-beta-01 $
// $Id: G4PolyconeSide.hh,v 1.13 2010-02-24 11:18:25 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4Polyhedra.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Polyhedra.hh,v 1.22 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4Polyhedra.hh,v 1.22 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4Polyhedra.icc
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Polyhedra.icc,v 1.11 2007/01/22 12:58:53 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4Polyhedra.icc,v 1.11 2007-01-22 12:58:53 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// --------------------------------------------------------------------
// GEANT 4 inline definitions file
@@ -88,7 +88,7 @@ void G4Polyhedra::SetOriginalParameters(G4PolyhedraHistorical* pars)
{
if (!pars)
{
G4Exception("G4Polyhedra::SetOriginalParameters()", "InvalidSetup",
G4Exception("G4Polyhedra::SetOriginalParameters()", "GeomSolids0002",
FatalException, "NULL pointer to parameters!");
}
*original_parameters = *pars;
source/geometry/solids/specific/include/G4PolyhedraSide.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4PolyhedraSide.hh,v 1.13 2010/07/12 15:25:37 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4PolyhedraSide.hh,v 1.13 2010-07-12 15:25:37 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4QuadrangularFacet.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4QuadrangularFacet.hh,v 1.6 2008/12/18 12:57:24 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4QuadrangularFacet.hh,v 1.6 2008-12-18 12:57:24 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
//
source/geometry/solids/specific/include/G4ReduciblePolygon.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ReduciblePolygon.hh,v 1.10 2010/07/12 15:25:37 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4ReduciblePolygon.hh,v 1.10 2010-07-12 15:25:37 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4SolidExtentList.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4SolidExtentList.hh,v 1.7 2006/06/29 18:47:32 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4SolidExtentList.hh,v 1.7 2006-06-29 18:47:32 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4TessellatedGeometryAlgorithms.hh
+1 -1
View File
@@ -25,7 +25,7 @@
// ********************************************************************
//
// $Id:
// GEANT4 tag $Name: geant4-09-02 $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
//
source/geometry/solids/specific/include/G4TessellatedGeometryAlgorithms.icc
+1 -1
View File
@@ -25,7 +25,7 @@
// ********************************************************************
//
// $Id:
// GEANT4 tag $Name: geant4-09-02 $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
//
source/geometry/solids/specific/include/G4TessellatedSolid.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4TessellatedSolid.hh,v 1.11 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4TessellatedSolid.hh,v 1.11 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
//
source/geometry/solids/specific/include/G4Tet.hh
+3 -3
View File
@@ -28,8 +28,8 @@
// ********************************************************************
//
//
// $Id: G4Tet.hh,v 1.11 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4Tet.hh,v 1.11 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
@@ -123,7 +123,7 @@ class G4Tet : public G4VSolid
// Copy constructor and assignment operator.
const char* CVSHeaderVers()
{ return "$Id: G4Tet.hh,v 1.11 2010/10/20 08:54:18 gcosmo Exp $"; }
{ return "$Id: G4Tet.hh,v 1.11 2010-10-20 08:54:18 gcosmo Exp $"; }
const char* CVSFileVers()
{ return CVSVers; }
void PrintWarnings(G4bool flag)
source/geometry/solids/specific/include/G4TriangularFacet.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4TriangularFacet.hh,v 1.8 2007/12/10 16:30:18 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4TriangularFacet.hh,v 1.8 2007-12-10 16:30:18 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
//
source/geometry/solids/specific/include/G4TwistBoxSide.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4TwistBoxSide.hh,v 1.5 2006/06/29 18:47:43 gunter Exp $
// $Id: G4TwistBoxSide.hh,v 1.5 2006-06-29 18:47:43 gunter Exp $
//
// --------------------------------------------------------------------
// GEANT 4 class header file
source/geometry/solids/specific/include/G4TwistTrapAlphaSide.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4TwistTrapAlphaSide.hh,v 1.5 2006/06/29 18:47:46 gunter Exp $
// $Id: G4TwistTrapAlphaSide.hh,v 1.5 2006-06-29 18:47:46 gunter Exp $
//
// --------------------------------------------------------------------
// GEANT 4 class header file
source/geometry/solids/specific/include/G4TwistTrapFlatSide.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4TwistTrapFlatSide.hh,v 1.5 2006/06/29 18:47:48 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4TwistTrapFlatSide.hh,v 1.5 2006-06-29 18:47:48 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4TwistTrapParallelSide.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4TwistTrapParallelSide.hh,v 1.5 2006/06/29 18:47:50 gunter Exp $
// $Id: G4TwistTrapParallelSide.hh,v 1.5 2006-06-29 18:47:50 gunter Exp $
//
// --------------------------------------------------------------------
// GEANT 4 class header file
source/geometry/solids/specific/include/G4TwistTubsFlatSide.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4TwistTubsFlatSide.hh,v 1.5 2006/06/29 18:47:53 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4TwistTubsFlatSide.hh,v 1.5 2006-06-29 18:47:53 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4TwistTubsHypeSide.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4TwistTubsHypeSide.hh,v 1.5 2006/06/29 18:47:56 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4TwistTubsHypeSide.hh,v 1.5 2006-06-29 18:47:56 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4TwistTubsSide.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4TwistTubsSide.hh,v 1.5 2006/06/29 18:47:58 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4TwistTubsSide.hh,v 1.5 2006-06-29 18:47:58 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4TwistedBox.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4TwistedBox.hh,v 1.12 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4TwistedBox.hh,v 1.12 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4TwistedTrap.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4TwistedTrap.hh,v 1.12 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4TwistedTrap.hh,v 1.12 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4TwistedTrd.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4TwistedTrd.hh,v 1.8 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4TwistedTrd.hh,v 1.8 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4TwistedTubs.hh
+3 -5
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4TwistedTubs.hh,v 1.16 2010/10/20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4TwistedTubs.hh,v 1.16 2010-10-20 08:54:18 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
@@ -255,6 +255,7 @@ class G4TwistedTubs : public G4VSolid
LastState(const LastState& r) : p(r.p), inside(r.inside){}
LastState& operator=(const LastState& r)
{
if (this == &r) { return *this; }
p = r.p; inside = r.inside;
return *this;
}
@@ -368,13 +369,10 @@ void G4TwistedTubs::SetFields(G4double phitwist, G4double innerrad,
fInnerRadius2 = fInnerRadius * fInnerRadius;
fOuterRadius2 = fOuterRadius * fOuterRadius;
G4int maxi;
if (std::fabs(fEndZ[0]) >= std::fabs(fEndZ[1])) {
fZHalfLength = std::fabs(fEndZ[0]);
maxi = 0;
} else {
fZHalfLength = std::fabs(fEndZ[1]);
maxi = 1;
}
G4double parity = (fPhiTwist > 0 ? 1 : -1);
source/geometry/solids/specific/include/G4VCSGface.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4VCSGface.hh,v 1.9 2008/05/15 11:41:59 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4VCSGface.hh,v 1.9 2008-05-15 11:41:59 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4VCSGfaceted.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4VCSGfaceted.hh,v 1.17 2008/05/15 13:45:15 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4VCSGfaceted.hh,v 1.17 2008-05-15 13:45:15 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4VFacet.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4VFacet.hh,v 1.8 2010/09/23 10:27:25 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4VFacet.hh,v 1.8 2010-09-23 10:27:25 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
//
source/geometry/solids/specific/include/G4VFacet.icc
+2 -2
View File
@@ -24,8 +24,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4VFacet.icc,v 1.6 2008/12/18 12:57:32 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4VFacet.icc,v 1.6 2008-12-18 12:57:32 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
//
source/geometry/solids/specific/include/G4VTwistSurface.hh
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4VTwistSurface.hh,v 1.6 2007/05/11 13:54:28 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4VTwistSurface.hh,v 1.6 2007-05-11 13:54:28 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
source/geometry/solids/specific/include/G4VTwistSurface.icc
+17 -14
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4VTwistSurface.icc,v 1.5 2010/07/16 15:58:59 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4VTwistSurface.icc,v 1.5 2010-07-16 15:58:59 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------------
@@ -255,10 +255,11 @@ G4int G4VTwistSurface::GetAxisType(G4int areacode, G4int whichaxis) const
axiscode == (sAxisPhi & sAxis1)) {
return sAxisPhi;
} else {
G4cerr << "ERROR - G4VTwistSurface::GetAxisType()" << G4endl
<< " areacode = " << areacode << G4endl;
G4Exception("G4VTwistSurface::GetAxisType()","NotSupported",
FatalException, "Configuration not supported.");
std::ostringstream message;
message << "Configuration not supported." << G4endl
<< " areacode = " << areacode;
G4Exception("G4VTwistSurface::GetAxisType()","GeomSolids0001",
FatalException, message);
}
return 1;
}
@@ -359,10 +360,11 @@ inline
G4ThreeVector G4VTwistSurface::GetCorner(G4int areacode) const
{
if (!(areacode & sCorner)){
G4cerr << "ERROR - G4VTwistSurface::GetCorner()" << G4endl
<< " areacode = " << areacode << G4endl;
G4Exception("G4VTwistSurface::GetCorner()","InvalidSetup",
FatalException, "Area code must represent corner.");
std::ostringstream message;
message << "Area code must represent corner." << G4endl
<< " areacode = " << areacode;
G4Exception("G4VTwistSurface::GetCorner()","GeomSolids0002",
FatalException, message);
}
if ((areacode & sC0Min1Min) == sC0Min1Min) {
@@ -374,10 +376,11 @@ G4ThreeVector G4VTwistSurface::GetCorner(G4int areacode) const
} else if ((areacode & sC0Min1Max) == sC0Min1Max) {
return fCorners[3];
} else {
G4cerr << "ERROR - G4VTwistSurface::GetCorner()" << G4endl
<< " areacode = " << areacode << G4endl;
G4Exception("G4VTwistSurface::GetCorner()", "NotSupported",
FatalException, "Configuration not supported.");
std::ostringstream message;
message << "Configuration not supported." << G4endl
<< " areacode = " << areacode;
G4Exception("G4VTwistSurface::GetCorner()", "GeomSolids0001",
FatalException, message);
}
return fCorners[0];
}
source/geometry/solids/specific/include/G4VTwistedFaceted.hh
+3 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4VTwistedFaceted.hh,v 1.12 2010/09/20 15:03:02 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4VTwistedFaceted.hh,v 1.12 2010-09-20 15:03:02 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// --------------------------------------------------------------------
// GEANT 4 class header file
@@ -213,6 +213,7 @@ class G4VTwistedFaceted: public G4VSolid
LastState(const LastState& r) : p(r.p), inside(r.inside){}
LastState& operator=(const LastState& r)
{
if (this == &r) { return *this; }
p = r.p; inside = r.inside;
return *this;
}