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

Import Geant4 10.4.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-06-30 10:49:55 +02:00
parent 3a5407696b
commit 1a1316fea4
2180 changed files with 237880 additions and 59109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/CSG/src/G4Cons.cc
+7 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4Cons.cc 101121 2016-11-07 09:18:01Z gcosmo $
// $Id: G4Cons.cc 104316 2017-05-24 13:04:23Z gcosmo $
// GEANT4 tag $Name: $
//
//
@@ -34,8 +34,7 @@
//
// History:
//
// 03.10.16 E.Tcherniaev: added Extent(pmin,pmax),
// use G4BoundingEnvelope for CalculateExtent(),
// 03.10.16 E.Tcherniaev: use G4BoundingEnvelope for CalculateExtent(),
// removed CreateRotatedVertices()
// 04.09.14 T.Nikitina: Fix typo error in GetPointOnSurface() when
// GetRadiusInRing() was introduced
@@ -273,7 +272,7 @@ void G4Cons::ComputeDimensions( G4VPVParameterisation* p,
//
// Get bounding box
void G4Cons::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
void G4Cons::BoundingLimits(G4ThreeVector& pMin, G4ThreeVector& pMax) const
{
G4double rmin = std::min(GetInnerRadiusMinusZ(),GetInnerRadiusPlusZ());
G4double rmax = std::max(GetOuterRadiusMinusZ(),GetOuterRadiusPlusZ());
@@ -306,7 +305,8 @@ void G4Cons::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
<< GetName() << " !"
<< "\npMin = " << pMin
<< "\npMax = " << pMax;
G4Exception("G4Cons::Extent()", "GeomMgt0001", JustWarning, message);
G4Exception("G4Cons::BoundingLimits()", "GeomMgt0001",
JustWarning, message);
DumpInfo();
}
}
@@ -325,7 +325,7 @@ G4bool G4Cons::CalculateExtent( const EAxis pAxis,
G4bool exist;
// Get bounding box
Extent(bmin,bmax);
BoundingLimits(bmin,bmax);
// Check bounding box
G4BoundingEnvelope bbox(bmin,bmax);
@@ -348,7 +348,7 @@ G4bool G4Cons::CalculateExtent( const EAxis pAxis,
// Find bounding envelope and calculate extent
//
const G4int NSTEPS = 24; // number of steps for whole circle
G4double astep = (360/NSTEPS)*deg; // max angle for one step
G4double astep = twopi/NSTEPS; // max angle for one step
G4int ksteps = (dphi <= astep) ? 1 : (G4int)((dphi-deg)/astep) + 1;
G4double ang = dphi/ksteps;