Import Geant4 4.0.0 source tree
This commit is contained in:
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UnionSolid.cc,v 1.16.2.1 2001/06/28 19:08:58 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: G4UnionSolid.cc,v 1.19 2001/08/13 14:03:38 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
// Implementation of methods for the class G4IntersectionSolid
|
||||
//
|
||||
@@ -170,7 +170,12 @@ G4UnionSolid::SurfaceNormal( const G4ThreeVector& p ) const
|
||||
|
||||
if( Inside(p) == kOutside )
|
||||
{
|
||||
G4Exception("Invalid call in G4UnionSolid::SurfaceNormal(p), point p is outside") ;
|
||||
G4cerr << "WARNING - Invalid call in G4UnionSolid::SurfaceNormal(p),"
|
||||
<< " point p is outside" << G4endl;
|
||||
G4cerr << " p = " << p << G4endl;
|
||||
#ifdef G4BOOLDEBUG
|
||||
G4Exception("Invalid call in G4UnionSolid::SurfaceNormal(p), p is outside") ;
|
||||
#endif
|
||||
}
|
||||
|
||||
if(fPtrSolidA->Inside(p) == kSurface && fPtrSolidB->Inside(p) != kInside)
|
||||
@@ -184,9 +189,14 @@ G4UnionSolid::SurfaceNormal( const G4ThreeVector& p ) const
|
||||
}
|
||||
else
|
||||
{
|
||||
G4Exception("Invalid call in G4UnionSolid::SurfaceNormal(p), point p is inside") ;
|
||||
normal= fPtrSolidA->SurfaceNormal(p) ;
|
||||
G4cerr << "WARNING - Invalid call in G4UnionSolid::SurfaceNormal(p),"
|
||||
<< " point p is inside" << G4endl;
|
||||
G4cerr << " p = " << p << G4endl;
|
||||
#ifdef G4BOOLDEBUG
|
||||
G4Exception("Invalid call in G4UnionSolid::SurfaceNormal(p), p is inside") ;
|
||||
#endif
|
||||
}
|
||||
|
||||
return normal;
|
||||
}
|
||||
|
||||
@@ -200,7 +210,13 @@ G4UnionSolid::DistanceToIn( const G4ThreeVector& p,
|
||||
{
|
||||
if( Inside(p) == kInside )
|
||||
{
|
||||
G4Exception("Invalid call in G4UnionSolid::DistanceToIn(p,v), point p is inside") ;
|
||||
G4cerr << "WARNING - Invalid call in G4UnionSolid::DistanceToIn(p,v),"
|
||||
<< " point p is inside" << G4endl;
|
||||
G4cerr << " p = " << p << G4endl;
|
||||
G4cerr << " v = " << v << G4endl;
|
||||
#ifdef G4BOOLDEBUG
|
||||
G4Exception("Invalid call in G4UnionSolid::DistanceToIn(p,v), point p is intside");
|
||||
#endif
|
||||
}
|
||||
return G4std::min(fPtrSolidA->DistanceToIn(p,v),
|
||||
fPtrSolidB->DistanceToIn(p,v) ) ;
|
||||
@@ -216,12 +232,19 @@ G4UnionSolid::DistanceToIn( const G4ThreeVector& p) const
|
||||
{
|
||||
if( Inside(p) == kInside )
|
||||
{
|
||||
G4Exception("Invalid call in G4UnionSolid::DistanceToIn(p), point p is inside") ;
|
||||
G4cerr << "WARNING - Invalid call in G4UnionSolid::DistanceToIn(p),"
|
||||
<< " point p is inside" << G4endl;
|
||||
G4cerr << " p = " << p << G4endl;
|
||||
|
||||
#ifdef G4BOOLDEBUG
|
||||
G4Exception("Invalid call in G4UnionSolid::DistanceToIn(p), p is inside") ;
|
||||
#endif
|
||||
}
|
||||
G4double distA = fPtrSolidA->DistanceToIn(p) ;
|
||||
G4double distB = fPtrSolidB->DistanceToIn(p) ;
|
||||
|
||||
return G4std::min(distA,distB) ;
|
||||
G4double safety = G4std::min(distA,distB) ;
|
||||
if(safety < 0.0) safety = 0.0 ;
|
||||
return safety ;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////
|
||||
@@ -241,15 +264,21 @@ G4UnionSolid::DistanceToOut( const G4ThreeVector& p,
|
||||
|
||||
if( Inside(p) == kOutside )
|
||||
{
|
||||
G4cout << "Position:" << G4endl << G4endl;
|
||||
G4cout << "p.x() = " << p.x()/mm << " mm" << G4endl;
|
||||
G4cout << "p.y() = " << p.y()/mm << " mm" << G4endl;
|
||||
G4cout << "p.z() = " << p.z()/mm << " mm" << G4endl << G4endl;
|
||||
G4cout << "Direction:" << G4endl << G4endl;
|
||||
G4cout << "v.x() = " << v.x() << G4endl;
|
||||
G4cout << "v.y() = " << v.y() << G4endl;
|
||||
G4cout << "v.z() = " << v.z() << G4endl << G4endl;
|
||||
G4Exception("Invalid call in G4UnionSolid::DistanceToOut(p,v), point p is outside") ;
|
||||
G4cerr << "WARNING - Invalid call in G4UnionSolid::DistanceToOut(p,v),"
|
||||
<< " point p is outside" << G4endl;
|
||||
G4cerr << " p = " << p << G4endl;
|
||||
G4cerr << " v = " << v << G4endl;
|
||||
#ifdef G4BOOLDEBUG
|
||||
G4cout << "Position:" << G4endl << G4endl;
|
||||
G4cout << "p.x() = " << p.x()/mm << " mm" << G4endl;
|
||||
G4cout << "p.y() = " << p.y()/mm << " mm" << G4endl;
|
||||
G4cout << "p.z() = " << p.z()/mm << " mm" << G4endl << G4endl;
|
||||
G4cout << "Direction:" << G4endl << G4endl;
|
||||
G4cout << "v.x() = " << v.x() << G4endl;
|
||||
G4cout << "v.y() = " << v.y() << G4endl;
|
||||
G4cout << "v.z() = " << v.z() << G4endl << G4endl;
|
||||
G4Exception("Invalid call in G4UnionSolid::DistanceToOut(p,v), point p is outside");
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -313,7 +342,12 @@ G4UnionSolid::DistanceToOut( const G4ThreeVector& p ) const
|
||||
G4double distout = kInfinity;
|
||||
if( Inside(p) == kOutside )
|
||||
{
|
||||
G4Exception("Invalid call in G4UnionSolid::DistanceToOut(p), point p is outside") ;
|
||||
G4cerr << "WARNING - Invalid call in G4UnionSolid::DistanceToOut(p),"
|
||||
<< " point p is outside" << G4endl;
|
||||
G4cerr << " p = " << p << G4endl;
|
||||
#ifdef G4BOOLDEBUG
|
||||
G4Exception("Invalid call in G4UnionSolid::DistanceToOut(p), p is outtside");
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user