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

Import Geant4 5.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 10:15:15 +02:00
parent 37fff30d2e
commit fbd4999cf7
4396 changed files with 56662 additions and 52446 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/CSG/src/G4Box.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Box.cc,v 1.19 2002/10/28 15:18:16 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
//
source/geometry/solids/CSG/src/G4CSGSolid.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CSGSolid.cc,v 1.4 2002/10/28 11:43:05 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
#include "G4CSGSolid.hh"
source/geometry/solids/CSG/src/G4Cons.cc
+56 -36
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Cons.cc,v 1.23 2002/10/28 15:18:16 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
// $Id: G4Cons.cc,v 1.24 2003/02/03 14:22:01 grichine Exp $
// GEANT4 tag $Name: geant4-05-01 $
//
// class G4Cons
//
@@ -192,34 +192,39 @@ EInside G4Cons::Inside(const G4ThreeVector& p) const
pPhi = atan2(p.y(),p.x()) ;
if (pPhi < 0 ) pPhi += 2*M_PI ; // 0<=pPhi<2pi
if (fSPhi >= 0)
if (pPhi < -kAngTolerance*0.5 ) pPhi += 2*M_PI ; // 0<=pPhi<2pi
if ( fSPhi >= 0 )
{
if ( pPhi >= fSPhi + kAngTolerance*0.5 &&
pPhi <= fSPhi + fDPhi - kAngTolerance*0.5 )
if ( (abs(pPhi) < kAngTolerance*0.5)
&& (abs(fSPhi + fDPhi - 2*M_PI) < kAngTolerance*0.5) )
{
pPhi += 2*M_PI ; // 0 <= pPhi < 2pi
}
if ( (pPhi >= fSPhi + kAngTolerance*0.5)
&& (pPhi <= fSPhi + fDPhi - kAngTolerance*0.5) )
{
in = kInside ;
}
else if ( pPhi >= fSPhi - kAngTolerance*0.5 &&
pPhi <= fSPhi + fDPhi + kAngTolerance*0.5 )
else if ( (pPhi >= fSPhi - kAngTolerance*0.5)
&& (pPhi <= fSPhi + fDPhi + kAngTolerance*0.5) )
{
in = kSurface ;
}
}
else
else // fSPhi < 0
{
if ( pPhi < fSPhi + 2*M_PI) pPhi += 2*M_PI ;
if ( pPhi >= fSPhi + 2*M_PI + kAngTolerance*0.5 &&
pPhi <= fSPhi + fDPhi + 2*M_PI - kAngTolerance*0.5 )
{
in = kInside ;
}
else if ( pPhi >= fSPhi + 2*M_PI - kAngTolerance*0.5 &&
pPhi <= fSPhi + fDPhi + 2*M_PI + kAngTolerance*0.5 )
if ( (pPhi <= fSPhi + 2*M_PI - kAngTolerance*0.5)
&& (pPhi >= fSPhi + fDPhi + kAngTolerance*0.5) ) ;
else if ( (pPhi <= fSPhi + 2*M_PI + kAngTolerance*0.5)
&& (pPhi >= fSPhi + fDPhi - kAngTolerance*0.5) )
{
in = kSurface ;
}
}
else
{
in = kInside ;
}
}
}
}
else // Try generous boundaries
@@ -239,25 +244,31 @@ EInside G4Cons::Inside(const G4ThreeVector& p) const
{
pPhi = atan2(p.y(),p.x()) ;
if ( pPhi < 0 ) pPhi += 2*M_PI ; // 0<=pPhi<2pi
if ( pPhi < -kAngTolerance*0.5 ) pPhi += 2*M_PI ; // 0<=pPhi<2pi
if ( fSPhi >= 0 )
{
if ( pPhi >= fSPhi - kAngTolerance*0.5 &&
pPhi <= fSPhi + fDPhi + kAngTolerance*0.5 )
if ( (abs(pPhi) < kAngTolerance*0.5)
&& (abs(fSPhi + fDPhi - 2*M_PI) < kAngTolerance*0.5) )
{
pPhi += 2*M_PI ; // 0 <= pPhi < 2pi
}
if ( (pPhi >= fSPhi - kAngTolerance*0.5)
&& (pPhi <= fSPhi + fDPhi + kAngTolerance*0.5) )
{
in = kSurface ;
}
}
else
else // fSPhi < 0
{
if ( pPhi < fSPhi + 2*M_PI) pPhi += 2*M_PI ;
if ( pPhi >= fSPhi + 2*M_PI - kAngTolerance*0.5 &&
pPhi <= fSPhi + fDPhi + 2*M_PI + kAngTolerance*0.5 )
if ( (pPhi <= fSPhi + 2*M_PI - kAngTolerance*0.5)
&& (pPhi >= fSPhi + fDPhi + kAngTolerance*0.5) ) ;
else
{
in = kSurface ;
}
}
}
}
}
}
}
@@ -289,25 +300,30 @@ EInside G4Cons::Inside(const G4ThreeVector& p) const
else // Try outer tolerant phi boundaries
{
pPhi = atan2(p.y(),p.x()) ;
if ( pPhi < 0 ) pPhi += 2*M_PI ; // 0<=pPhi<2pi
if ( pPhi < -kAngTolerance*0.5 ) pPhi += 2*M_PI ; // 0<=pPhi<2pi
if ( fSPhi >= 0 )
{
if ( pPhi >= fSPhi - kAngTolerance*0.5 &&
pPhi <= fSPhi + fDPhi + kAngTolerance*0.5 )
if ( (abs(pPhi) < kAngTolerance*0.5)
&& (abs(fSPhi + fDPhi - 2*M_PI) < kAngTolerance*0.5) )
{
pPhi += 2*M_PI ; // 0 <= pPhi < 2pi
}
if ( (pPhi >= fSPhi - kAngTolerance*0.5)
&& (pPhi <= fSPhi + fDPhi + kAngTolerance*0.5) )
{
in = kSurface ;
in = kSurface;
}
}
else
else // fSPhi < 0
{
if ( pPhi < fSPhi + 2*M_PI) pPhi += 2*M_PI ;
if ( pPhi >= fSPhi + 2*M_PI - kAngTolerance*0.5 &&
pPhi <= fSPhi + fDPhi + 2*M_PI + kAngTolerance*0.5 )
if ( (pPhi <= fSPhi + 2*M_PI - kAngTolerance*0.5)
&& (pPhi >= fSPhi + fDPhi + kAngTolerance*0.5) ) ;
else
{
in = kSurface ;
}
}
}
}
}
}
@@ -2020,10 +2036,14 @@ G4double G4Cons::DistanceToOut(const G4ThreeVector& p) const
{
G4cout.precision(16) ;
G4cout << G4endl ;
DumpInfo();
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 << "pho at z = " << sqrt( p.x()*p.x()+p.y()*p.y() )/mm << " mm"
<< G4endl << G4endl ;
G4cout << "G4Cons::DistanceToOut(p) - point p is outside ?!" << G4endl ;
G4cerr << "G4Cons::DistanceToOut(p) - point p is outside ?!" << G4endl ;
}
source/geometry/solids/CSG/src/G4Para.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Para.cc,v 1.13 2002/10/28 15:18:16 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
// class G4Para
//
source/geometry/solids/CSG/src/G4Sphere.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Sphere.cc,v 1.18 2002/10/28 15:18:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
// class G4Sphere
//
source/geometry/solids/CSG/src/G4Torus.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Torus.cc,v 1.28 2002/10/28 15:18:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// class G4Torus
source/geometry/solids/CSG/src/G4Trap.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Trap.cc,v 1.16 2002/10/28 15:18:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
// class G4Trap
//
source/geometry/solids/CSG/src/G4Trd.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Trd.cc,v 1.12 2002/10/28 15:18:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// Implementation for G4Trd class
source/geometry/solids/CSG/src/G4Tubs.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Tubs.cc,v 1.35 2002/10/28 15:18:19 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
//
// class G4Tubs