Import Geant4 6.0.0 source tree
This commit is contained in:
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Box.cc,v 1.20 2003/06/16 16:53:34 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
// $Id: G4Box.cc,v 1.24 2003/11/03 18:17:31 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00 $
|
||||
//
|
||||
//
|
||||
//
|
||||
@@ -35,7 +35,7 @@
|
||||
// and information before exception in DistanceToOut(p,v,...)
|
||||
// 15.11.00 - D.Williams, V.Grichine: bug fixed in CalculateExtent - change
|
||||
// algorithm for rotated vertices
|
||||
// ********************************************************************
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
#include "G4Box.hh"
|
||||
|
||||
@@ -70,13 +70,11 @@ G4Box::G4Box(const G4String& pName,
|
||||
}
|
||||
else
|
||||
{
|
||||
G4cout << "ERROR - G4Box()::G4Box(): " << GetName() << G4endl
|
||||
<< " Dimensions too small ! - "
|
||||
<< pX << ", " << pY << ", " << pZ << G4endl;
|
||||
G4cerr << "ERROR - G4Box()::G4Box(): " << GetName() << G4endl
|
||||
<< " Dimensions too small ! - "
|
||||
<< pX << ", " << pY << ", " << pZ << G4endl;
|
||||
G4Exception("G4Box::G4Box() - invalid dimensions");
|
||||
G4Exception("G4Box::G4Box()", "InvalidSetup",
|
||||
FatalException, "Invalid dimensions. Too small.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,13 +94,11 @@ void G4Box::SetXHalfLength(G4double dx)
|
||||
fDx = dx;
|
||||
else
|
||||
{
|
||||
G4cout << "ERROR - G4Box()::SetXHalfLength(): " << GetName() << G4endl
|
||||
<< " Dimension X too small ! - "
|
||||
<< dx << G4endl;
|
||||
G4cerr << "ERROR - G4Box()::SetXHalfLength(): " << GetName() << G4endl
|
||||
<< " Dimension X too small ! - "
|
||||
<< dx << G4endl;
|
||||
G4Exception("G4Box::SetXHalfLength() - invalid dimensions");
|
||||
G4Exception("G4Box::SetXHalfLength()", "InvalidSetup",
|
||||
FatalException, "Invalid dimensions. Too small.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -112,13 +108,11 @@ void G4Box::SetYHalfLength(G4double dy)
|
||||
fDy = dy;
|
||||
else
|
||||
{
|
||||
G4cout << "ERROR - G4Box()::SetYHalfLength(): " << GetName() << G4endl
|
||||
<< " Dimension Y too small ! - "
|
||||
<< dy << G4endl;
|
||||
G4cerr << "ERROR - G4Box()::SetYHalfLength(): " << GetName() << G4endl
|
||||
<< " Dimension Y too small ! - "
|
||||
<< dy << G4endl;
|
||||
G4Exception("G4Box::SetYHalfLength() - invalid dimensions");
|
||||
G4Exception("G4Box::SetYHalfLength()", "InvalidSetup",
|
||||
FatalException, "Invalid dimensions. Too small.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -128,13 +122,11 @@ void G4Box::SetZHalfLength(G4double dz)
|
||||
fDz = dz;
|
||||
else
|
||||
{
|
||||
G4cout << "ERROR - G4Box()::SetZHalfLength(): " << GetName() << G4endl
|
||||
<< " Dimension Z too small ! - "
|
||||
<< dz << G4endl;
|
||||
G4cerr << "ERROR - G4Box()::SetZHalfLength(): " << GetName() << G4endl
|
||||
<< " Dimension Z too small ! - "
|
||||
<< dz << G4endl;
|
||||
G4Exception("G4Box::SetZHalfLength() - invalid dimensions");
|
||||
G4Exception("G4Box::SetZHalfLength()", "InvalidSetup",
|
||||
FatalException, "Invalid dimensions. Too small.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -724,7 +716,9 @@ G4double G4Box::DistanceToOut( const G4ThreeVector& p,const G4ThreeVector& v,
|
||||
G4cout << "v.z() = " << v.z() << G4endl << G4endl;
|
||||
G4cout << "Proposed distance :" << G4endl << G4endl;
|
||||
G4cout << "snxt = " << snxt/mm << " mm" << G4endl << G4endl;
|
||||
G4Exception("G4Box::DistanceToOut() - Invalid enum");
|
||||
G4Exception("G4Box::DistanceToOut()",
|
||||
"LogicError", FatalException,
|
||||
"Undefined side for valid surface normal to solid.");
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -738,7 +732,7 @@ G4double G4Box::DistanceToOut( const G4ThreeVector& p,const G4ThreeVector& v,
|
||||
|
||||
G4double G4Box::DistanceToOut(const G4ThreeVector& p) const
|
||||
{
|
||||
G4double safx1,safx2,safy1,safy2,safz1,safz2,safe;
|
||||
G4double safx1,safx2,safy1,safy2,safz1,safz2,safe=0.0;
|
||||
|
||||
#ifdef G4CSGDEBUG
|
||||
if( Inside(p) == kOutside )
|
||||
@@ -750,8 +744,8 @@ G4double G4Box::DistanceToOut(const G4ThreeVector& p) const
|
||||
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 << "G4Box::DistanceToOut(p) - point p is outside ?!" << G4endl ;
|
||||
G4cerr << "G4Box::DistanceToOut(p) - point p is outside ?!" << G4endl ;
|
||||
G4Exception("G4Box::DistanceToOut(p)",
|
||||
"Notification", JustWarning, "Point p is outside !?" );
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -813,7 +807,9 @@ G4Box::CreateRotatedVertices(const G4AffineTransform& pTransform) const
|
||||
else
|
||||
{
|
||||
DumpInfo();
|
||||
G4Exception("G4Box::CreateRotatedVertices() - Out of memory !");
|
||||
G4Exception("G4Box::CreateRotatedVertices()",
|
||||
"FatalError", FatalException,
|
||||
"Error in allocation of vertices. Out of memory !");
|
||||
}
|
||||
return vertices;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user