Import Geant4 4.0.0 source tree
This commit is contained in:
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SubtractionSolid.cc,v 1.12.2.1 2001/06/28 19:08:58 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
// $Id: G4SubtractionSolid.cc,v 1.15 2001/08/13 14:03:38 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-04-00 $
|
||||
//
|
||||
// Implementation of methods for the class G4IntersectionSolid
|
||||
//
|
||||
@@ -156,7 +156,13 @@ G4SubtractionSolid::SurfaceNormal( const G4ThreeVector& p ) const
|
||||
G4ThreeVector normal;
|
||||
if( Inside(p) == kOutside )
|
||||
{
|
||||
G4Exception("Invalid call in G4SubtractionSolid::SurfaceNormal(p), point p is outside") ;
|
||||
G4cerr << "WARNING - Invalid call in G4SubtractionSolid::SurfaceNormal(p),"
|
||||
<< " point p is inside" << G4endl;
|
||||
G4cerr << " p = " << p << G4endl;
|
||||
|
||||
#ifdef G4BOOLDEBUG
|
||||
G4Exception("Invalid call in G4SubtractionSolid::SurfaceNormal(p), p is outside") ;
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -181,6 +187,8 @@ G4SubtractionSolid::SurfaceNormal( const G4ThreeVector& p ) const
|
||||
normal = -fPtrSolidB->SurfaceNormal(p) ;
|
||||
}
|
||||
G4cerr<<"G4SubtractionSolid::SurfaceNormal(p), point p is inside"<<G4endl ;
|
||||
// G4cout<<"Warning: G4SubtractionSolid::SurfaceNormal(p), point p is inside"
|
||||
// <<G4endl ;
|
||||
}
|
||||
}
|
||||
return normal;
|
||||
@@ -198,7 +206,13 @@ G4SubtractionSolid::DistanceToIn( const G4ThreeVector& p,
|
||||
|
||||
if( Inside(p) == kInside )
|
||||
{
|
||||
G4Exception("Invalid call in G4SubtractionSolid::DistanceToIn(p,v), point p is inside") ;
|
||||
G4cerr << "WARNING - Invalid call in G4SubtractionSolid::DistanceToIn(p,v),"
|
||||
<< " point p is inside" << G4endl;
|
||||
G4cerr << " p = " << p << G4endl;
|
||||
G4cerr << " v = " << v << G4endl;
|
||||
#ifdef G4BOOLDEBUG
|
||||
G4Exception("Invalid call in G4SubtractionSolid::DistanceToIn(p,v), p is inside") ;
|
||||
#endif
|
||||
}
|
||||
|
||||
if( // ( fPtrSolidA->Inside(p) != kOutside) && // case1:p in both A&B
|
||||
@@ -274,7 +288,12 @@ G4SubtractionSolid::DistanceToIn( const G4ThreeVector& p) const
|
||||
G4double dist;
|
||||
if( Inside(p) == kInside )
|
||||
{
|
||||
G4Exception("Invalid call in G4SubtractionSolid::DistanceToIn(p), point p is inside") ;
|
||||
G4cerr << "WARNING - Invalid call in G4SubtractionSolid::DistanceToIn(p),"
|
||||
<< " point p is inside" << G4endl;
|
||||
G4cerr << " p = " << p << G4endl;
|
||||
#ifdef G4BOOLDEBUG
|
||||
G4Exception("Invalid call in G4SubtractionSolid::DistanceToIn(p), p is inside") ;
|
||||
#endif
|
||||
}
|
||||
|
||||
if( ( fPtrSolidA->Inside(p) != kOutside) && // case 1
|
||||
@@ -311,7 +330,13 @@ G4SubtractionSolid::DistanceToOut( const G4ThreeVector& p,
|
||||
G4cout << "v.x() = " << v.x() << G4endl;
|
||||
G4cout << "v.y() = " << v.y() << G4endl;
|
||||
G4cout << "v.z() = " << v.z() << G4endl << G4endl;
|
||||
G4Exception("Invalid call in G4SubtractionSolid::DistanceToOut(p,v), point p is outside") ;
|
||||
G4cerr << "WARNING - Invalid call in G4SubtractionSolid::DistanceToOut(p,v),"
|
||||
<< " point p is outside" << G4endl;
|
||||
G4cerr << " p = " << p << G4endl;
|
||||
G4cerr << " v = " << v << G4endl;
|
||||
#ifdef G4BOOLDEBUG
|
||||
G4Exception("Invalid call in G4SubtractionSolid::DistanceToOut(p,v), p is outside") ;
|
||||
#endif
|
||||
}
|
||||
|
||||
G4double distout;
|
||||
@@ -344,7 +369,12 @@ G4SubtractionSolid::DistanceToOut( const G4ThreeVector& p ) const
|
||||
|
||||
if( Inside(p) == kOutside )
|
||||
{
|
||||
G4Exception("Invalid call in G4SubtractionSolid::DistanceToOut(p), point p is outside") ;
|
||||
G4cerr << "WARNING - Invalid call in G4SubtractionSolid::DistanceToOut(p),"
|
||||
<< " point p is outside" << G4endl;
|
||||
G4cerr << " p = " << p << G4endl;
|
||||
#ifdef G4BOOLDEBUG
|
||||
G4Exception("Invalid call in G4SubtractionSolid::DistanceToOut(p), p is outside") ;
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user