Import Geant4 11.1.2 source tree

This commit is contained in:
Gabriele Cosmo
2023-06-19 17:17:14 +02:00
parent 84a556a9dc
commit aef78ca386
309 changed files with 35572 additions and 34678 deletions
@@ -267,7 +267,7 @@ G4bool G4PolyconeSide::Intersect( const G4ThreeVector& p,
G4ThreeVector& normal,
G4bool& isAllBehind )
{
G4double s1, s2;
G4double s1=0., s2=0.;
G4double normSign = outgoing ? +1 : -1;
isAllBehind = allBehind;
@@ -75,18 +75,18 @@ void G4SolidExtentList::AddSurface( const G4ClippablePolygon& surface )
//
// Keep track of four surfaces
//
G4double min, max;
G4double smin=.0, smax=0.;
surface.GetExtent( axis, min, max );
surface.GetExtent( axis, smin, smax );
if (min > maxLimit)
if (smin > maxLimit)
{
//
// Nearest surface beyond maximum limit
//
if (surface.InFrontOf(minAbove,axis)) minAbove = surface;
}
else if (max < minLimit)
else if (smax < minLimit)
{
//
// Nearest surface below minimum limit
@@ -107,7 +107,7 @@ void G4SolidExtentList::AddSurface( const G4ClippablePolygon& surface )
//
// Return extent after processing all surfaces
//
G4bool G4SolidExtentList::GetExtent( G4double& min, G4double& max ) const
G4bool G4SolidExtentList::GetExtent( G4double& emin, G4double& emax ) const
{
G4double kCarTolerance = G4GeometryTolerance::GetInstance()
->GetSurfaceTolerance();
@@ -129,8 +129,8 @@ G4bool G4SolidExtentList::GetExtent( G4double& min, G4double& max ) const
//
// No. We must be entirely within the solid
//
max = maxLimit + kCarTolerance;
min = minLimit - kCarTolerance;
emax = maxLimit + kCarTolerance;
emin = minLimit - kCarTolerance;
return true;
}
@@ -142,13 +142,13 @@ G4bool G4SolidExtentList::GetExtent( G4double& min, G4double& max ) const
//
// Inward facing: max limit must be embedded within solid
//
max = maxLimit + kCarTolerance;
emax = maxLimit + kCarTolerance;
}
else
{
G4double sMin, sMax;
maxSurface.GetExtent( axis, sMin, sMax );
max = ( (sMax > maxLimit) ? maxLimit : sMax ) + kCarTolerance;
emax = ( (sMax > maxLimit) ? maxLimit : sMax ) + kCarTolerance;
}
//
@@ -159,13 +159,13 @@ G4bool G4SolidExtentList::GetExtent( G4double& min, G4double& max ) const
//
// Inward facing: max limit must be embedded within solid
//
min = minLimit - kCarTolerance;
emin = minLimit - kCarTolerance;
}
else
{
G4double sMin, sMax;
G4double sMin=0., sMax=0.;
minSurface.GetExtent( axis, sMin, sMax );
min = ( (sMin < minLimit) ? minLimit : sMin ) - kCarTolerance;
emin = ( (sMin < minLimit) ? minLimit : sMin ) - kCarTolerance;
}
return true;
@@ -229,7 +229,7 @@ G4ThreeVector G4VCSGfaceted::SurfaceNormal( const G4ThreeVector& p ) const
G4double best = kInfinity;
do // Loop checking, 13.08.2015, G.Cosmo
{
G4double distance;
G4double distance = kInfinity;
G4ThreeVector normal = (*face)->Normal( p, &distance );
if (distance < best)
{
@@ -715,7 +715,7 @@ G4ThreeVector G4VTwistSurface::GetBoundaryAtPZ(G4int areacode,
G4ThreeVector d;
G4ThreeVector x0;
G4int boundarytype;
G4int boundarytype = 0;
G4bool found = false;
for (G4int i=0; i<4; ++i)