Skip to content
Snippets Groups Projects
Commit c9c25362 authored by Evgueni Tcherniaev's avatar Evgueni Tcherniaev
Browse files

Use CalcuateExtent to find zmin,zmax

parent 1c88e908
No related branches found
No related tags found
No related merge requests found
...@@ -60,10 +60,11 @@ G4UnionSolid:: G4UnionSolid( const G4String& pName, ...@@ -60,10 +60,11 @@ G4UnionSolid:: G4UnionSolid( const G4String& pName,
G4VSolid* pSolidB ) G4VSolid* pSolidB )
: G4BooleanSolid(pName,pSolidA,pSolidB) : G4BooleanSolid(pName,pSolidA,pSolidB)
{ {
G4ThreeVector pmin, pmax; G4VoxelLimits voxelLimits;
BoundingLimits(pmin, pmax); G4AffineTransform affineTransform;
fZMin = pmin.z() - 0.5*kCarTolerance; CalculateExtent(kZAxis,voxelLimits,affineTransform,fZMin,fZMax);
fZMax = pmax.z() + 0.5*kCarTolerance; fZMin -= 0.5*kCarTolerance;
fZMax += 0.5*kCarTolerance;
} }
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
...@@ -78,10 +79,11 @@ G4UnionSolid::G4UnionSolid( const G4String& pName, ...@@ -78,10 +79,11 @@ G4UnionSolid::G4UnionSolid( const G4String& pName,
: G4BooleanSolid(pName,pSolidA,pSolidB,rotMatrix,transVector) : G4BooleanSolid(pName,pSolidA,pSolidB,rotMatrix,transVector)
{ {
G4ThreeVector pmin, pmax; G4VoxelLimits voxelLimits;
BoundingLimits(pmin, pmax); G4AffineTransform affineTransform;
fZMin = pmin.z() - 0.5*kCarTolerance; CalculateExtent(kZAxis,voxelLimits,affineTransform,fZMin,fZMax);
fZMax = pmax.z() + 0.5*kCarTolerance; fZMin -= 0.5*kCarTolerance;
fZMax += 0.5*kCarTolerance;
} }
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
...@@ -94,6 +96,11 @@ G4UnionSolid::G4UnionSolid( const G4String& pName, ...@@ -94,6 +96,11 @@ G4UnionSolid::G4UnionSolid( const G4String& pName,
const G4Transform3D& transform ) const G4Transform3D& transform )
: G4BooleanSolid(pName,pSolidA,pSolidB,transform) : G4BooleanSolid(pName,pSolidA,pSolidB,transform)
{ {
G4VoxelLimits voxelLimits;
G4AffineTransform affineTransform;
CalculateExtent(kZAxis,voxelLimits,affineTransform,fZMin,fZMax);
fZMin -= 0.5*kCarTolerance;
fZMax += 0.5*kCarTolerance;
} }
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment