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/specific/src/G4Paraboloid.cc
+6 -4
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4Paraboloid.cc 101819 2016-12-01 08:13:36Z gcosmo $
// $Id: G4Paraboloid.cc 104316 2017-05-24 13:04:23Z gcosmo $
//
// class G4Paraboloid
//
@@ -167,7 +167,8 @@ G4Paraboloid& G4Paraboloid::operator = (const G4Paraboloid& rhs)
//
// Get bounding box
void G4Paraboloid::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
void G4Paraboloid::BoundingLimits(G4ThreeVector& pMin,
G4ThreeVector& pMax) const
{
pMin.set(-r2,-r2,-dz);
pMax.set( r2, r2, dz);
@@ -181,7 +182,8 @@ void G4Paraboloid::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
<< GetName() << " !"
<< "\npMin = " << pMin
<< "\npMax = " << pMax;
G4Exception("G4Paraboloid::Extent()", "GeomMgt0001", JustWarning, message);
G4Exception("G4Paraboloid::BoundingLimits()", "GeomMgt0001",
JustWarning, message);
DumpInfo();
}
}
@@ -199,7 +201,7 @@ G4Paraboloid::CalculateExtent(const EAxis pAxis,
G4ThreeVector bmin, bmax;
// Get bounding box
Extent(bmin,bmax);
BoundingLimits(bmin,bmax);
// Find extent
G4BoundingEnvelope bbox(bmin,bmax);