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

Import Geant4 10.6.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2019-06-28 11:59:04 +02:00
parent 28a70706e0
commit d0f911957d
1056 changed files with 95168 additions and 78160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/CSG/src/G4Cons.cc
+30 -18
View File
@@ -134,10 +134,10 @@ G4Cons::G4Cons( const G4String& pName,
G4Cons::G4Cons( __void__& a )
: G4CSGSolid(a), kRadTolerance(0.), kAngTolerance(0.),
fRmin1(0.), fRmin2(0.), fRmax1(0.), fRmax2(0.), fDz(0.),
fSPhi(0.), fDPhi(0.), sinCPhi(0.), cosCPhi(0.), cosHDPhiOT(0.),
cosHDPhiIT(0.), sinSPhi(0.), cosSPhi(0.), sinEPhi(0.), cosEPhi(0.),
fPhiFullCone(false), halfCarTolerance(0.), halfRadTolerance(0.),
halfAngTolerance(0.)
fSPhi(0.), fDPhi(0.), sinCPhi(0.), cosCPhi(0.), cosHDPhi(0.),
cosHDPhiOT(0.), cosHDPhiIT(0.), sinSPhi(0.), cosSPhi(0.),
sinEPhi(0.), cosEPhi(0.), fPhiFullCone(false),
halfCarTolerance(0.), halfRadTolerance(0.), halfAngTolerance(0.)
{
}
@@ -158,9 +158,9 @@ G4Cons::G4Cons(const G4Cons& rhs)
kAngTolerance(rhs.kAngTolerance), fRmin1(rhs.fRmin1), fRmin2(rhs.fRmin2),
fRmax1(rhs.fRmax1), fRmax2(rhs.fRmax2), fDz(rhs.fDz), fSPhi(rhs.fSPhi),
fDPhi(rhs.fDPhi), sinCPhi(rhs.sinCPhi), cosCPhi(rhs.cosCPhi),
cosHDPhiOT(rhs.cosHDPhiOT), cosHDPhiIT(rhs.cosHDPhiIT),
sinSPhi(rhs.sinSPhi), cosSPhi(rhs.cosSPhi), sinEPhi(rhs.sinEPhi),
cosEPhi(rhs.cosEPhi), fPhiFullCone(rhs.fPhiFullCone),
cosHDPhi(rhs.cosHDPhi), cosHDPhiOT(rhs.cosHDPhiOT),
cosHDPhiIT(rhs.cosHDPhiIT), sinSPhi(rhs.sinSPhi), cosSPhi(rhs.cosSPhi),
sinEPhi(rhs.sinEPhi), cosEPhi(rhs.cosEPhi), fPhiFullCone(rhs.fPhiFullCone),
halfCarTolerance(rhs.halfCarTolerance),
halfRadTolerance(rhs.halfRadTolerance),
halfAngTolerance(rhs.halfAngTolerance)
@@ -188,7 +188,7 @@ G4Cons& G4Cons::operator = (const G4Cons& rhs)
fRmin1 = rhs.fRmin1; fRmin2 = rhs.fRmin2;
fRmax1 = rhs.fRmax1; fRmax2 = rhs.fRmax2;
fDz = rhs.fDz; fSPhi = rhs.fSPhi; fDPhi = rhs.fDPhi;
sinCPhi = rhs.sinCPhi; cosCPhi = rhs.cosCPhi;
sinCPhi = rhs.sinCPhi; cosCPhi = rhs.cosCPhi; cosHDPhi = rhs.cosHDPhi;
cosHDPhiOT = rhs.cosHDPhiOT; cosHDPhiIT = rhs.cosHDPhiIT;
sinSPhi = rhs.sinSPhi; cosSPhi = rhs.cosSPhi;
sinEPhi = rhs.sinEPhi; cosEPhi = rhs.cosEPhi;
@@ -472,8 +472,8 @@ G4ThreeVector G4Cons::SurfaceNormal( const G4ThreeVector& p) const
distSPhi = 0.;
distEPhi = 0.;
}
nPs = G4ThreeVector(std::sin(fSPhi), -std::cos(fSPhi), 0);
nPe = G4ThreeVector(-std::sin(fSPhi+fDPhi), std::cos(fSPhi+fDPhi), 0);
nPs = G4ThreeVector( sinSPhi, -cosSPhi, 0 );
nPe = G4ThreeVector( -sinEPhi, cosEPhi, 0 );
}
if ( rho > halfCarTolerance )
{
@@ -607,29 +607,41 @@ G4ThreeVector G4Cons::ApproxSurfaceNormal( const G4ThreeVector& p ) const
switch (side)
{
case kNRMin: // Inner radius
{
rho *= secRMin ;
norm = G4ThreeVector(-p.x()/rho, -p.y()/rho, tanRMin/secRMin) ;
break ;
}
case kNRMax: // Outer radius
{
rho *= secRMax ;
norm = G4ThreeVector(p.x()/rho, p.y()/rho, -tanRMax/secRMax) ;
break ;
}
case kNZ: // +/- dz
{
if (p.z() > 0) { norm = G4ThreeVector(0,0,1); }
else { norm = G4ThreeVector(0,0,-1); }
break ;
}
case kNSPhi:
norm = G4ThreeVector(std::sin(fSPhi), -std::cos(fSPhi), 0) ;
{
norm = G4ThreeVector(sinSPhi, -cosSPhi, 0) ;
break ;
}
case kNEPhi:
norm=G4ThreeVector(-std::sin(fSPhi+fDPhi), std::cos(fSPhi+fDPhi), 0) ;
{
norm = G4ThreeVector(-sinEPhi, cosEPhi, 0) ;
break ;
}
default: // Should never reach this case...
{
DumpInfo();
G4Exception("G4Cons::ApproxSurfaceNormal()",
"GeomSolids1002", JustWarning,
"Undefined side for valid surface normal to solid.");
break ;
}
}
return norm ;
}
@@ -1367,11 +1379,11 @@ G4double G4Cons::DistanceToIn(const G4ThreeVector& p) const
cosPsi = (p.x()*cosCPhi + p.y()*sinCPhi)/rho ;
if ( cosPsi < std::cos(fDPhi*0.5) ) // Point lies outside phi range
if ( cosPsi < cosHDPhi ) // Point lies outside phi range
{
if ( (p.y()*cosCPhi - p.x()*sinCPhi) <= 0.0 )
{
safePhi = std::fabs(p.x()*std::sin(fSPhi)-p.y()*std::cos(fSPhi));
safePhi = std::fabs(p.x()*sinSPhi-p.y()*cosSPhi);
}
else
{
@@ -2205,16 +2217,16 @@ G4ThreeVector G4Cons::GetPointOnSurface() const
G4double zRand = G4RandFlat::shoot(-1.*fDz,fDz);
rRand1 = G4RandFlat::shoot(fRmin2-((zRand-fDz)/(2.*fDz))*(fRmin1-fRmin2),
fRmax2-((zRand-fDz)/(2.*fDz))*(fRmax1-fRmax2));
return G4ThreeVector (rRand1*std::cos(fSPhi),
rRand1*std::sin(fSPhi), zRand);
return G4ThreeVector (rRand1*cosSPhi,
rRand1*sinSPhi, zRand);
}
else // SPhi+DPhi section
{
G4double zRand = G4RandFlat::shoot(-1.*fDz,fDz);
rRand1 = G4RandFlat::shoot(fRmin2-((zRand-fDz)/(2.*fDz))*(fRmin1-fRmin2),
fRmax2-((zRand-fDz)/(2.*fDz))*(fRmax1-fRmax2));
return G4ThreeVector (rRand1*std::cos(fSPhi+fDPhi),
rRand1*std::sin(fSPhi+fDPhi), zRand);
return G4ThreeVector (rRand1*cosEPhi,
rRand1*sinEPhi, zRand);
}
}
source/geometry/solids/CSG/src/G4CutTubs.cc
+17 -17
View File
@@ -589,8 +589,8 @@ G4ThreeVector G4CutTubs::SurfaceNormal( const G4ThreeVector& p ) const
distSPhi = 0.;
distEPhi = 0.;
}
nPs = G4ThreeVector(std::sin(fSPhi),-std::cos(fSPhi),0);
nPe = G4ThreeVector(-std::sin(fSPhi+fDPhi),std::cos(fSPhi+fDPhi),0);
nPs = G4ThreeVector( sinSPhi, -cosSPhi, 0 );
nPe = G4ThreeVector( -sinEPhi, cosEPhi, 0 );
}
if ( rho > halfCarTolerance ) { nR = G4ThreeVector(p.x()/rho,p.y()/rho,0); }
@@ -752,12 +752,12 @@ G4ThreeVector G4CutTubs::ApproxSurfaceNormal( const G4ThreeVector& p ) const
}
case kNSPhi:
{
norm = G4ThreeVector(std::sin(fSPhi), -std::cos(fSPhi), 0) ;
norm = G4ThreeVector(sinSPhi, -cosSPhi, 0) ;
break ;
}
case kNEPhi:
{
norm = G4ThreeVector(-std::sin(fSPhi+fDPhi), std::cos(fSPhi+fDPhi), 0) ;
norm = G4ThreeVector(-sinEPhi, cosEPhi, 0) ;
break;
}
default: // Should never reach this case ...
@@ -1282,7 +1282,7 @@ G4double G4CutTubs::DistanceToIn( const G4ThreeVector& p ) const
//
cosPsi = (p.x()*cosCPhi + p.y()*sinCPhi)/rho ;
if ( cosPsi < std::cos(fDPhi*0.5) )
if ( cosPsi < cosHDPhi )
{
// Point lies outside phi range
@@ -1884,16 +1884,16 @@ G4ThreeVector G4CutTubs::GetPointOnSurface() const
else if( (chose >= aOne + aTwo + 2.*aThr)
&& (chose < aOne + aTwo + 2.*aThr + aFou) )
{
xRand = rRand*std::cos(fSPhi);
yRand = rRand*std::sin(fSPhi);
xRand = rRand*cosSPhi;
yRand = rRand*sinSPhi;
zRand = G4RandFlat::shoot(GetCutZ(G4ThreeVector(xRand,yRand,-fDz)),
GetCutZ(G4ThreeVector(xRand,yRand,fDz)));
return G4ThreeVector (xRand, yRand, zRand);
}
else
{
xRand = rRand*std::cos(fSPhi+fDPhi);
yRand = rRand*std::sin(fSPhi+fDPhi);
xRand = rRand*cosEPhi;
yRand = rRand*sinEPhi;
zRand = G4RandFlat::shoot(GetCutZ(G4ThreeVector(xRand,yRand,-fDz)),
GetCutZ(G4ThreeVector(xRand,yRand,fDz)));
return G4ThreeVector (xRand, yRand, zRand);
@@ -2069,23 +2069,23 @@ void G4CutTubs::GetMaxMinZ(G4double& zmin,G4double& zmax)const
if (phiHigh>twopi) { phiHigh-=twopi; }
}
xc = fRMin*std::cos(fSPhi);
yc = fRMin*std::sin(fSPhi);
xc = fRMin*cosSPhi;
yc = fRMin*sinSPhi;
z[0] = GetCutZ(G4ThreeVector(xc, yc, -fDz));
z[4] = GetCutZ(G4ThreeVector(xc, yc, fDz));
xc = fRMin*std::cos(fSPhi+fDPhi);
yc = fRMin*std::sin(fSPhi+fDPhi);
xc = fRMin*cosEPhi;
yc = fRMin*sinEPhi;
z[1] = GetCutZ(G4ThreeVector(xc, yc, -fDz));
z[5] = GetCutZ(G4ThreeVector(xc, yc, fDz));
xc = fRMax*std::cos(fSPhi);
yc = fRMax*std::sin(fSPhi);
xc = fRMax*cosSPhi;
yc = fRMax*sinSPhi;
z[2] = GetCutZ(G4ThreeVector(xc, yc, -fDz));
z[6] = GetCutZ(G4ThreeVector(xc, yc, fDz));
xc = fRMax*std::cos(fSPhi+fDPhi);
yc = fRMax*std::sin(fSPhi+fDPhi);
xc = fRMax*cosEPhi;
yc = fRMax*sinEPhi;
z[3] = GetCutZ(G4ThreeVector(xc, yc, -fDz));
z[7] = GetCutZ(G4ThreeVector(xc, yc, fDz));
source/geometry/solids/CSG/src/G4Sphere.cc
+5 -3
View File
@@ -132,7 +132,8 @@ G4Sphere::G4Sphere( __void__& a )
: G4CSGSolid(a), fRminTolerance(0.), fRmaxTolerance(0.),
kAngTolerance(0.), kRadTolerance(0.), fEpsilon(0.),
fRmin(0.), fRmax(0.), fSPhi(0.), fDPhi(0.), fSTheta(0.),
fDTheta(0.), sinCPhi(0.), cosCPhi(0.), cosHDPhiOT(0.), cosHDPhiIT(0.),
fDTheta(0.), sinCPhi(0.), cosCPhi(0.),
cosHDPhi(0.), cosHDPhiOT(0.), cosHDPhiIT(0.),
sinSPhi(0.), cosSPhi(0.), sinEPhi(0.), cosEPhi(0.), hDPhi(0.), cPhi(0.),
ePhi(0.), sinSTheta(0.), cosSTheta(0.), sinETheta(0.), cosETheta(0.),
tanSTheta(0.), tanSTheta2(0.), tanETheta(0.), tanETheta2(0.), eTheta(0.),
@@ -159,7 +160,7 @@ G4Sphere::G4Sphere(const G4Sphere& rhs)
kRadTolerance(rhs.kRadTolerance), fEpsilon(rhs.fEpsilon),
fRmin(rhs.fRmin), fRmax(rhs.fRmax), fSPhi(rhs.fSPhi), fDPhi(rhs.fDPhi),
fSTheta(rhs.fSTheta), fDTheta(rhs.fDTheta),
sinCPhi(rhs.sinCPhi), cosCPhi(rhs.cosCPhi),
sinCPhi(rhs.sinCPhi), cosCPhi(rhs.cosCPhi), cosHDPhi(rhs.cosHDPhi),
cosHDPhiOT(rhs.cosHDPhiOT), cosHDPhiIT(rhs.cosHDPhiIT),
sinSPhi(rhs.sinSPhi), cosSPhi(rhs.cosSPhi),
sinEPhi(rhs.sinEPhi), cosEPhi(rhs.cosEPhi),
@@ -196,6 +197,7 @@ G4Sphere& G4Sphere::operator = (const G4Sphere& rhs)
fEpsilon = rhs.fEpsilon; fRmin = rhs.fRmin; fRmax = rhs.fRmax;
fSPhi = rhs.fSPhi; fDPhi = rhs.fDPhi; fSTheta = rhs.fSTheta;
fDTheta = rhs.fDTheta; sinCPhi = rhs.sinCPhi; cosCPhi = rhs.cosCPhi;
cosHDPhi = rhs.cosHDPhi;
cosHDPhiOT = rhs.cosHDPhiOT; cosHDPhiIT = rhs.cosHDPhiIT;
sinSPhi = rhs.sinSPhi; cosSPhi = rhs.cosSPhi;
sinEPhi = rhs.sinEPhi; cosEPhi = rhs.cosEPhi;
@@ -1710,7 +1712,7 @@ G4double G4Sphere::DistanceToIn( const G4ThreeVector& p ) const
// Psi=angle from central phi to point
//
cosPsi=(p.x()*cosCPhi+p.y()*sinCPhi)/rho;
if (cosPsi<std::cos(hDPhi))
if (cosPsi<cosHDPhi)
{
// Point lies outside phi range
//
source/geometry/solids/CSG/src/G4Tubs.cc
+37 -26
View File
@@ -89,7 +89,8 @@ G4Tubs::G4Tubs( const G4String &pName,
G4double pRMin, G4double pRMax,
G4double pDz,
G4double pSPhi, G4double pDPhi )
: G4CSGSolid(pName), fRMin(pRMin), fRMax(pRMax), fDz(pDz), fSPhi(0), fDPhi(0)
: G4CSGSolid(pName), fRMin(pRMin), fRMax(pRMax), fDz(pDz), fSPhi(0), fDPhi(0),
fInvRmax( pRMax > 0.0 ? 1.0/pRMax : 0.0 ), fInvRmin( ( pRMin > 0. ? 1.0/pRMin : 0.0 ) )
{
kRadTolerance = G4GeometryTolerance::GetInstance()->GetRadialTolerance();
@@ -127,9 +128,10 @@ G4Tubs::G4Tubs( const G4String &pName,
G4Tubs::G4Tubs( __void__& a )
: G4CSGSolid(a), kRadTolerance(0.), kAngTolerance(0.),
fRMin(0.), fRMax(0.), fDz(0.), fSPhi(0.), fDPhi(0.),
sinCPhi(0.), cosCPhi(0.), cosHDPhiOT(0.), cosHDPhiIT(0.),
sinCPhi(0.), cosCPhi(0.), cosHDPhi(0.), cosHDPhiOT(0.), cosHDPhiIT(0.),
sinSPhi(0.), cosSPhi(0.), sinEPhi(0.), cosEPhi(0.),
fPhiFullTube(false), halfCarTolerance(0.), halfRadTolerance(0.),
fPhiFullTube(false), fInvRmax(0.), fInvRmin(0.),
halfCarTolerance(0.), halfRadTolerance(0.),
halfAngTolerance(0.)
{
}
@@ -151,10 +153,12 @@ G4Tubs::G4Tubs(const G4Tubs& rhs)
kRadTolerance(rhs.kRadTolerance), kAngTolerance(rhs.kAngTolerance),
fRMin(rhs.fRMin), fRMax(rhs.fRMax), fDz(rhs.fDz),
fSPhi(rhs.fSPhi), fDPhi(rhs.fDPhi),
sinCPhi(rhs.sinCPhi), cosCPhi(rhs.cosCPhi),
sinCPhi(rhs.sinCPhi), cosCPhi(rhs.cosCPhi), cosHDPhi(rhs.cosHDPhi),
cosHDPhiOT(rhs.cosHDPhiOT), cosHDPhiIT(rhs.cosHDPhiIT),
sinSPhi(rhs.sinSPhi), cosSPhi(rhs.cosSPhi),
sinEPhi(rhs.sinEPhi), cosEPhi(rhs.cosEPhi), fPhiFullTube(rhs.fPhiFullTube),
fInvRmax(rhs.fInvRmax),
fInvRmin(rhs.fInvRmin),
halfCarTolerance(rhs.halfCarTolerance),
halfRadTolerance(rhs.halfRadTolerance),
halfAngTolerance(rhs.halfAngTolerance)
@@ -180,11 +184,13 @@ G4Tubs& G4Tubs::operator = (const G4Tubs& rhs)
kRadTolerance = rhs.kRadTolerance; kAngTolerance = rhs.kAngTolerance;
fRMin = rhs.fRMin; fRMax = rhs.fRMax; fDz = rhs.fDz;
fSPhi = rhs.fSPhi; fDPhi = rhs.fDPhi;
sinCPhi = rhs.sinCPhi; cosCPhi = rhs.cosCPhi;
sinCPhi = rhs.sinCPhi; cosCPhi = rhs.cosCPhi; cosHDPhi = rhs.cosHDPhi;
cosHDPhiOT = rhs.cosHDPhiOT; cosHDPhiIT = rhs.cosHDPhiIT;
sinSPhi = rhs.sinSPhi; cosSPhi = rhs.cosSPhi;
sinEPhi = rhs.sinEPhi; cosEPhi = rhs.cosEPhi;
fPhiFullTube = rhs.fPhiFullTube;
fInvRmax= rhs.fInvRmax;
fInvRmin=rhs.fInvRmin;
halfCarTolerance = rhs.halfCarTolerance;
halfRadTolerance = rhs.halfRadTolerance;
halfAngTolerance = rhs.halfAngTolerance;
@@ -551,19 +557,19 @@ G4ThreeVector G4Tubs::SurfaceNormal( const G4ThreeVector& p ) const
{
pPhi = std::atan2(p.y(),p.x());
if(pPhi < fSPhi- halfCarTolerance) { pPhi += twopi; }
else if(pPhi > fSPhi+fDPhi+ halfCarTolerance) { pPhi -= twopi; }
if (pPhi < fSPhi-halfCarTolerance) { pPhi += twopi; }
else if (pPhi > fSPhi+fDPhi+halfCarTolerance) { pPhi -= twopi; }
distSPhi = std::fabs(pPhi - fSPhi);
distEPhi = std::fabs(pPhi - fSPhi - fDPhi);
distSPhi = std::fabs( pPhi - fSPhi );
distEPhi = std::fabs( pPhi - fSPhi - fDPhi );
}
else if( !fRMin )
else if ( !fRMin )
{
distSPhi = 0.;
distEPhi = 0.;
}
nPs = G4ThreeVector(std::sin(fSPhi),-std::cos(fSPhi),0);
nPe = G4ThreeVector(-std::sin(fSPhi+fDPhi),std::cos(fSPhi+fDPhi),0);
nPs = G4ThreeVector( sinSPhi, -cosSPhi, 0 );
nPe = G4ThreeVector( -sinEPhi, cosEPhi, 0 );
}
if ( rho > halfCarTolerance ) { nR = G4ThreeVector(p.x()/rho,p.y()/rho,0); }
@@ -709,12 +715,12 @@ G4ThreeVector G4Tubs::ApproxSurfaceNormal( const G4ThreeVector& p ) const
}
case kNSPhi:
{
norm = G4ThreeVector(std::sin(fSPhi), -std::cos(fSPhi), 0) ;
norm = G4ThreeVector(sinSPhi, -cosSPhi, 0) ;
break ;
}
case kNEPhi:
{
norm = G4ThreeVector(-std::sin(fSPhi+fDPhi), std::cos(fSPhi+fDPhi), 0) ;
norm = G4ThreeVector(-sinEPhi, cosEPhi, 0) ;
break;
}
default: // Should never reach this case ...
@@ -992,7 +998,7 @@ G4double G4Tubs::DistanceToIn( const G4ThreeVector& p,
{
xi = p.x() + sd*v.x() ;
yi = p.y() + sd*v.y() ;
cosPsi = (xi*cosCPhi + yi*sinCPhi)/fRMin ;
cosPsi = (xi*cosCPhi + yi*sinCPhi)*fInvRmin;
if (cosPsi >= cosHDPhiIT)
{
// Good inner radius isect
@@ -1147,7 +1153,7 @@ G4double G4Tubs::DistanceToIn( const G4ThreeVector& p ) const
//
cosPsi = (p.x()*cosCPhi + p.y()*sinCPhi)/rho ;
if ( cosPsi < std::cos(fDPhi*0.5) )
if ( cosPsi < cosHDPhi )
{
// Point lies outside phi range
@@ -1176,11 +1182,11 @@ G4double G4Tubs::DistanceToOut( const G4ThreeVector& p,
const G4bool calcNorm,
G4bool *validNorm,
G4ThreeVector *n ) const
{
{
ESide side=kNull , sider=kNull, sidephi=kNull ;
G4double snxt, srd=kInfinity, sphi=kInfinity, pdist ;
G4double deltaR, t1, t2, t3, b, c, d2, roMin2 ;
// Vars for phi intersection:
G4double pDistS, compS, pDistE, compE, sphi2, xi, yi, vphi, roi2 ;
@@ -1277,7 +1283,8 @@ G4double G4Tubs::DistanceToOut( const G4ThreeVector& p,
if ( calcNorm )
{
*n = G4ThreeVector(p.x()/fRMax,p.y()/fRMax,0) ;
G4double invRho = FastInverseRxy( p, fInvRmax, kNormTolerance );
*n = G4ThreeVector(p.x()*invRho,p.y()*invRho,0) ;
*validNorm = true ;
}
return snxt = 0 ; // Leaving by rmax immediately
@@ -1306,7 +1313,9 @@ G4double G4Tubs::DistanceToOut( const G4ThreeVector& p,
}
else
{
if ( calcNorm ) { *validNorm = false; } // Concave side
if ( calcNorm ) {
*validNorm = false;
} // Concave side
return snxt = 0.0;
}
}
@@ -1325,7 +1334,8 @@ G4double G4Tubs::DistanceToOut( const G4ThreeVector& p,
{
if (calcNorm)
{
*n = G4ThreeVector(p.x()/fRMax,p.y()/fRMax,0) ;
G4double invRho = FastInverseRxy( p, fInvRmax, kNormTolerance );
*n = G4ThreeVector(p.x()*invRho,p.y()*invRho,0) ;
*validNorm = true ;
}
return snxt = 0.0;
@@ -1349,7 +1359,8 @@ G4double G4Tubs::DistanceToOut( const G4ThreeVector& p,
{
if (calcNorm)
{
*n = G4ThreeVector(p.x()/fRMax,p.y()/fRMax,0) ;
G4double invRho = FastInverseRxy( p, fInvRmax, kNormTolerance );
*n = G4ThreeVector(p.x()*invRho,p.y()*invRho,0) ;
*validNorm = true ;
}
return snxt = 0.0;
@@ -1741,15 +1752,15 @@ G4ThreeVector G4Tubs::GetPointOnSurface() const
else if( (chose >= aOne + aTwo + 2.*aThr)
&& (chose < aOne + aTwo + 2.*aThr + aFou) )
{
xRand = rRand*std::cos(fSPhi);
yRand = rRand*std::sin(fSPhi);
xRand = rRand*cosSPhi;
yRand = rRand*sinSPhi;
zRand = G4RandFlat::shoot(-1.*fDz,fDz);
return G4ThreeVector (xRand, yRand, zRand);
}
else
{
xRand = rRand*std::cos(fSPhi+fDPhi);
yRand = rRand*std::sin(fSPhi+fDPhi);
xRand = rRand*cosEPhi;
yRand = rRand*sinEPhi;
zRand = G4RandFlat::shoot(-1.*fDz,fDz);
return G4ThreeVector (xRand, yRand, zRand);
}