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/G4DisplacedSolid.cc
+5 -4
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4DisplacedSolid.cc 101046 2016-11-04 10:44:26Z gcosmo $
// $Id: G4DisplacedSolid.cc 104316 2017-05-24 13:04:23Z gcosmo $
//
// Implementation for G4DisplacedSolid class for boolean
// operations between other solids
@@ -265,13 +265,14 @@ void G4DisplacedSolid::SetObjectTranslation(const G4ThreeVector& vector)
//
// Get bounding box
void G4DisplacedSolid::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
void G4DisplacedSolid::BoundingLimits(G4ThreeVector& pMin,
G4ThreeVector& pMax) const
{
if (!fDirectTransform->IsRotated())
{
// Special case of pure translation
//
fPtrSolid->Extent(pMin,pMax);
fPtrSolid->BoundingLimits(pMin,pMax);
G4ThreeVector offset = fDirectTransform->NetTranslation();
pMin += offset;
pMax += offset;
@@ -298,7 +299,7 @@ void G4DisplacedSolid::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
<< GetName() << " !"
<< "\npMin = " << pMin
<< "\npMax = " << pMax;
G4Exception("G4DisplacedSolid::Extent()", "GeomMgt0001",
G4Exception("G4DisplacedSolid::BoundingLimits()", "GeomMgt0001",
JustWarning, message);
DumpInfo();
}
source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
+6 -5
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4IntersectionSolid.cc 102530 2017-02-08 13:41:59Z gcosmo $
// $Id: G4IntersectionSolid.cc 104316 2017-05-24 13:04:23Z gcosmo $
//
// Implementation of methods for the class G4IntersectionSolid
//
@@ -139,11 +139,12 @@ G4IntersectionSolid::operator = (const G4IntersectionSolid& rhs)
// Get bounding box
void
G4IntersectionSolid::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
G4IntersectionSolid::BoundingLimits(G4ThreeVector& pMin,
G4ThreeVector& pMax) const
{
G4ThreeVector minA,maxA, minB,maxB;
fPtrSolidA->Extent(minA,maxA);
fPtrSolidB->Extent(minB,maxB);
fPtrSolidA->BoundingLimits(minA,maxA);
fPtrSolidB->BoundingLimits(minB,maxB);
pMin.set(std::max(minA.x(),minB.x()),
std::max(minA.y(),minB.y()),
@@ -162,7 +163,7 @@ G4IntersectionSolid::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
<< GetName() << " !"
<< "\npMin = " << pMin
<< "\npMax = " << pMax;
G4Exception("G4IntersectionSolid::Extent()", "GeomMgt0001",
G4Exception("G4IntersectionSolid::BoundingLimits()", "GeomMgt0001",
JustWarning, message);
DumpInfo();
}
source/geometry/solids/Boolean/src/G4MultiUnion.cc
+1012
View File
File diff suppressed because it is too large Load Diff
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 =
source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
+5 -4
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4SubtractionSolid.cc 102530 2017-02-08 13:41:59Z gcosmo $
// $Id: G4SubtractionSolid.cc 104316 2017-05-24 13:04:23Z gcosmo $
//
// Implementation of methods for the class G4IntersectionSolid
//
@@ -139,12 +139,13 @@ G4SubtractionSolid::operator = (const G4SubtractionSolid& rhs)
// Get bounding box
void
G4SubtractionSolid::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
G4SubtractionSolid::BoundingLimits(G4ThreeVector& pMin,
G4ThreeVector& pMax) const
{
// Since it is unclear how the shape of the first solid will be changed
// after subtraction, just return its original bounding box.
//
fPtrSolidA->Extent(pMin,pMax);
fPtrSolidA->BoundingLimits(pMin,pMax);
// Check correctness of the bounding box
//
@@ -155,7 +156,7 @@ G4SubtractionSolid::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
<< GetName() << " !"
<< "\npMin = " << pMin
<< "\npMax = " << pMax;
G4Exception("G4SubtractionSolid::Extent()", "GeomMgt0001",
G4Exception("G4SubtractionSolid::BoundingLimits()", "GeomMgt0001",
JustWarning, message);
DumpInfo();
}
source/geometry/solids/Boolean/src/G4UnionSolid.cc
+35 -44
View File
@@ -24,9 +24,9 @@
// ********************************************************************
//
//
// $Id: G4UnionSolid.cc 101046 2016-11-04 10:44:26Z gcosmo $
// $Id: G4UnionSolid.cc 104316 2017-05-24 13:04:23Z gcosmo $
//
// Implementation of methods for the class G4IntersectionSolid
// Implementation of methods for the class G4UnionSolid
//
// History:
//
@@ -34,6 +34,7 @@
// 28.11.98 V.Grichine: fix while loops in DistToIn/Out
// 27.07.99 V.Grichine: modifications in DistToOut(p,v,...), while -> do-while
// 16.03.01 V.Grichine: modifications in CalculateExtent()
// 17.03.17 E.Tcherniaev: revision of SurfaceNormal()
//
// --------------------------------------------------------------------
@@ -136,11 +137,12 @@ G4UnionSolid& G4UnionSolid::operator = (const G4UnionSolid& rhs)
//
// Get bounding box
void G4UnionSolid::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
void G4UnionSolid::BoundingLimits(G4ThreeVector& pMin,
G4ThreeVector& pMax) const
{
G4ThreeVector minA,maxA, minB,maxB;
fPtrSolidA->Extent(minA,maxA);
fPtrSolidB->Extent(minB,maxB);
fPtrSolidA->BoundingLimits(minA,maxA);
fPtrSolidB->BoundingLimits(minB,maxB);
pMin.set(std::min(minA.x(),minB.x()),
std::min(minA.y(),minB.y()),
@@ -159,7 +161,8 @@ void G4UnionSolid::Extent(G4ThreeVector& pMin, G4ThreeVector& pMax) const
<< GetName() << " !"
<< "\npMin = " << pMin
<< "\npMax = " << pMax;
G4Exception("G4UnionSolid::Extent()", "GeomMgt0001", JustWarning, message);
G4Exception("G4UnionSolid::BoundingLimits()", "GeomMgt0001",
JustWarning, message);
DumpInfo();
}
}
@@ -230,54 +233,42 @@ EInside G4UnionSolid::Inside( const G4ThreeVector& p ) const
//////////////////////////////////////////////////////////////
//
//
// Get surface normal
G4ThreeVector
G4UnionSolid::SurfaceNormal( const G4ThreeVector& p ) const
{
G4ThreeVector normal;
EInside positionA = fPtrSolidA->Inside(p);
EInside positionB = fPtrSolidB->Inside(p);
#ifdef G4BOOLDEBUG
if( Inside(p) == kOutside )
{
G4cout << "WARNING - Invalid call in "
<< "G4UnionSolid::SurfaceNormal(p)" << G4endl
<< " Point p is outside !" << G4endl;
G4cout << " p = " << p << G4endl;
G4cerr << "WARNING - Invalid call in "
<< "G4UnionSolid::SurfaceNormal(p)" << G4endl
<< " Point p is outside !" << G4endl;
G4cerr << " p = " << p << G4endl;
}
#endif
if (positionA == kSurface &&
positionB == kOutside) return fPtrSolidA->SurfaceNormal(p);
if(fPtrSolidA->Inside(p) == kSurface && fPtrSolidB->Inside(p) != kInside)
if (positionA == kOutside &&
positionB == kSurface) return fPtrSolidB->SurfaceNormal(p);
if (positionA == kSurface &&
positionB == kSurface)
{
if (Inside(p) == kSurface)
{
normal= fPtrSolidA->SurfaceNormal(p) ;
G4ThreeVector normalA = fPtrSolidA->SurfaceNormal(p);
G4ThreeVector normalB = fPtrSolidB->SurfaceNormal(p);
return (normalA + normalB).unit();
}
else if(fPtrSolidB->Inside(p) == kSurface &&
fPtrSolidA->Inside(p) != kInside)
{
normal= fPtrSolidB->SurfaceNormal(p) ;
}
else
{
normal= fPtrSolidA->SurfaceNormal(p) ;
}
#ifdef G4BOOLDEBUG
if(Inside(p)==kInside)
{
G4cout << "WARNING - Invalid call in "
<< "G4UnionSolid::SurfaceNormal(p)" << G4endl
<< " Point p is inside !" << G4endl;
G4cout << " p = " << p << G4endl;
G4cerr << "WARNING - Invalid call in "
<< "G4UnionSolid::SurfaceNormal(p)" << G4endl
<< " Point p is inside !" << G4endl;
G4cerr << " p = " << p << G4endl;
}
G4String surf[3] = { "OUTSIDE", "SURFACE", "INSIDE" };
std::ostringstream message;
G4int oldprc = message.precision(16);
message << "Invalid call of SurfaceNormal(p) for union solid: "
<< GetName() << " !"
<< "\nPoint p" << p << " is " << surf[Inside(p)] << " !!!";
message.precision(oldprc);
G4Exception("G4UnionSolid::SurfaceNormal()", "GeomMgt0001",
JustWarning, message);
#endif
}
return normal;
return fPtrSolidA->SurfaceNormal(p);
}
/////////////////////////////////////////////////////////////