lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 1.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:34:16 +02:00
parent ca1c8cb059
commit 103bda00c8
2654 changed files with 29719 additions and 20203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/BREPS/src/G4FConicalSurface.cc
+6 -6
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4FConicalSurface.cc,v 1.8.8.1 1999/12/07 20:48:24 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4FConicalSurface.cc,v 1.9 1999/12/15 14:50:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
/* /usr/local/gismo/repo/geometry/G4FConicalSurface.cc,v 1.2 1993/02/05 00:38:39 alanb Exp */
// File: G4FConicalSurface.cc
@@ -18,7 +18,7 @@
// const G4Vector3D& a,
// G4double l, G4double sr, G4double lr )
// G4FConicalSurface::G4FConicalSurface( const G4FConicalSurface& c )
// G4FConicalSurface::PrintOn( ostream& os ) const
// G4FConicalSurface::PrintOn( G4std::ostream& os ) const
// G4FConicalSurface::operator==( const G4FConicalSurface& c )
// G4FConicalSurface::WithinBoundary( const G4Vector3D& x ) const
// G4FConicalSurface::Scale() const
@@ -139,9 +139,9 @@ void G4FConicalSurface::CalcBBox()
}
void G4FConicalSurface::PrintOn( ostream& os ) const
void G4FConicalSurface::PrintOn( G4std::ostream& os ) const
{
// printing function using C++ ostream class
// printing function using C++ G4std::ostream class
os << "G4FConicalSurface with origin: " << origin << "\t"
<< "and axis: " << Position.GetAxis() << "\n"
<< "\t small radius: " << small_radius
@@ -362,7 +362,7 @@ G4double G4FConicalSurface::HowNear( const G4Vector3D& x ) const
hownear = fabs(m*xd.x()-xd.z()+q)/sqrt(1+m*m);
return hownear;
} else {
hownear = min ( (xd-upcorner).mag() , (xd-downcorner).mag() );
hownear = G4std::min ( (xd-upcorner).mag() , (xd-downcorner).mag() );
return hownear;
}