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/Boolean/src/G4ScaledSolid.cc
+5 -4
View File
@@ -127,12 +127,13 @@ G4VSolid* G4ScaledSolid::GetUnscaledSolid() const
//
// Get bounding box
void G4ScaledSolid::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
void G4ScaledSolid::BoundingLimits(G4ThreeVector& pMin,
G4ThreeVector& pMax) const
{
G4ThreeVector bmin,bmax;
G4ThreeVector scale = fScale->GetScale();
fPtrSolid->Extent(bmin,bmax);
fPtrSolid->BoundingLimits(bmin,bmax);
pMin.set(bmin.x()*scale.x(),bmin.y()*scale.y(),bmin.z()*scale.z());
pMax.set(bmax.x()*scale.x(),bmax.y()*scale.y(),bmax.z()*scale.z());
@@ -145,7 +146,7 @@ void G4ScaledSolid::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
<< GetName() << " !"
<< "\npMin = " << pMin
<< "\npMax = " << pMax;
G4Exception("G4ScaledSolid::Extent()", "GeomMgt0001",
G4Exception("G4ScaledSolid::BoundingLimits()", "GeomMgt0001",
JustWarning, message);
DumpInfo();
}
@@ -164,7 +165,7 @@ G4ScaledSolid::CalculateExtent( const EAxis pAxis,
{
// Find bounding box of unscaled solid
G4ThreeVector bmin,bmax;
fPtrSolid->Extent(bmin,bmax);
fPtrSolid->BoundingLimits(bmin,bmax);
// Set combined transformation
G4Transform3D transform3D =