diff --git a/source/geometry/management/src/G4ReflectedSolid.cc b/source/geometry/management/src/G4ReflectedSolid.cc
index 6efd9ac5891963ebea0ca219691128816dc72ed6..30c137ecfe57dfc610979a4e7bb36595c392e5fd 100644
--- a/source/geometry/management/src/G4ReflectedSolid.cc
+++ b/source/geometry/management/src/G4ReflectedSolid.cc
@@ -425,6 +425,8 @@ G4ReflectedSolid::CalculateExtent( const EAxis pAxis,
EInside G4ReflectedSolid::Inside(const G4ThreeVector& p) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Inside_G4Reflected = " << icount/1000000 << G4endl;
G4Point3D newPoint = (*fDirectTransform3D)*G4Point3D(p) ;
// G4Point3D newPoint = (*fPtrTransform3D)*G4Point3D(p) ;
@@ -441,6 +443,9 @@ EInside G4ReflectedSolid::Inside(const G4ThreeVector& p) const
G4ThreeVector
G4ReflectedSolid::SurfaceNormal( const G4ThreeVector& p ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Normal_G4Reflected = " << icount/1000000 << G4endl;
+
G4Point3D newPoint = (*fDirectTransform3D)*G4Point3D(p) ;
G4ThreeVector normal =
fPtrSolid->SurfaceNormal(G4ThreeVector(newPoint.x(),
@@ -460,6 +465,9 @@ G4double
G4ReflectedSolid::DistanceToIn( const G4ThreeVector& p,
const G4ThreeVector& v ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Dist_In_G4Reflected = " << icount/1000000 << G4endl;
+
G4Point3D newPoint = (*fDirectTransform3D)*G4Point3D(p) ;
G4Point3D newDirection = (*fDirectTransform3D)*G4Point3D(v) ;
newDirection.unit() ;
@@ -476,6 +484,9 @@ G4ReflectedSolid::DistanceToIn( const G4ThreeVector& p,
G4double
G4ReflectedSolid::DistanceToIn( const G4ThreeVector& p) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Safe_In_G4Reflected = " << icount/1000000 << G4endl;
+
G4Point3D newPoint = (*fDirectTransform3D)*G4Point3D(p) ;
return fPtrSolid->DistanceToIn(
G4ThreeVector(newPoint.x(),newPoint.y(),newPoint.z())) ;
@@ -492,6 +503,9 @@ G4ReflectedSolid::DistanceToOut( const G4ThreeVector& p,
G4bool *validNorm,
G4ThreeVector *n ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Dist_Out_G4Reflected = " << icount/1000000 << G4endl;
+
G4ThreeVector solNorm ;
G4Point3D newPoint = (*fDirectTransform3D)*G4Point3D(p) ;
@@ -519,6 +533,9 @@ G4ReflectedSolid::DistanceToOut( const G4ThreeVector& p,
G4double
G4ReflectedSolid::DistanceToOut( const G4ThreeVector& p ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Safe_Out_G4Reflected = " << icount/1000000 << G4endl;
+
G4Point3D newPoint = (*fDirectTransform3D)*G4Point3D(p);
return fPtrSolid->DistanceToOut(
G4ThreeVector(newPoint.x(),newPoint.y(),newPoint.z()));
diff --git a/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc b/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc
index 1e9a261990c103ac946c7d50b534fcf803e0d3b3..87c188fef8e56bb3ca92dabd02352d4b2a7cc132 100644
--- a/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc
@@ -310,6 +310,9 @@ G4DisplacedSolid::CalculateExtent( const EAxis pAxis,
EInside G4DisplacedSolid::Inside(const G4ThreeVector& p) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Inside_G4Displaced = " << icount/1000000 << G4endl;
+
G4ThreeVector newPoint = fPtrTransform->TransformPoint(p) ;
return fPtrSolid->Inside(newPoint) ;
}
@@ -321,6 +324,9 @@ EInside G4DisplacedSolid::Inside(const G4ThreeVector& p) const
G4ThreeVector
G4DisplacedSolid::SurfaceNormal( const G4ThreeVector& p ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Normal_G4Displaced = " << icount/1000000 << G4endl;
+
G4ThreeVector newPoint = fPtrTransform->TransformPoint(p) ;
G4ThreeVector normal = fPtrSolid->SurfaceNormal(newPoint) ;
return fDirectTransform->TransformAxis(normal) ;
@@ -334,6 +340,9 @@ G4double
G4DisplacedSolid::DistanceToIn( const G4ThreeVector& p,
const G4ThreeVector& v ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Dist_In_G4Displaced = " << icount/1000000 << G4endl;
+
G4ThreeVector newPoint = fPtrTransform->TransformPoint(p) ;
G4ThreeVector newDirection = fPtrTransform->TransformAxis(v) ;
return fPtrSolid->DistanceToIn(newPoint,newDirection) ;
@@ -347,6 +356,9 @@ G4DisplacedSolid::DistanceToIn( const G4ThreeVector& p,
G4double
G4DisplacedSolid::DistanceToIn( const G4ThreeVector& p ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Safe_In_G4Displaced = " << icount/1000000 << G4endl;
+
G4ThreeVector newPoint = fPtrTransform->TransformPoint(p) ;
return fPtrSolid->DistanceToIn(newPoint) ;
}
@@ -362,6 +374,9 @@ G4DisplacedSolid::DistanceToOut( const G4ThreeVector& p,
G4bool *validNorm,
G4ThreeVector *n ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Dist_Out_G4Displaced = " << icount/1000000 << G4endl;
+
G4ThreeVector solNorm ;
G4ThreeVector newPoint = fPtrTransform->TransformPoint(p) ;
G4ThreeVector newDirection = fPtrTransform->TransformAxis(v) ;
@@ -381,6 +396,9 @@ G4DisplacedSolid::DistanceToOut( const G4ThreeVector& p,
G4double
G4DisplacedSolid::DistanceToOut( const G4ThreeVector& p ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Safe_Out_G4Displaced = " << icount/1000000 << G4endl;
+
G4ThreeVector newPoint = fPtrTransform->TransformPoint(p) ;
return fPtrSolid->DistanceToOut(newPoint) ;
}
diff --git a/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc b/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
index 7b389126505b24db7751a4960a4d543f5acf29ff..821284057e7189aeca5a9636179041b720c04706 100644
--- a/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
@@ -174,9 +174,6 @@ G4IntersectionSolid::CalculateExtent(const EAxis pAxis,
EInside G4IntersectionSolid::Inside(const G4ThreeVector& p) const
{
- static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Inside_G4Inter = " << icount/1000000 << G4endl;
-
EInside positionA = fPtrSolidA->Inside(p) ;
if( positionA == kOutside ) return kOutside ;
@@ -273,9 +270,6 @@ G4double
G4IntersectionSolid::DistanceToIn( const G4ThreeVector& p,
const G4ThreeVector& v ) const
{
- static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Dist_In_G4Inter = " << icount/1000000 << G4endl;
-
G4double dist = 0.0;
if( Inside(p) == kInside )
{
@@ -382,9 +376,6 @@ G4IntersectionSolid::DistanceToIn( const G4ThreeVector& p,
G4double
G4IntersectionSolid::DistanceToIn( const G4ThreeVector& p) const
{
- static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Safe_In_G4Inter = " << icount/1000000 << G4endl;
-
#ifdef G4BOOLDEBUG
if( Inside(p) == kInside )
{
@@ -432,9 +423,6 @@ G4IntersectionSolid::DistanceToOut( const G4ThreeVector& p,
G4bool *validNorm,
G4ThreeVector *n ) const
{
- static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Dist_Out_G4Inter = " << icount/1000000 << G4endl;
-
G4bool validNormA, validNormB;
G4ThreeVector nA, nB;
@@ -490,9 +478,6 @@ G4IntersectionSolid::DistanceToOut( const G4ThreeVector& p,
G4double
G4IntersectionSolid::DistanceToOut( const G4ThreeVector& p ) const
{
- static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Safe_Out_G4Inter = " << icount/1000000 << G4endl;
-
#ifdef G4BOOLDEBUG
if( Inside(p) == kOutside )
{
diff --git a/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc b/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
index 8871581d6b98387988af0b59fc41ef89a2d7ff5e..3db82b6b7c6230e16431c6a567623bcf309cc3bd 100644
--- a/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
@@ -195,6 +195,9 @@ EInside G4SubtractionSolid::Inside( const G4ThreeVector& p ) const
G4ThreeVector
G4SubtractionSolid::SurfaceNormal( const G4ThreeVector& p ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Normal_G4Subtr = " << icount/1000000 << G4endl;
+
G4ThreeVector normal;
EInside insideThis= Inside(p);
if( insideThis == kOutside )
diff --git a/source/geometry/solids/Boolean/src/G4UnionSolid.cc b/source/geometry/solids/Boolean/src/G4UnionSolid.cc
index 16e88c2d85ae4e54872ed3bf68c757e86130c699..b70a6cfd19b4d3fe1a9901d090f059ed1d3d4b29 100644
--- a/source/geometry/solids/Boolean/src/G4UnionSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4UnionSolid.cc
@@ -171,7 +171,8 @@ G4UnionSolid::CalculateExtent( const EAxis pAxis,
EInside G4UnionSolid::Inside( const G4ThreeVector& p ) const
{
static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Inside_G4Union = " << icount/1000000 << G4endl;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Inside_G4Union = " << icount/1000000 << " name: " << GetName() << G4endl;
EInside positionA = fPtrSolidA->Inside(p);
if (positionA == kInside) { return kInside; }
@@ -202,6 +203,10 @@ EInside G4UnionSolid::Inside( const G4ThreeVector& p ) const
G4ThreeVector
G4UnionSolid::SurfaceNormal( const G4ThreeVector& p ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Normal_G4Union = " << icount/1000000 << " name: " << GetName() << G4endl;
+
G4ThreeVector normal;
#ifdef G4BOOLDEBUG
@@ -256,7 +261,8 @@ G4UnionSolid::DistanceToIn( const G4ThreeVector& p,
const G4ThreeVector& v ) const
{
static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Dist_In_G4Union = " << icount/1000000 << G4endl;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Dist_In_G4Union = " << icount/1000000 << " name: " << GetName() << G4endl;
#ifdef G4BOOLDEBUG
if( Inside(p) == kInside )
@@ -287,7 +293,8 @@ G4double
G4UnionSolid::DistanceToIn( const G4ThreeVector& p) const
{
static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Safe_In_G4Union = " << icount/1000000 << G4endl;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Safe_In_G4Union = " << icount/1000000 << " name: " << GetName() << G4endl;
#ifdef G4BOOLDEBUG
if( Inside(p) == kInside )
@@ -321,7 +328,8 @@ G4UnionSolid::DistanceToOut( const G4ThreeVector& p,
G4ThreeVector *n ) const
{
static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Dist_Out_G4Union = " << icount/1000000 << G4endl;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Dist_Out_G4Union = " << icount/1000000 << " name: " << GetName() << G4endl;
G4double dist = 0.0, disTmp = 0.0 ;
G4ThreeVector normTmp;
@@ -408,7 +416,8 @@ G4double
G4UnionSolid::DistanceToOut( const G4ThreeVector& p ) const
{
static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Safe_Out_G4Union = " << icount/1000000 << G4endl;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Safe_Out_G4Union = " << icount/1000000 << " name: " << GetName() << G4endl;
G4double distout = 0.0;
if( Inside(p) == kOutside )
diff --git a/source/geometry/solids/CSG/src/G4Box.cc b/source/geometry/solids/CSG/src/G4Box.cc
index aa00f48fd448fffb0e1f81e120123646c3e624c1..e95b65da654aa100e91da4ff6cdd684fa4e0c52b 100644
--- a/source/geometry/solids/CSG/src/G4Box.cc
+++ b/source/geometry/solids/CSG/src/G4Box.cc
@@ -276,6 +276,9 @@ EInside G4Box::Inside(const G4ThreeVector& p) const
G4ThreeVector G4Box::SurfaceNormal( const G4ThreeVector& p) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Normal_G4Box = " << icount/1000000 << G4endl;
+
G4ThreeVector norm(0,0,0);
G4double px = p.x();
if (std::abs(std::abs(px) - fDx) <= delta) norm.setX(px < 0 ? -1. : 1.);
diff --git a/source/geometry/solids/CSG/src/G4Cons.cc b/source/geometry/solids/CSG/src/G4Cons.cc
index 2d4245b51ce49385506ba898cfb4459e2fda4fee..38ed6c0fa9e9d8f1365aa9e9c962ef75d2024b78 100644
--- a/source/geometry/solids/CSG/src/G4Cons.cc
+++ b/source/geometry/solids/CSG/src/G4Cons.cc
@@ -435,6 +435,9 @@ G4bool G4Cons::CalculateExtent( const EAxis pAxis,
G4ThreeVector G4Cons::SurfaceNormal( const G4ThreeVector& p) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Normal_G4Cons = " << icount/1000000 << G4endl;
+
G4int noSurfaces = 0;
G4double rho, pPhi;
G4double distZ, distRMin, distRMax;
diff --git a/source/geometry/solids/CSG/src/G4Trap.cc b/source/geometry/solids/CSG/src/G4Trap.cc
index 7ad1643bfeec3e3f17a32e4788210206bcd88cf8..fb38462b1002f08d6323e74e512dfc85d76d920c 100644
--- a/source/geometry/solids/CSG/src/G4Trap.cc
+++ b/source/geometry/solids/CSG/src/G4Trap.cc
@@ -690,6 +690,9 @@ EInside G4Trap::Inside( const G4ThreeVector& p ) const
G4ThreeVector G4Trap::SurfaceNormal( const G4ThreeVector& p ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Normal_G4Trap = " << icount/1000000 << G4endl;
+
G4int nsurf = 0; // number of surfaces where p is placed
G4double nx = 0, ny = 0, nz = 0;
G4double dz = std::abs(p.z()) - fDz;
diff --git a/source/geometry/solids/CSG/src/G4Trd.cc b/source/geometry/solids/CSG/src/G4Trd.cc
index 5a52151c4974d0f5b8e9c8b6e0456d788cc721b0..cd1d9605567e7eae8217ab0aa2ab1f02dc843311 100644
--- a/source/geometry/solids/CSG/src/G4Trd.cc
+++ b/source/geometry/solids/CSG/src/G4Trd.cc
@@ -361,6 +361,9 @@ EInside G4Trd::Inside( const G4ThreeVector& p ) const
G4ThreeVector G4Trd::SurfaceNormal( const G4ThreeVector& p ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Normal_G4Trd = " << icount/1000000 << G4endl;
+
G4int nsurf = 0; // number of surfaces where p is placed
// Check Z faces
diff --git a/source/geometry/solids/CSG/src/G4Tubs.cc b/source/geometry/solids/CSG/src/G4Tubs.cc
index de3670fc50c58de92d8d48309d12525e14a46adb..0630a32a777ccd64a744350a611900b58525f1ac 100644
--- a/source/geometry/solids/CSG/src/G4Tubs.cc
+++ b/source/geometry/solids/CSG/src/G4Tubs.cc
@@ -364,8 +364,10 @@ G4bool G4Tubs::CalculateExtent( const EAxis pAxis,
EInside G4Tubs::Inside( const G4ThreeVector& p ) const
{
- static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Inside_G4Tubs = " << icount/1000000 << G4endl;
+ static int icount = 0, ifull = 0;
+ if (fPhiFullTube) ifull++;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Inside_G4Tubs = " << icount/1000000 << " " << ifull/1000000 << << G4endl;
G4double r2,pPhi,tolRMin,tolRMax;
EInside in = kOutside ;
@@ -534,6 +536,11 @@ EInside G4Tubs::Inside( const G4ThreeVector& p ) const
G4ThreeVector G4Tubs::SurfaceNormal( const G4ThreeVector& p ) const
{
+ static int icount = 0, ifull = 0;
+ if (fPhiFullTube) ifull++;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Normal_G4Tubs = " << icount/1000000 << " " << ifull/1000000 << << G4endl;
+
G4int noSurfaces = 0;
G4double rho, pPhi;
G4double distZ, distRMin, distRMax;
@@ -758,8 +765,10 @@ G4ThreeVector G4Tubs::ApproxSurfaceNormal( const G4ThreeVector& p ) const
G4double G4Tubs::DistanceToIn( const G4ThreeVector& p,
const G4ThreeVector& v ) const
{
- static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Dist_In_G4Tubs = " << icount/1000000 << G4endl;
+ static int icount = 0, ifull = 0;
+ if (fPhiFullTube) ifull++;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Dist_In_G4Tubs = " << icount/1000000 << " " << ifull/1000000 << << G4endl;
G4double snxt = kInfinity ; // snxt = default return value
G4double tolORMin2, tolIRMax2 ; // 'generous' radii squared
@@ -1136,8 +1145,10 @@ G4double G4Tubs::DistanceToIn( const G4ThreeVector& p,
G4double G4Tubs::DistanceToIn( const G4ThreeVector& p ) const
{
- static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Safe_In_G4Tubs = " << icount/1000000 << G4endl;
+ static int icount = 0, ifull = 0;
+ if (fPhiFullTube) ifull++;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Safe_In_G4Tubs = " << icount/1000000 << " " << ifull/1000000 << << G4endl;
G4double safe=0.0, rho, safe1, safe2, safe3 ;
G4double safePhi, cosPsi ;
@@ -1187,8 +1198,10 @@ G4double G4Tubs::DistanceToOut( const G4ThreeVector& p,
G4bool *validNorm,
G4ThreeVector *n ) const
{
- static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Dist_Out_G4Tubs = " << icount/1000000 << G4endl;
+ static int icount = 0, ifull = 0;
+ if (fPhiFullTube) ifull++;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Dist_Out_G4Tubs = " << icount/1000000 << " " << ifull/1000000 << << G4endl;
ESide side=kNull , sider=kNull, sidephi=kNull ;
G4double snxt, srd=kInfinity, sphi=kInfinity, pdist ;
@@ -1603,8 +1616,10 @@ G4double G4Tubs::DistanceToOut( const G4ThreeVector& p,
G4double G4Tubs::DistanceToOut( const G4ThreeVector& p ) const
{
- static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Safe_Out_G4Tubs = " << icount/1000000 << G4endl;
+ static int icount = 0, ifull = 0;
+ if (fPhiFullTube) ifull++;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Safe_Out_G4Tubs = " << icount/1000000 << " " << ifull/1000000 << << G4endl;
G4double safe=0.0, rho, safeR1, safeR2, safeZ, safePhi ;
rho = std::sqrt(p.x()*p.x() + p.y()*p.y()) ;
diff --git a/source/geometry/solids/specific/src/G4ExtrudedSolid.cc b/source/geometry/solids/specific/src/G4ExtrudedSolid.cc
index 2169a69d0eab8abdc268d6c28a06ad8b8796565e..399edfa7091f61441172dd4983306d09eb70ca89 100644
--- a/source/geometry/solids/specific/src/G4ExtrudedSolid.cc
+++ b/source/geometry/solids/specific/src/G4ExtrudedSolid.cc
@@ -978,6 +978,9 @@ EInside G4ExtrudedSolid::Inside(const G4ThreeVector &p) const
G4ThreeVector G4ExtrudedSolid::SurfaceNormal(const G4ThreeVector& p) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0) G4cout << "=== Normal_G4Extruded = " << icount/1000000 << G4endl;
+
G4int nsurf = 0;
G4double nx = 0, ny = 0, nz = 0;
switch (fSolidType)
diff --git a/source/geometry/solids/specific/src/G4Polycone.cc b/source/geometry/solids/specific/src/G4Polycone.cc
index 995626fdc281416b8a9a0aa7b86428eb59e6d597..dda7ba77086d81205b9567493723e3da42ee9095 100644
--- a/source/geometry/solids/specific/src/G4Polycone.cc
+++ b/source/geometry/solids/specific/src/G4Polycone.cc
@@ -478,7 +478,8 @@ G4bool G4Polycone::Reset()
EInside G4Polycone::Inside( const G4ThreeVector &p ) const
{
static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Inside_G4Polycone = " << icount/1000000 << G4endl;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Inside_G4Polycone = " << icount/1000000 << " name: " << GetName() << G4endl;
//
// Quick test
@@ -502,7 +503,8 @@ G4double G4Polycone::DistanceToIn( const G4ThreeVector &p,
const G4ThreeVector &v ) const
{
static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Dist_In_G4Polycone = " << icount/1000000 << G4endl;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Dist_In_G4Polycone = " << icount/1000000 << " name: " << GetName() << G4endl;
//
// Quick test
@@ -523,7 +525,8 @@ G4double G4Polycone::DistanceToIn( const G4ThreeVector &p,
G4double G4Polycone::DistanceToIn( const G4ThreeVector &p ) const
{
static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Safe_In_G4Polycone = " << icount/1000000 << G4endl;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Safe_In_G4Polycone = " << icount/1000000 << " name: " << GetName() << G4endl;
return G4VCSGfaceted::DistanceToIn(p);
}
diff --git a/source/geometry/solids/specific/src/G4VCSGfaceted.cc b/source/geometry/solids/specific/src/G4VCSGfaceted.cc
index 91903365e9f11f50f60ee064bfab1907e4591ca9..174608d6a25db901e87de0c9bcee08a330a62b54 100644
--- a/source/geometry/solids/specific/src/G4VCSGfaceted.cc
+++ b/source/geometry/solids/specific/src/G4VCSGfaceted.cc
@@ -242,6 +242,10 @@ EInside G4VCSGfaceted::Inside( const G4ThreeVector &p ) const
//
G4ThreeVector G4VCSGfaceted::SurfaceNormal( const G4ThreeVector& p ) const
{
+ static int icount = 0;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Normal_G4Polycone = " << icount/1000000 << " name: " << GetName() << G4endl;
+
G4ThreeVector answer;
G4VCSGface **face = faces;
G4double best = kInfinity;
@@ -321,7 +325,8 @@ G4double G4VCSGfaceted::DistanceToOut( const G4ThreeVector &p,
G4ThreeVector *n ) const
{
static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Dist_Out_G4Polycone = " << icount/1000000 << G4endl;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Dist_Out_G4Polycone = " << icount/1000000 << " name: " << GetName() << G4endl;
G4bool allBehind = true;
G4double distance = kInfinity;
@@ -388,7 +393,8 @@ G4double G4VCSGfaceted::DistanceToOut( const G4ThreeVector &p,
G4double G4VCSGfaceted::DistanceToOut( const G4ThreeVector &p ) const
{
static int icount = 0;
- if ( (++icount)%1000000 == 0) G4cout << "=== Safe_Out_G4Polycone = " << icount/1000000 << G4endl;
+ if ( (++icount)%1000000 == 0)
+ G4cout << "=== Safe_Out_G4Polycone = " << icount/1000000 << " name: " << GetName() << G4endl;
return DistanceTo( p, true );
}